Skip to content

Commit

Permalink
Fix typo in 'addtional' (#1328)
Browse files Browse the repository at this point in the history
* fix typo

* rename to included_additional.yml

* remove one

* fix typo

* Update Tests/ProjectSpecTests/SpecLoadingTests.swift

---------

Co-authored-by: Yonas Kolb <[email protected]>
  • Loading branch information
tzxdtc and yonaskolb authored Feb 23, 2023
1 parent 39739b4 commit aa7fed0
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Tests/Fixtures/include_test.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include:
- included.yml
- path: included_addtional.yml
enable: ${INCLUDE_ADDTIONAL_YAML}
- path: included_additional.yml
enable: ${INCLUDE_ADDITIONAL_YAML}
packages:
Yams:
url: https://github.com/jpsim/Yams
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Included_Addtional
name: Included_Additional
settingGroups:
test:
MY_SETTING5: ADDTIONAL
MY_SETTING5: ADDITIONAL
packages:
SwiftPM:
url: https://github.com/apple/swift-package-manager
Expand Down
10 changes: 5 additions & 5 deletions Tests/ProjectSpecTests/SpecLoadingTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ class SpecLoadingTests: XCTestCase {
]
}

$0.it("merges includes with addtional one") {
$0.it("merges includes with additional") {
let path = fixturePath + "include_test.yml"
let project = try loadSpec(path: path, variables: ["INCLUDE_ADDTIONAL_YAML": "YES"])
let project = try loadSpec(path: path, variables: ["INCLUDE_ADDITIONAL_YAML": "YES"])

try expect(project.name) == "NewName"
try expect(project.settingGroups) == [
"test": Settings(dictionary: ["MY_SETTING1": "NEW VALUE", "MY_SETTING2": "VALUE2", "MY_SETTING3": "VALUE3", "MY_SETTING4": "${SETTING4}", "MY_SETTING5": "ADDTIONAL"]),
"test": Settings(dictionary: ["MY_SETTING1": "NEW VALUE", "MY_SETTING2": "VALUE2", "MY_SETTING3": "VALUE3", "MY_SETTING4": "${SETTING4}", "MY_SETTING5": "ADDITIONAL"]),
"new": Settings(dictionary: ["MY_SETTING": "VALUE"]),
"toReplace": Settings(dictionary: ["MY_SETTING2": "VALUE2"]),
]
Expand All @@ -59,9 +59,9 @@ class SpecLoadingTests: XCTestCase {
]
}

$0.it("merges includes without addtional one by environemnt variable") {
$0.it("merges includes without additional by environment variable") {
let path = fixturePath + "include_test.yml"
let project = try loadSpec(path: path, variables: ["INCLUDE_ADDTIONAL_YAML": "NO"])
let project = try loadSpec(path: path, variables: ["INCLUDE_ADDITIONAL_YAML": "NO"])

try expect(project.name) == "NewName"
try expect(project.settingGroups) == [
Expand Down

0 comments on commit aa7fed0

Please sign in to comment.