summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--ios/MullvadVPN.xcodeproj/project.pbxproj6
-rw-r--r--ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPN.xcscheme3
-rw-r--r--ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPNScreenshots.xcscheme16
-rw-r--r--ios/Snapfile3
-rw-r--r--ios/TestPlans/MullvadVPNApp.xctestplan9
-rw-r--r--ios/TestPlans/MullvadVPNCI.xctestplan8
-rw-r--r--ios/TestPlans/MullvadVPNScreenshots.xctestplan29
7 files changed, 51 insertions, 23 deletions
diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj
index ab803eb480..c6733a622c 100644
--- a/ios/MullvadVPN.xcodeproj/project.pbxproj
+++ b/ios/MullvadVPN.xcodeproj/project.pbxproj
@@ -388,6 +388,7 @@
58FDF2D92A0BA11A00C2B061 /* DeviceCheckOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58FDF2D82A0BA11900C2B061 /* DeviceCheckOperation.swift */; };
58FEEB58260B662E00A621A8 /* AutomaticKeyboardResponder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58FEEB57260B662E00A621A8 /* AutomaticKeyboardResponder.swift */; };
58FF2C03281BDE02009EF542 /* SettingsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58FF2C02281BDE02009EF542 /* SettingsManager.swift */; };
+ 7A02D4EB2A9CEC7A00C19E31 /* MullvadVPNScreenshots.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = 7A02D4EA2A9CEC7A00C19E31 /* MullvadVPNScreenshots.xctestplan */; };
7A09C98129D99215000C2CAC /* String+FuzzyMatch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A09C98029D99215000C2CAC /* String+FuzzyMatch.swift */; };
7A11DD0B2A9495D400098CD8 /* AppRoutes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5802EBC42A8E44AC00E5CE4C /* AppRoutes.swift */; };
7A1A26432A2612AE00B978AA /* PaymentAlertPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A1A26422A2612AE00B978AA /* PaymentAlertPresenter.swift */; };
@@ -1301,6 +1302,7 @@
58FDF2D82A0BA11900C2B061 /* DeviceCheckOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DeviceCheckOperation.swift; sourceTree = "<group>"; };
58FEEB57260B662E00A621A8 /* AutomaticKeyboardResponder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutomaticKeyboardResponder.swift; sourceTree = "<group>"; };
58FF2C02281BDE02009EF542 /* SettingsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsManager.swift; sourceTree = "<group>"; };
+ 7A02D4EA2A9CEC7A00C19E31 /* MullvadVPNScreenshots.xctestplan */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MullvadVPNScreenshots.xctestplan; sourceTree = "<group>"; };
7A09C98029D99215000C2CAC /* String+FuzzyMatch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+FuzzyMatch.swift"; sourceTree = "<group>"; };
7A1A26422A2612AE00B978AA /* PaymentAlertPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentAlertPresenter.swift; sourceTree = "<group>"; };
7A21DACE2A30AA3700A787A9 /* UITextField+Appearance.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UITextField+Appearance.swift"; sourceTree = "<group>"; };
@@ -2537,6 +2539,7 @@
7A83C3FC2A55B39500DFB83A /* TestPlans */ = {
isa = PBXGroup;
children = (
+ 7A02D4EA2A9CEC7A00C19E31 /* MullvadVPNScreenshots.xctestplan */,
7A83C3FE2A55B72E00DFB83A /* MullvadVPNApp.xctestplan */,
7A83C4002A55B81A00DFB83A /* MullvadVPNCI.xctestplan */,
);
@@ -3379,6 +3382,7 @@
7A83C3FF2A55B72E00DFB83A /* MullvadVPNApp.xctestplan in Resources */,
58727283265D173C00F315B2 /* LaunchScreen.storyboard in Resources */,
5859A55529CD9DD900F66591 /* changes.txt in Resources */,
+ 7A02D4EB2A9CEC7A00C19E31 /* MullvadVPNScreenshots.xctestplan in Resources */,
587DCCEF287D84A500CE821E /* countries.geo.json in Resources */,
58CE5E6B224146210008646E /* Assets.xcassets in Resources */,
5883A09E266A5AF7003EFFCB /* Localizable.strings in Resources */,
@@ -5072,6 +5076,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "$(APPLICATION_IDENTIFIER).Screenshots";
PRODUCT_NAME = "$(TARGET_NAME)";
+ PROVISIONING_PROFILE = "";
SWIFT_VERSION = 5.0;
TEST_TARGET_NAME = MullvadVPN;
};
@@ -5089,6 +5094,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "$(APPLICATION_IDENTIFIER).Screenshots";
PRODUCT_NAME = "$(TARGET_NAME)";
+ PROVISIONING_PROFILE = "";
SWIFT_VERSION = 5.0;
TEST_TARGET_NAME = MullvadVPN;
};
diff --git a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPN.xcscheme b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPN.xcscheme
index 5781a72fb5..a5e1cc5310 100644
--- a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPN.xcscheme
+++ b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPN.xcscheme
@@ -161,6 +161,9 @@
<TestPlanReference
reference = "container:TestPlans/MullvadVPNCI.xctestplan">
</TestPlanReference>
+ <TestPlanReference
+ reference = "container:TestPlans/MullvadVPNScreenshots.xctestplan">
+ </TestPlanReference>
</TestPlans>
<Testables>
<TestableReference
diff --git a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPNScreenshots.xcscheme b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPNScreenshots.xcscheme
index 820babc78b..892171b577 100644
--- a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPNScreenshots.xcscheme
+++ b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPNScreenshots.xcscheme
@@ -30,12 +30,15 @@
systemAttachmentLifetime = "keepNever">
<TestPlans>
<TestPlanReference
- reference = "container:TestPlans/MullvadVPNApp.xctestplan"
- default = "YES">
+ reference = "container:TestPlans/MullvadVPNApp.xctestplan">
</TestPlanReference>
<TestPlanReference
reference = "container:TestPlans/MullvadVPNCI.xctestplan">
</TestPlanReference>
+ <TestPlanReference
+ reference = "container:TestPlans/MullvadVPNScreenshots.xctestplan"
+ default = "YES">
+ </TestPlanReference>
</TestPlans>
<Testables>
<TestableReference
@@ -67,15 +70,6 @@
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
- <MacroExpansion>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "58D0C79223F1CE7000FE9BA7"
- BuildableName = "MullvadVPNScreenshots.xctest"
- BlueprintName = "MullvadVPNScreenshots"
- ReferencedContainer = "container:MullvadVPN.xcodeproj">
- </BuildableReference>
- </MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
diff --git a/ios/Snapfile b/ios/Snapfile
index 1bb026abbb..a3be439b60 100644
--- a/ios/Snapfile
+++ b/ios/Snapfile
@@ -17,6 +17,9 @@ languages([
# The name of the scheme which contains the UI Tests
scheme("MullvadVPNScreenshots")
+# The name of the test plan which contains the UI Tests
+testplan("MullvadVPNScreenshots")
+
# Where should the resulting screenshots be stored?
output_directory("./Screenshots")
diff --git a/ios/TestPlans/MullvadVPNApp.xctestplan b/ios/TestPlans/MullvadVPNApp.xctestplan
index c802c86036..ba94d95b98 100644
--- a/ios/TestPlans/MullvadVPNApp.xctestplan
+++ b/ios/TestPlans/MullvadVPNApp.xctestplan
@@ -21,16 +21,16 @@
"parallelizable" : true,
"target" : {
"containerPath" : "container:MullvadVPN.xcodeproj",
- "identifier" : "58B0A29F238EE67E00BC001D",
- "name" : "MullvadVPNTests"
+ "identifier" : "58FBFBE5291622580020E046",
+ "name" : "MullvadRESTTests"
}
},
{
"parallelizable" : true,
"target" : {
"containerPath" : "container:MullvadVPN.xcodeproj",
- "identifier" : "58FBFBE5291622580020E046",
- "name" : "MullvadRESTTests"
+ "identifier" : "58B0A29F238EE67E00BC001D",
+ "name" : "MullvadVPNTests"
}
},
{
@@ -58,6 +58,7 @@
}
},
{
+ "parallelizable" : true,
"target" : {
"containerPath" : "container:MullvadVPN.xcodeproj",
"identifier" : "7A88DCD62A8FABBE00D2FF0E",
diff --git a/ios/TestPlans/MullvadVPNCI.xctestplan b/ios/TestPlans/MullvadVPNCI.xctestplan
index eff510a5d6..f71d07ccfd 100644
--- a/ios/TestPlans/MullvadVPNCI.xctestplan
+++ b/ios/TestPlans/MullvadVPNCI.xctestplan
@@ -18,14 +18,6 @@
},
"testTargets" : [
{
- "enabled" : false,
- "target" : {
- "containerPath" : "container:MullvadVPN.xcodeproj",
- "identifier" : "58D0C79223F1CE7000FE9BA7",
- "name" : "MullvadVPNScreenshots"
- }
- },
- {
"parallelizable" : true,
"target" : {
"containerPath" : "container:MullvadVPN.xcodeproj",
diff --git a/ios/TestPlans/MullvadVPNScreenshots.xctestplan b/ios/TestPlans/MullvadVPNScreenshots.xctestplan
new file mode 100644
index 0000000000..001a120aa8
--- /dev/null
+++ b/ios/TestPlans/MullvadVPNScreenshots.xctestplan
@@ -0,0 +1,29 @@
+{
+ "configurations" : [
+ {
+ "id" : "E4117B5A-56A7-46CD-8037-2897AA9E2324",
+ "name" : "Configuration 1",
+ "options" : {
+
+ }
+ }
+ ],
+ "defaultOptions" : {
+ "targetForVariableExpansion" : {
+ "containerPath" : "container:MullvadVPN.xcodeproj",
+ "identifier" : "58CE5E5F224146200008646E",
+ "name" : "MullvadVPN"
+ },
+ "testTimeoutsEnabled" : true
+ },
+ "testTargets" : [
+ {
+ "target" : {
+ "containerPath" : "container:MullvadVPN.xcodeproj",
+ "identifier" : "58D0C79223F1CE7000FE9BA7",
+ "name" : "MullvadVPNScreenshots"
+ }
+ }
+ ],
+ "version" : 1
+}