Merge pull request #100 from yonaskolb/clear_project_settings

Don't apply base project settings if config doesn't have a type
This commit is contained in:
Yonas Kolb
2017-10-22 19:21:08 +01:00
committed by GitHub
2 changed files with 10 additions and 2 deletions
+1 -2
View File
@@ -16,11 +16,10 @@ import JSONUtilities
extension ProjectSpec {
public func getProjectBuildSettings(config: Config) -> BuildSettings {
var buildSettings: BuildSettings = [:]
buildSettings += SettingsPresetFile.base.getBuildSettings()
if let type = config.type {
buildSettings += SettingsPresetFile.base.getBuildSettings()
buildSettings += SettingsPresetFile.config(type).getBuildSettings()
}
@@ -62,6 +62,15 @@ func projectGeneratorTests() {
try expect(configs).contains(name: "config1")
try expect(configs).contains(name: "config2")
}
$0.it("clears config settings when missing type") {
let spec = ProjectSpec(name: "test", configs: [Config(name: "config")])
let project = try getProject(spec)
guard let config = project.pbxproj.buildConfigurations.first else {
throw failure("configuration not found")
}
try expect(config.buildSettings.isEmpty).to.beTrue()
}
$0.it("merges settings") {
let spec = try ProjectSpec(path: fixturePath + "settings_test.yml")