Skip to content

Commit de31312

Browse files
mokagiomokagio
committed
Use ScreenObject 0.3.0, which ships with XCUITestHelpers
This means: - Remove the standalone XCUITestHelpers package linkage - Update UITestsFoundation to link XCUITestHelpers via the ScreenObject product - Remove XCUITestHelpers linkage from the UI tests and screenshots targets; it was there but not used There also is a change in the Xcode project for the location in the list of the `GhostItemCardView.swift` file, but that's something Xcode did automatically, unrelated to the ScreenObject work. See also wordpress-mobile/WordPress-iOS#24078
1 parent 5282088 commit de31312

File tree

2 files changed

+13
-47
lines changed

2 files changed

+13
-47
lines changed

‎WooCommerce.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 2 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎WooCommerce/WooCommerce.xcodeproj/project.pbxproj‎

Lines changed: 11 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@
8080
0204E3622B8CD40B00F1B5FD /* WooAnalyticsEvent+Products.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0204E3612B8CD40B00F1B5FD /* WooAnalyticsEvent+Products.swift */; };
8181
0204F0CA29C047A400CFC78F /* SelfSizingHostingController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0204F0C929C047A400CFC78F /* SelfSizingHostingController.swift */; };
8282
0205021E27C8B6C600FB1C6B /* InboxEligibilityUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0205021D27C8B6C600FB1C6B /* InboxEligibilityUseCase.swift */; };
83+
020556512D5DA45500E51059 /* GhostItemCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 020556502D5DA45500E51059 /* GhostItemCardView.swift */; };
8384
02055B142D5DAB6400E51059 /* POSCornerRadiusStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02055B132D5DAB6400E51059 /* POSCornerRadiusStyle.swift */; };
8485
020564982D5DC96600E51059 /* POSShadowStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 020564972D5DC96600E51059 /* POSShadowStyle.swift */; };
85-
020556512D5DA45500E51059 /* GhostItemCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 020556502D5DA45500E51059 /* GhostItemCardView.swift */; };
8686
0206483A23FA4160008441BB /* OrdersRootViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0206483923FA4160008441BB /* OrdersRootViewController.swift */; };
8787
0206E296299CD2C900C061C1 /* WooAnalyticsEvent+DomainSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0206E295299CD2C900C061C1 /* WooAnalyticsEvent+DomainSettings.swift */; };
8888
020732042988AB7B000A53C2 /* DomainContactInfoForm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 020732032988AB7B000A53C2 /* DomainContactInfoForm.swift */; };
@@ -1270,8 +1270,6 @@
12701270
3F0CF3122704490A00EF3D71 /* LoginCheckMagicLinkScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = F997171F23DBCD6100592D8E /* LoginCheckMagicLinkScreen.swift */; };
12711271
3F0CF3132704490A00EF3D71 /* PrologueScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F3A972258862BE0085859B /* PrologueScreen.swift */; };
12721272
3F0CF3142704494A00EF3D71 /* TabNavComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = F997172F23DBCEB200592D8E /* TabNavComponent.swift */; };
1273-
3F1CA81D26C3542600228BF2 /* XCUITestHelpers in Frameworks */ = {isa = PBXBuildFile; productRef = 3F1CA81C26C3542600228BF2 /* XCUITestHelpers */; };
1274-
3F1CA81F26C3543C00228BF2 /* XCUITestHelpers in Frameworks */ = {isa = PBXBuildFile; productRef = 3F1CA81E26C3543C00228BF2 /* XCUITestHelpers */; };
12751273
3F1FA84228B60125009E246C /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F1FA84128B60125009E246C /* WidgetKit.framework */; };
12761274
3F1FA84328B60125009E246C /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5744BEB0248FE44C000A6FE2 /* SwiftUI.framework */; };
12771275
3F1FA84628B60125009E246C /* StoreWidgets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F1FA84528B60125009E246C /* StoreWidgets.swift */; };
@@ -1288,12 +1286,12 @@
12881286
3F58701F281B947E004F7556 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3F58701E281B947E004F7556 /* Main.storyboard */; };
12891287
3F587021281B9494004F7556 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3F587020281B9494004F7556 /* LaunchScreen.storyboard */; };
12901288
3F587026281B9C19004F7556 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3F587028281B9C19004F7556 /* InfoPlist.strings */; };
1289+
3FA323272D63E0570017AE66 /* XCUITestHelpers in Frameworks */ = {isa = PBXBuildFile; productRef = 3FA323262D63E0570017AE66 /* XCUITestHelpers */; };
12911290
3FA96DF42C94043200CDA78F /* Yosemite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3FA96DF32C94043200CDA78F /* Yosemite.framework */; };
12921291
3FF2247326706AA3008FFA87 /* ScreenObject in Frameworks */ = {isa = PBXBuildFile; productRef = 3FF2247226706AA3008FFA87 /* ScreenObject */; };
12931292
3FF2248A267073AE008FFA87 /* ScreenObject in Frameworks */ = {isa = PBXBuildFile; productRef = 3FF22489267073AE008FFA87 /* ScreenObject */; };
12941293
3FF314E126FC74450012E68E /* UITestsFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FF314E026FC74450012E68E /* UITestsFoundation.h */; settings = {ATTRIBUTES = (Public, ); }; };
12951294
3FF314E726FC74560012E68E /* ScreenObject in Frameworks */ = {isa = PBXBuildFile; productRef = 3FF314E626FC74560012E68E /* ScreenObject */; };
1296-
3FF314E926FC74600012E68E /* XCUITestHelpers in Frameworks */ = {isa = PBXBuildFile; productRef = 3FF314E826FC74600012E68E /* XCUITestHelpers */; };
12971295
3FF314EA26FC751B0012E68E /* XCTest+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F997173223DBCF2800592D8E /* XCTest+Extensions.swift */; };
12981296
3FF314F126FC785C0012E68E /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3FF314EF26FC784A0012E68E /* XCTest.framework */; platformFilter = ios; };
12991297
3FF314F426FD4C4A0012E68E /* BaseScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = F997172B23DBCD8E00592D8E /* BaseScreen.swift */; };
@@ -3286,9 +3284,9 @@
32863284
0204E3612B8CD40B00F1B5FD /* WooAnalyticsEvent+Products.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WooAnalyticsEvent+Products.swift"; sourceTree = "<group>"; };
32873285
0204F0C929C047A400CFC78F /* SelfSizingHostingController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelfSizingHostingController.swift; sourceTree = "<group>"; };
32883286
0205021D27C8B6C600FB1C6B /* InboxEligibilityUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InboxEligibilityUseCase.swift; sourceTree = "<group>"; };
3287+
020556502D5DA45500E51059 /* GhostItemCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GhostItemCardView.swift; sourceTree = "<group>"; };
32893288
02055B132D5DAB6400E51059 /* POSCornerRadiusStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = POSCornerRadiusStyle.swift; sourceTree = "<group>"; };
32903289
020564972D5DC96600E51059 /* POSShadowStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = POSShadowStyle.swift; sourceTree = "<group>"; };
3291-
020556502D5DA45500E51059 /* GhostItemCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GhostItemCardView.swift; sourceTree = "<group>"; };
32923290
0206483923FA4160008441BB /* OrdersRootViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrdersRootViewController.swift; sourceTree = "<group>"; };
32933291
0206E295299CD2C900C061C1 /* WooAnalyticsEvent+DomainSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WooAnalyticsEvent+DomainSettings.swift"; sourceTree = "<group>"; };
32943292
020732032988AB7B000A53C2 /* DomainContactInfoForm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DomainContactInfoForm.swift; sourceTree = "<group>"; };
@@ -6392,8 +6390,8 @@
63926390
buildActionMask = 2147483647;
63936391
files = (
63946392
3FF314E726FC74560012E68E /* ScreenObject in Frameworks */,
6393+
3FA323272D63E0570017AE66 /* XCUITestHelpers in Frameworks */,
63956394
3FF314F126FC785C0012E68E /* XCTest.framework in Frameworks */,
6396-
3FF314E926FC74600012E68E /* XCUITestHelpers in Frameworks */,
63976395
);
63986396
runOnlyForDeploymentPostprocessing = 0;
63996397
};
@@ -6444,7 +6442,6 @@
64446442
3FF314F526FD4F430012E68E /* UITestsFoundation.framework in Frameworks */,
64456443
3F2C8A1D285B03A400B1A5BB /* BuildkiteTestCollector in Frameworks */,
64466444
247CE89C2583402A00F9D9D1 /* Embassy in Frameworks */,
6447-
3F1CA81D26C3542600228BF2 /* XCUITestHelpers in Frameworks */,
64486445
3FF2247326706AA3008FFA87 /* ScreenObject in Frameworks */,
64496446
);
64506447
runOnlyForDeploymentPostprocessing = 0;
@@ -6456,7 +6453,6 @@
64566453
3FF314F626FD4F490012E68E /* UITestsFoundation.framework in Frameworks */,
64576454
3F2C8A1B285B039900B1A5BB /* BuildkiteTestCollector in Frameworks */,
64586455
24C5AC7625A53021008FD769 /* Embassy in Frameworks */,
6459-
3F1CA81F26C3543C00228BF2 /* XCUITestHelpers in Frameworks */,
64606456
3FF2248A267073AE008FFA87 /* ScreenObject in Frameworks */,
64616457
);
64626458
runOnlyForDeploymentPostprocessing = 0;
@@ -14339,7 +14335,7 @@
1433914335
name = UITestsFoundation;
1434014336
packageProductDependencies = (
1434114337
3FF314E626FC74560012E68E /* ScreenObject */,
14342-
3FF314E826FC74600012E68E /* XCUITestHelpers */,
14338+
3FA323262D63E0570017AE66 /* XCUITestHelpers */,
1434314339
);
1434414340
productName = UITestsFoundation;
1434514341
productReference = 3FF314DE26FC74450012E68E /* UITestsFoundation.framework */;
@@ -14428,7 +14424,6 @@
1442814424
name = WooCommerceUITests;
1442914425
packageProductDependencies = (
1443014426
3FF2247226706AA3008FFA87 /* ScreenObject */,
14431-
3F1CA81C26C3542600228BF2 /* XCUITestHelpers */,
1443214427
3F2C8A1C285B03A400B1A5BB /* BuildkiteTestCollector */,
1443314428
);
1443414429
productName = WooCommerceUITests;
@@ -14453,7 +14448,6 @@
1445314448
packageProductDependencies = (
1445414449
247CE89B2583402A00F9D9D1 /* Embassy */,
1445514450
3FF22489267073AE008FFA87 /* ScreenObject */,
14456-
3F1CA81E26C3543C00228BF2 /* XCUITestHelpers */,
1445714451
3F2C8A1A285B039900B1A5BB /* BuildkiteTestCollector */,
1445814452
);
1445914453
productName = WooCommerceScreenshots;
@@ -14562,7 +14556,6 @@
1456214556
247CE89A2583402A00F9D9D1 /* XCRemoteSwiftPackageReference "Embassy" */,
1456314557
45455E302657C3F300BBB0C4 /* XCRemoteSwiftPackageReference "SwiftUI-Shimmer" */,
1456414558
3FF2247126706AA3008FFA87 /* XCRemoteSwiftPackageReference "ScreenObject" */,
14565-
3F1CA81B26C3542600228BF2 /* XCRemoteSwiftPackageReference "XCUITestHelpers" */,
1456614559
174CA86827D90A6200126524 /* XCRemoteSwiftPackageReference "AutomatticAbout-swift" */,
1456714560
4598297F28574688003A9AFE /* XCRemoteSwiftPackageReference "Inject" */,
1456814561
3F2C8A17285B038800B1A5BB /* XCRemoteSwiftPackageReference "test-collector-swift" */,
@@ -19465,14 +19458,6 @@
1946519458
minimumVersion = 7.0.0;
1946619459
};
1946719460
};
19468-
3F1CA81B26C3542600228BF2 /* XCRemoteSwiftPackageReference "XCUITestHelpers" */ = {
19469-
isa = XCRemoteSwiftPackageReference;
19470-
repositoryURL = "https://github.com/Automattic/XCUITestHelpers";
19471-
requirement = {
19472-
kind = upToNextMajorVersion;
19473-
minimumVersion = 0.3.0;
19474-
};
19475-
};
1947619461
3F2C8A17285B038800B1A5BB /* XCRemoteSwiftPackageReference "test-collector-swift" */ = {
1947719462
isa = XCRemoteSwiftPackageReference;
1947819463
repositoryURL = "https://github.com/buildkite/test-collector-swift";
@@ -19486,7 +19471,7 @@
1948619471
repositoryURL = "https://github.com/Automattic/ScreenObject";
1948719472
requirement = {
1948819473
kind = upToNextMajorVersion;
19489-
minimumVersion = 0.2.3;
19474+
minimumVersion = 0.3.0;
1949019475
};
1949119476
};
1949219477
45455E302657C3F300BBB0C4 /* XCRemoteSwiftPackageReference "SwiftUI-Shimmer" */ = {
@@ -19569,16 +19554,6 @@
1956919554
isa = XCSwiftPackageProductDependency;
1957019555
productName = Codegen;
1957119556
};
19572-
3F1CA81C26C3542600228BF2 /* XCUITestHelpers */ = {
19573-
isa = XCSwiftPackageProductDependency;
19574-
package = 3F1CA81B26C3542600228BF2 /* XCRemoteSwiftPackageReference "XCUITestHelpers" */;
19575-
productName = XCUITestHelpers;
19576-
};
19577-
3F1CA81E26C3543C00228BF2 /* XCUITestHelpers */ = {
19578-
isa = XCSwiftPackageProductDependency;
19579-
package = 3F1CA81B26C3542600228BF2 /* XCRemoteSwiftPackageReference "XCUITestHelpers" */;
19580-
productName = XCUITestHelpers;
19581-
};
1958219557
3F2C8A18285B038800B1A5BB /* BuildkiteTestCollector */ = {
1958319558
isa = XCSwiftPackageProductDependency;
1958419559
package = 3F2C8A17285B038800B1A5BB /* XCRemoteSwiftPackageReference "test-collector-swift" */;
@@ -19594,6 +19569,11 @@
1959419569
package = 3F2C8A17285B038800B1A5BB /* XCRemoteSwiftPackageReference "test-collector-swift" */;
1959519570
productName = BuildkiteTestCollector;
1959619571
};
19572+
3FA323262D63E0570017AE66 /* XCUITestHelpers */ = {
19573+
isa = XCSwiftPackageProductDependency;
19574+
package = 3FF2247126706AA3008FFA87 /* XCRemoteSwiftPackageReference "ScreenObject" */;
19575+
productName = XCUITestHelpers;
19576+
};
1959719577
3FF2247226706AA3008FFA87 /* ScreenObject */ = {
1959819578
isa = XCSwiftPackageProductDependency;
1959919579
package = 3FF2247126706AA3008FFA87 /* XCRemoteSwiftPackageReference "ScreenObject" */;
@@ -19609,11 +19589,6 @@
1960919589
package = 3FF2247126706AA3008FFA87 /* XCRemoteSwiftPackageReference "ScreenObject" */;
1961019590
productName = ScreenObject;
1961119591
};
19612-
3FF314E826FC74600012E68E /* XCUITestHelpers */ = {
19613-
isa = XCSwiftPackageProductDependency;
19614-
package = 3F1CA81B26C3542600228BF2 /* XCRemoteSwiftPackageReference "XCUITestHelpers" */;
19615-
productName = XCUITestHelpers;
19616-
};
1961719592
45455E312657C3F300BBB0C4 /* Shimmer */ = {
1961819593
isa = XCSwiftPackageProductDependency;
1961919594
package = 45455E302657C3F300BBB0C4 /* XCRemoteSwiftPackageReference "SwiftUI-Shimmer" */;

0 commit comments

Comments
 (0)