mirror of
https://github.com/yonaskolb/XcodeGen.git
synced 2024-08-16 08:10:43 +03:00
Compare commits
8 Commits
ac20354bf4
...
70d021a897
Author | SHA1 | Date | |
---|---|---|---|
|
70d021a897 | ||
|
0dd28421ba | ||
|
72aa193348 | ||
|
f8842228c5 | ||
|
32d356632e | ||
|
f0be240238 | ||
|
b616864b03 | ||
|
ce5d015351 |
@ -1039,7 +1039,7 @@ The different actions share some properties:
|
|||||||
- [ ] **askForAppToLaunch**: **Bool** - `run` and `profile` actions can define the executable set to ask to launch. This defaults to false.
|
- [ ] **askForAppToLaunch**: **Bool** - `run` and `profile` actions 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).
|
- [ ] **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).
|
- [ ] **storeKitConfiguration**: **String** - `run` action can specify a storekit configuration. See [Options](#options).
|
||||||
- [ ] **macroExpansion**: **String** - `run` action can define the macro expansion from other target. This defaults to nil.
|
- [ ] **macroExpansion**: **String** - `run` and `test` action can define the macro expansion from other target. This defaults to nil.
|
||||||
|
|
||||||
### Execution Action
|
### Execution Action
|
||||||
|
|
||||||
|
@ -220,6 +220,7 @@ public struct Scheme: Equatable {
|
|||||||
public var captureScreenshotsAutomatically: Bool
|
public var captureScreenshotsAutomatically: Bool
|
||||||
public var deleteScreenshotsWhenEachTestSucceeds: Bool
|
public var deleteScreenshotsWhenEachTestSucceeds: Bool
|
||||||
public var testPlans: [TestPlan]
|
public var testPlans: [TestPlan]
|
||||||
|
public var macroExpansion: String?
|
||||||
|
|
||||||
public struct TestTarget: Equatable, ExpressibleByStringLiteral {
|
public struct TestTarget: Equatable, ExpressibleByStringLiteral {
|
||||||
|
|
||||||
@ -286,7 +287,8 @@ public struct Scheme: Equatable {
|
|||||||
debugEnabled: Bool = debugEnabledDefault,
|
debugEnabled: Bool = debugEnabledDefault,
|
||||||
customLLDBInit: String? = nil,
|
customLLDBInit: String? = nil,
|
||||||
captureScreenshotsAutomatically: Bool = captureScreenshotsAutomaticallyDefault,
|
captureScreenshotsAutomatically: Bool = captureScreenshotsAutomaticallyDefault,
|
||||||
deleteScreenshotsWhenEachTestSucceeds: Bool = deleteScreenshotsWhenEachTestSucceedsDefault
|
deleteScreenshotsWhenEachTestSucceeds: Bool = deleteScreenshotsWhenEachTestSucceedsDefault,
|
||||||
|
macroExpansion: String? = nil
|
||||||
) {
|
) {
|
||||||
self.config = config
|
self.config = config
|
||||||
self.gatherCoverageData = gatherCoverageData
|
self.gatherCoverageData = gatherCoverageData
|
||||||
@ -304,6 +306,7 @@ public struct Scheme: Equatable {
|
|||||||
self.customLLDBInit = customLLDBInit
|
self.customLLDBInit = customLLDBInit
|
||||||
self.captureScreenshotsAutomatically = captureScreenshotsAutomatically
|
self.captureScreenshotsAutomatically = captureScreenshotsAutomatically
|
||||||
self.deleteScreenshotsWhenEachTestSucceeds = deleteScreenshotsWhenEachTestSucceeds
|
self.deleteScreenshotsWhenEachTestSucceeds = deleteScreenshotsWhenEachTestSucceeds
|
||||||
|
self.macroExpansion = macroExpansion
|
||||||
}
|
}
|
||||||
|
|
||||||
public var shouldUseLaunchSchemeArgsEnv: Bool {
|
public var shouldUseLaunchSchemeArgsEnv: Bool {
|
||||||
@ -620,6 +623,7 @@ extension Scheme.Test: JSONObjectConvertible {
|
|||||||
customLLDBInit = jsonDictionary.json(atKeyPath: "customLLDBInit")
|
customLLDBInit = jsonDictionary.json(atKeyPath: "customLLDBInit")
|
||||||
captureScreenshotsAutomatically = jsonDictionary.json(atKeyPath: "captureScreenshotsAutomatically") ?? Scheme.Test.captureScreenshotsAutomaticallyDefault
|
captureScreenshotsAutomatically = jsonDictionary.json(atKeyPath: "captureScreenshotsAutomatically") ?? Scheme.Test.captureScreenshotsAutomaticallyDefault
|
||||||
deleteScreenshotsWhenEachTestSucceeds = jsonDictionary.json(atKeyPath: "deleteScreenshotsWhenEachTestSucceeds") ?? Scheme.Test.deleteScreenshotsWhenEachTestSucceedsDefault
|
deleteScreenshotsWhenEachTestSucceeds = jsonDictionary.json(atKeyPath: "deleteScreenshotsWhenEachTestSucceeds") ?? Scheme.Test.deleteScreenshotsWhenEachTestSucceedsDefault
|
||||||
|
macroExpansion = jsonDictionary.json(atKeyPath: "macroExpansion")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -286,10 +286,21 @@ public class SchemeGenerator {
|
|||||||
let testPlans = scheme.test?.testPlans.enumerated().map { index, testPlan in
|
let testPlans = scheme.test?.testPlans.enumerated().map { index, testPlan in
|
||||||
XCScheme.TestPlanReference(reference: "container:\(testPlan.path)", default: defaultTestPlanIndex == index)
|
XCScheme.TestPlanReference(reference: "container:\(testPlan.path)", default: defaultTestPlanIndex == index)
|
||||||
} ?? []
|
} ?? []
|
||||||
|
let testBuildableEntries = buildActionEntries.filter({ $0.buildFor.contains(.testing) }) + testBuildTargetEntries
|
||||||
|
let testMacroExpansionBuildableRef = testBuildableEntries.map(\.buildableReference).contains(buildableReference) ? buildableReference : testBuildableEntries.first?.buildableReference
|
||||||
|
|
||||||
|
let testMacroExpansion: XCScheme.BuildableReference = buildActionEntries.first(
|
||||||
|
where: { value in
|
||||||
|
if let macroExpansion = scheme.test?.macroExpansion {
|
||||||
|
return value.buildableReference.blueprintName == macroExpansion
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
)?.buildableReference ?? testMacroExpansionBuildableRef ?? buildableReference
|
||||||
|
|
||||||
let testAction = XCScheme.TestAction(
|
let testAction = XCScheme.TestAction(
|
||||||
buildConfiguration: scheme.test?.config ?? defaultDebugConfig.name,
|
buildConfiguration: scheme.test?.config ?? defaultDebugConfig.name,
|
||||||
macroExpansion: buildableReference,
|
macroExpansion: testMacroExpansion,
|
||||||
testables: testables,
|
testables: testables,
|
||||||
testPlans: testPlans.isEmpty ? nil : testPlans,
|
testPlans: testPlans.isEmpty ? nil : testPlans,
|
||||||
preActions: scheme.test?.preActions.map(getExecutionAction) ?? [],
|
preActions: scheme.test?.preActions.map(getExecutionAction) ?? [],
|
||||||
|
@ -476,9 +476,84 @@ class SchemeGeneratorTests: XCTestCase {
|
|||||||
let xcodeProject = try project.generateXcodeProject()
|
let xcodeProject = try project.generateXcodeProject()
|
||||||
|
|
||||||
let xcscheme = try unwrap(xcodeProject.sharedData?.schemes.first)
|
let xcscheme = try unwrap(xcodeProject.sharedData?.schemes.first)
|
||||||
|
try expect(xcscheme.testAction?.macroExpansion?.buildableName) == "MyApp.app"
|
||||||
|
try expect(xcscheme.launchAction?.macroExpansion?.buildableName) == "MyApp.app"
|
||||||
|
}
|
||||||
|
|
||||||
|
$0.it("allows to override test macroExpansion") {
|
||||||
|
let app = Target(
|
||||||
|
name: "MyApp",
|
||||||
|
type: .application,
|
||||||
|
platform: .iOS,
|
||||||
|
dependencies: [Dependency(type: .target, reference: "MyAppExtension", embed: false)]
|
||||||
|
)
|
||||||
|
|
||||||
|
let `extension` = Target(
|
||||||
|
name: "MyAppExtension",
|
||||||
|
type: .appExtension,
|
||||||
|
platform: .iOS
|
||||||
|
)
|
||||||
|
let appTarget = Scheme.BuildTarget(target: .local(app.name), buildTypes: [.running])
|
||||||
|
let extensionTarget = Scheme.BuildTarget(target: .local(`extension`.name), buildTypes: [.running])
|
||||||
|
|
||||||
|
let scheme = Scheme(
|
||||||
|
name: "TestScheme",
|
||||||
|
build: Scheme.Build(targets: [appTarget, extensionTarget]),
|
||||||
|
run: Scheme.Run(config: "Debug", macroExpansion: "MyApp"),
|
||||||
|
test: .init(macroExpansion: "MyAppExtension")
|
||||||
|
)
|
||||||
|
let project = Project(
|
||||||
|
name: "test",
|
||||||
|
targets: [app, `extension`],
|
||||||
|
schemes: [scheme]
|
||||||
|
)
|
||||||
|
let xcodeProject = try project.generateXcodeProject()
|
||||||
|
|
||||||
|
let xcscheme = try unwrap(xcodeProject.sharedData?.schemes.first)
|
||||||
|
try expect(xcscheme.testAction?.macroExpansion?.buildableName) == "MyAppExtension.appex"
|
||||||
try expect(xcscheme.launchAction?.macroExpansion?.buildableName) == "MyApp.app"
|
try expect(xcscheme.launchAction?.macroExpansion?.buildableName) == "MyApp.app"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$0.it("generates scheme with macroExpansion from tests when the main target is not part of the scheme") {
|
||||||
|
let app = Target(
|
||||||
|
name: "MyApp",
|
||||||
|
type: .application,
|
||||||
|
platform: .iOS,
|
||||||
|
dependencies: []
|
||||||
|
)
|
||||||
|
|
||||||
|
let mockApp = Target(
|
||||||
|
name: "MockApp",
|
||||||
|
type: .application,
|
||||||
|
platform: .iOS,
|
||||||
|
dependencies: []
|
||||||
|
)
|
||||||
|
|
||||||
|
let testBundle = Target(
|
||||||
|
name: "TestBundle",
|
||||||
|
type: .unitTestBundle,
|
||||||
|
platform: .iOS
|
||||||
|
)
|
||||||
|
let appTarget = Scheme.BuildTarget(target: .local(app.name), buildTypes: [.running])
|
||||||
|
let mockAppTarget = Scheme.BuildTarget(target: .local(mockApp.name), buildTypes: [.testing])
|
||||||
|
let testBundleTarget = Scheme.BuildTarget(target: .local(testBundle.name), buildTypes: [.testing])
|
||||||
|
|
||||||
|
let scheme = Scheme(
|
||||||
|
name: "TestScheme",
|
||||||
|
build: Scheme.Build(targets: [appTarget, mockAppTarget, testBundleTarget]),
|
||||||
|
run: Scheme.Run(config: "Debug", macroExpansion: "MyApp")
|
||||||
|
)
|
||||||
|
let project = Project(
|
||||||
|
name: "test",
|
||||||
|
targets: [app, mockApp, testBundle],
|
||||||
|
schemes: [scheme]
|
||||||
|
)
|
||||||
|
let xcodeProject = try project.generateXcodeProject()
|
||||||
|
|
||||||
|
let xcscheme = try unwrap(xcodeProject.sharedData?.schemes.first)
|
||||||
|
try expect(xcscheme.testAction?.macroExpansion?.buildableName) == "MockApp.app"
|
||||||
|
}
|
||||||
|
|
||||||
$0.it("generates scheme with test target of local swift package") {
|
$0.it("generates scheme with test target of local swift package") {
|
||||||
let targetScheme = TargetScheme(
|
let targetScheme = TargetScheme(
|
||||||
testTargets: [Scheme.Test.TestTarget(targetReference: TestableTargetReference(name: "XcodeGenKitTests", location: .package("XcodeGen")))])
|
testTargets: [Scheme.Test.TestTarget(targetReference: TestableTargetReference(name: "XcodeGenKitTests", location: .package("XcodeGen")))])
|
||||||
|
Loading…
Reference in New Issue
Block a user