Skip to content

Commit 86fc0e9

Browse files
mokagiomokagio
authored
Remove standalone XCUITestHelper in favor of ScreenObject 0.3.0 (#1695)
2 parents 670d471 + b9481e3 commit 86fc0e9

File tree

3 files changed

+23
-50
lines changed

3 files changed

+23
-50
lines changed

‎Simplenote.xcodeproj/project.pbxproj

+11-28
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,13 @@
5555
3F1BB4A0242DB81E006D1A04 /* ScreenshotsCredentials.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F1BB49F242DB81E006D1A04 /* ScreenshotsCredentials.swift */; };
5656
3F1BB4A3242DC162006D1A04 /* SnapshotHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F1BB4A2242DC162006D1A04 /* SnapshotHelper.swift */; };
5757
3F4BA07E26CDF295000619B1 /* ScreenObject in Frameworks */ = {isa = PBXBuildFile; productRef = 3F4BA07D26CDF295000619B1 /* ScreenObject */; };
58-
3F762E8F2677F19C0088CD45 /* XCUITestHelpers in Frameworks */ = {isa = PBXBuildFile; productRef = 3F762E8E2677F19C0088CD45 /* XCUITestHelpers */; };
59-
3F762E912677F1AA0088CD45 /* XCUITestHelpers in Frameworks */ = {isa = PBXBuildFile; productRef = 3F762E902677F1AA0088CD45 /* XCUITestHelpers */; };
6058
3FA17B5626240FF000C11C46 /* NoteData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FA17B5526240FF000C11C46 /* NoteData.swift */; };
59+
3FA323292D63E5A90017AE66 /* XCUITestHelpers in Frameworks */ = {isa = PBXBuildFile; productRef = 3FA323282D63E5A90017AE66 /* XCUITestHelpers */; };
60+
3FA3232B2D63E6F50017AE66 /* XCUITestHelpers in Frameworks */ = {isa = PBXBuildFile; productRef = 3FA3232A2D63E6F50017AE66 /* XCUITestHelpers */; };
6161
3FA6013C242C5AAE0068FC52 /* SimplenoteScreenshots.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FA6013B242C5AAE0068FC52 /* SimplenoteScreenshots.swift */; };
6262
3FF314CE26FC20FD0012E68E /* PasscodeScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F4BA07F26CE00A2000619B1 /* PasscodeScreen.swift */; };
6363
3FF314D326FC47720012E68E /* XCUIApplication+Assertions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FF314D226FC47720012E68E /* XCUIApplication+Assertions.swift */; };
6464
3FFBDBEE26FBF132008AD052 /* UITestsFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FFBDBED26FBF132008AD052 /* UITestsFoundation.h */; settings = {ATTRIBUTES = (Public, ); }; };
65-
3FFBDBF626FBF143008AD052 /* XCUITestHelpers in Frameworks */ = {isa = PBXBuildFile; productRef = 3FFBDBF526FBF143008AD052 /* XCUITestHelpers */; };
6665
3FFBDBF826FBF148008AD052 /* ScreenObject in Frameworks */ = {isa = PBXBuildFile; productRef = 3FFBDBF726FBF148008AD052 /* ScreenObject */; };
6766
3FFBDBF926FBF161008AD052 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F3CA94826255FA800F6316F /* XCTest.framework */; platformFilter = ios; };
6867
4352BA0867E0E416EB5FF6B9 /* Pods_Automattic_Simplenote.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3318C36BBA08D53624E27EFC /* Pods_Automattic_Simplenote.framework */; };
@@ -1359,16 +1358,15 @@
13591358
isa = PBXFrameworksBuildPhase;
13601359
buildActionMask = 2147483647;
13611360
files = (
1362-
3F762E912677F1AA0088CD45 /* XCUITestHelpers in Frameworks */,
13631361
3F4BA07E26CDF295000619B1 /* ScreenObject in Frameworks */,
1362+
3FA323292D63E5A90017AE66 /* XCUITestHelpers in Frameworks */,
13641363
);
13651364
runOnlyForDeploymentPostprocessing = 0;
13661365
};
13671366
3FFBDBE826FBF132008AD052 /* Frameworks */ = {
13681367
isa = PBXFrameworksBuildPhase;
13691368
buildActionMask = 2147483647;
13701369
files = (
1371-
3FFBDBF626FBF143008AD052 /* XCUITestHelpers in Frameworks */,
13721370
3FFBDBF926FBF161008AD052 /* XCTest.framework in Frameworks */,
13731371
3FFBDBF826FBF148008AD052 /* ScreenObject in Frameworks */,
13741372
);
@@ -1444,7 +1442,7 @@
14441442
isa = PBXFrameworksBuildPhase;
14451443
buildActionMask = 2147483647;
14461444
files = (
1447-
3F762E8F2677F19C0088CD45 /* XCUITestHelpers in Frameworks */,
1445+
3FA3232B2D63E6F50017AE66 /* XCUITestHelpers in Frameworks */,
14481446
);
14491447
runOnlyForDeploymentPostprocessing = 0;
14501448
};
@@ -2826,8 +2824,8 @@
28262824
);
28272825
name = SimplenoteScreenshots;
28282826
packageProductDependencies = (
2829-
3F762E902677F1AA0088CD45 /* XCUITestHelpers */,
28302827
3F4BA07D26CDF295000619B1 /* ScreenObject */,
2828+
3FA323282D63E5A90017AE66 /* XCUITestHelpers */,
28312829
);
28322830
productName = SimplenoteScreenshots;
28332831
productReference = 3FA60139242C5AAD0068FC52 /* SimplenoteScreenshots.xctest */;
@@ -2848,7 +2846,6 @@
28482846
);
28492847
name = UITestsFoundation;
28502848
packageProductDependencies = (
2851-
3FFBDBF526FBF143008AD052 /* XCUITestHelpers */,
28522849
3FFBDBF726FBF148008AD052 /* ScreenObject */,
28532850
);
28542851
productName = UITestsFoundation;
@@ -2986,7 +2983,7 @@
29862983
);
29872984
name = SimplenoteUITests;
29882985
packageProductDependencies = (
2989-
3F762E8E2677F19C0088CD45 /* XCUITestHelpers */,
2986+
3FA3232A2D63E6F50017AE66 /* XCUITestHelpers */,
29902987
);
29912988
productName = SimplenoteUITests;
29922989
productReference = D864B15425CAE25000F9B73E /* SimplenoteUITests.xctest */;
@@ -3099,7 +3096,6 @@
30993096
B5BAF9EB24E4D0D2000917C0 /* XCRemoteSwiftPackageReference "SimplenoteFoundation-Swift" */,
31003097
B50D2FB424E6DFAC00163FC3 /* XCRemoteSwiftPackageReference "SimplenoteSearch-Swift" */,
31013098
B59CACFA2541E05400958330 /* XCRemoteSwiftPackageReference "SimplenoteInterlinks-Swift" */,
3102-
3F762E8D2677F19C0088CD45 /* XCRemoteSwiftPackageReference "XCUITestHelpers" */,
31033099
3F4BA07C26CDF295000619B1 /* XCRemoteSwiftPackageReference "ScreenObject" */,
31043100
BA2015B92B573761005E59AA /* XCRemoteSwiftPackageReference "Automattic-Tracks-iOS" */,
31053101
B51D44592C52CB4000F296A7 /* XCRemoteSwiftPackageReference "SimplenoteEndpoints-Swift" */,
@@ -6205,15 +6201,7 @@
62056201
repositoryURL = "https://github.com/Automattic/ScreenObject";
62066202
requirement = {
62076203
kind = upToNextMajorVersion;
6208-
minimumVersion = 0.2.0;
6209-
};
6210-
};
6211-
3F762E8D2677F19C0088CD45 /* XCRemoteSwiftPackageReference "XCUITestHelpers" */ = {
6212-
isa = XCRemoteSwiftPackageReference;
6213-
repositoryURL = "https://github.com/Automattic/XCUITestHelpers";
6214-
requirement = {
6215-
kind = upToNextMajorVersion;
6216-
minimumVersion = 0.1.0;
6204+
minimumVersion = 0.3.0;
62176205
};
62186206
};
62196207
B50D2FB424E6DFAC00163FC3 /* XCRemoteSwiftPackageReference "SimplenoteSearch-Swift" */ = {
@@ -6264,19 +6252,14 @@
62646252
package = 3F4BA07C26CDF295000619B1 /* XCRemoteSwiftPackageReference "ScreenObject" */;
62656253
productName = ScreenObject;
62666254
};
6267-
3F762E8E2677F19C0088CD45 /* XCUITestHelpers */ = {
6255+
3FA323282D63E5A90017AE66 /* XCUITestHelpers */ = {
62686256
isa = XCSwiftPackageProductDependency;
6269-
package = 3F762E8D2677F19C0088CD45 /* XCRemoteSwiftPackageReference "XCUITestHelpers" */;
6270-
productName = XCUITestHelpers;
6271-
};
6272-
3F762E902677F1AA0088CD45 /* XCUITestHelpers */ = {
6273-
isa = XCSwiftPackageProductDependency;
6274-
package = 3F762E8D2677F19C0088CD45 /* XCRemoteSwiftPackageReference "XCUITestHelpers" */;
6257+
package = 3F4BA07C26CDF295000619B1 /* XCRemoteSwiftPackageReference "ScreenObject" */;
62756258
productName = XCUITestHelpers;
62766259
};
6277-
3FFBDBF526FBF143008AD052 /* XCUITestHelpers */ = {
6260+
3FA3232A2D63E6F50017AE66 /* XCUITestHelpers */ = {
62786261
isa = XCSwiftPackageProductDependency;
6279-
package = 3F762E8D2677F19C0088CD45 /* XCRemoteSwiftPackageReference "XCUITestHelpers" */;
6262+
package = 3F4BA07C26CDF295000619B1 /* XCRemoteSwiftPackageReference "ScreenObject" */;
62806263
productName = XCUITestHelpers;
62816264
};
62826265
3FFBDBF726FBF148008AD052 /* ScreenObject */ = {

‎Simplenote.xcodeproj/xcshareddata/xcschemes/SimplenoteScreenshots.xcscheme

+9-10
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,6 @@
4040
ReferencedContainer = "container:Simplenote.xcodeproj">
4141
</BuildableReference>
4242
</TestableReference>
43-
<TestableReference
44-
skipped = "YES">
45-
<BuildableReference
46-
BuildableIdentifier = "primary"
47-
BlueprintIdentifier = "D864B15325CAE25000F9B73E"
48-
BuildableName = "SimplenoteUITests.xctest"
49-
BlueprintName = "SimplenoteUITests"
50-
ReferencedContainer = "container:Simplenote.xcodeproj">
51-
</BuildableReference>
52-
</TestableReference>
5343
</Testables>
5444
</TestAction>
5545
<LaunchAction
@@ -79,6 +69,15 @@
7969
savedToolIdentifier = ""
8070
useCustomWorkingDirectory = "NO"
8171
debugDocumentVersioning = "YES">
72+
<MacroExpansion>
73+
<BuildableReference
74+
BuildableIdentifier = "primary"
75+
BlueprintIdentifier = "46A3C96017DFA81A002865AE"
76+
BuildableName = "Simplenote.app"
77+
BlueprintName = "Simplenote"
78+
ReferencedContainer = "container:Simplenote.xcodeproj">
79+
</BuildableReference>
80+
</MacroExpansion>
8281
</ProfileAction>
8382
<AnalyzeAction
8483
buildConfiguration = "Debug">

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

+3-12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"originHash" : "5c7dc5a8c3fa899620d4a2168cf121438ee740cb5c2b5fac978ee6263951dbe7",
2+
"originHash" : "3dd6595724cdd9c11b66b7239306094edda86a9c111ac85bd439e7d15d1d1a8c",
33
"pins" : [
44
{
55
"identity" : "automattic-tracks-ios",
@@ -15,8 +15,8 @@
1515
"kind" : "remoteSourceControl",
1616
"location" : "https://github.com/Automattic/ScreenObject",
1717
"state" : {
18-
"revision" : "328db56c62aab91440ec5e07cc9f7eef6e26a26e",
19-
"version" : "0.2.3"
18+
"revision" : "5a62548524a0ad65d8e2e5d4f665981c48066253",
19+
"version" : "0.3.0"
2020
}
2121
},
2222
{
@@ -81,15 +81,6 @@
8181
"revision" : "4699794b08bb79a4d77785edaba6ea739e298e4b",
8282
"version" : "2.3.0"
8383
}
84-
},
85-
{
86-
"identity" : "xcuitesthelpers",
87-
"kind" : "remoteSourceControl",
88-
"location" : "https://github.com/Automattic/XCUITestHelpers",
89-
"state" : {
90-
"revision" : "5179cb69d58b90761cc713bdee7740c4889d3295",
91-
"version" : "0.4.0"
92-
}
9384
}
9485
],
9586
"version" : 3

0 commit comments

Comments
 (0)