Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,22 @@
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES"
buildArchitectures = "Automatic">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Networking"
BuildableName = "Networking"
BlueprintName = "Networking"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
Expand All @@ -14,22 +30,10 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<TestPlans>
<TestPlanReference
reference = "container:NetworkingTests/NetworkingTests.xctestplan"
reference = "container:Tests/NetworkingTests/NetworkingTests.xctestplan"
default = "YES">
</TestPlanReference>
</TestPlans>
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B557D9EB209753AA005962F4"
BuildableName = "NetworkingTests.xctest"
BlueprintName = "NetworkingTests"
ReferencedContainer = "container:Networking.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -48,6 +52,15 @@
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Networking"
BuildableName = "Networking"
BlueprintName = "Networking"
ReferencedContainer = "container:">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
Expand Down
27 changes: 13 additions & 14 deletions Modules/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,19 @@ let package = Package(
"Hardware"
]
),
.testTarget(
name: "NetworkingTests",
dependencies: [
"Codegen",
"Fakes",
"Networking",
"TestKit",
"WooFoundation",
"WordPressShared",
.product(name: "KeychainAccess", package: "KeychainAccess"),
],
resources: [.process("Responses")]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • The Yosemite and WooCommerce test targets now reference the NetworkingTests/Responses/ folder from the location in the Modules/Tests/ folder. At some point, we ought to isolate the responses in some kind of tests helper package, but for the moment including them this way (which to me is like a soft-duplication) is convenient.

I agree that a separate package for these mock responses would be ideal.

),
.testTarget(
name: "StorageTests",
dependencies: [
Expand Down Expand Up @@ -274,7 +287,6 @@ let package = Package(

enum XcodeTargetNames {
static let fakes = "Fakes"
static let networkingTests = "NetworkingTests"
static let notificationExtension = "NotificationExtension"
static let storeWidgetsExtension = "StoreWidgetsExtension"
static let uiTestsFoundation = "UITestsFoundation"
Expand All @@ -291,7 +303,6 @@ enum XcodeTargetNames {
enum XcodeSupport {
static var products: [Product] {
[
XcodeTargetNames.networkingTests,
XcodeTargetNames.notificationExtension,
XcodeTargetNames.storeWidgetsExtension,
XcodeTargetNames.uiTestsFoundation,
Expand All @@ -308,18 +319,6 @@ enum XcodeSupport {

static var targets: [Target] {
[
.xcodeTarget(
XcodeTargetNames.networkingTests,
dependencies: [
"Codegen",
"Fakes",
"Networking",
"TestKit",
"WooFoundation",
"WordPressShared",
.product(name: "KeychainAccess", package: "KeychainAccess"),
]
),
.xcodeTarget(
XcodeTargetNames.notificationExtension,
dependencies: [
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"testTargets" : [
{
"target" : {
"containerPath" : "container:Networking.xcodeproj",
"identifier" : "B557D9EB209753AA005962F4",
"containerPath" : "container:",
"identifier" : "NetworkingTests",
"name" : "NetworkingTests"
}
}
Expand Down
Loading