Make simulateLocation respect schemePathPrefix

CHANGELOG.md

@@ -13,6 +13,7 @@
 #### Changed
 - **Breaking**: Info.plists with custom prefixes are no longer added to the Copy Bundle Resources build phase [#945](https://github.com/yonaskolb/XcodeGen/pull/945) @anivaros
 - **Breaking**: `workingDirectory` of included legacy targets is now made relative to including project [#981](https://github.com/yonaskolb/XcodeGen/pull/981) @jcolicchio
+- **Breaking**: Make `simulateLocation` respect `schemePathPrefix` option. [#973](https://github.com/yonaskolb/XcodeGen/pull/973) @jcolicchio
 
 #### Fixed
 - Fixed error message output for `minimumXcodeGenVersion`. [#967](https://github.com/yonaskolb/XcodeGen/pull/967) @joshwalker

Docs/ProjectSpec.md

@@ -774,7 +774,7 @@ The different actions share some properties:
 - [ ] **language**: **String** - `run` and `test` actions can define a language that is used for Application Language
 - [ ] **region**: **String** - `run` and `test` actions can define a language that is used for Application Region
 - [ ] **debugEnabled**: **Bool** - `run` and `test` actions can define a whether debugger should be used. This defaults to true.
-- [ ] **simulateLocation**: **[Simulate Location](#simulate-location)** - `run` action can define a simulated location
+- [ ] **simulateLocation**: **[Simulate Location](#simulate-location)** - `run` action can define a simulated location. See [Options](#options).
 - [ ] **askForAppToLaunch**: **Bool** - `run` action can define the executable set to ask to launch. This defaults to false.
 - [ ] **launchAutomaticallySubstyle**: **String** - `run` action can define the launch automatically substyle ('2' for extensions).
 - [ ] **storeKitConfiguration**: **String** - `run` action can specify a storekit configuration. See [Options](#options).

Sources/XcodeGenKit/SchemeGenerator.swift

@@ -228,7 +228,7 @@ public class SchemeGenerator {
  var locationScenarioReference: XCScheme.LocationScenarioReference?
  if let simulateLocation = scheme.run?.simulateLocation, var identifier = simulateLocation.defaultLocation, let referenceType = simulateLocation.referenceType {
  if referenceType == .gpx {
- var path = Path("../\(identifier)")
+ var path = Path(components: [project.options.schemePathPrefix, identifier])
  path = path.simplifyingParentDirectoryReferences()
  identifier = path.string
  }

Tests/XcodeGenKitTests/SchemeGeneratorTests.swift

@@ -164,7 +164,7 @@ class SchemeGeneratorTests: XCTestCase {
  let scheme = Scheme(
  name: "EnvironmentVariablesScheme",
  build: Scheme.Build(targets: [buildTarget]),
- run: Scheme.Run(config: "Debug", environmentVariables: runVariables, storeKitConfiguration: "Configuration.storekit"),
+ run: Scheme.Run(config: "Debug", environmentVariables: runVariables, simulateLocation: .init(allow: true, defaultLocation: "File.gpx"), storeKitConfiguration: "Configuration.storekit"),
  test: Scheme.Test(config: "Debug"),
  profile: Scheme.Profile(config: "Debug")
  )
@@ -184,6 +184,8 @@ class SchemeGeneratorTests: XCTestCase {
  ).beTrue()
  try expect(xcscheme.launchAction?.environmentVariables) == runVariables
  try expect(xcscheme.launchAction?.storeKitConfigurationFileReference?.identifier) == "../Configuration.storekit"
+ try expect(xcscheme.launchAction?.locationScenarioReference?.referenceType) == Scheme.SimulateLocation.ReferenceType.gpx.rawValue
+ try expect(xcscheme.launchAction?.locationScenarioReference?.identifier) == "../File.gpx"
  try expect(xcscheme.testAction?.environmentVariables).to.beNil()
  try expect(xcscheme.profileAction?.environmentVariables).to.beNil()
  }
@@ -238,7 +240,7 @@ class SchemeGeneratorTests: XCTestCase {
  let scheme = Scheme(
  name: "TestScheme",
  build: Scheme.Build(targets: [buildTarget]),
- run: Scheme.Run(config: "Debug", debugEnabled: false, storeKitConfiguration: "Configuration.storekit")
+ run: Scheme.Run(config: "Debug", debugEnabled: false, simulateLocation: .init(allow: true, defaultLocation: "File.gpx"), storeKitConfiguration: "Configuration.storekit")
  )
  let project = Project(
  name: "test",
@@ -252,6 +254,8 @@ class SchemeGeneratorTests: XCTestCase {
  try expect(xcscheme.launchAction?.selectedDebuggerIdentifier) == ""
  try expect(xcscheme.launchAction?.selectedLauncherIdentifier) == "Xcode.IDEFoundation.Launcher.PosixSpawn"
  try expect(xcscheme.launchAction?.storeKitConfigurationFileReference?.identifier) == "../../Configuration.storekit"
+ try expect(xcscheme.launchAction?.locationScenarioReference?.referenceType) == Scheme.SimulateLocation.ReferenceType.gpx.rawValue
+ try expect(xcscheme.launchAction?.locationScenarioReference?.identifier) == "../../File.gpx"
  }
 
  $0.it("generate scheme without debugger - test") {