From 314a03d34136cb4cfed4f35323e05f7154380d60 Mon Sep 17 00:00:00 2001 From: Jon Petersson Date: Tue, 29 Aug 2023 10:13:15 +0200 Subject: [PATCH] Fix screenshot script and testplan --- ios/MullvadVPN.xcodeproj/project.pbxproj | 6 ++++ .../xcschemes/MullvadVPN.xcscheme | 3 ++ .../xcschemes/MullvadVPNScreenshots.xcscheme | 16 ++++------ ios/Snapfile | 3 ++ ios/TestPlans/MullvadVPNApp.xctestplan | 9 +++--- ios/TestPlans/MullvadVPNCI.xctestplan | 8 ----- .../MullvadVPNScreenshots.xctestplan | 29 +++++++++++++++++++ 7 files changed, 51 insertions(+), 23 deletions(-) create mode 100644 ios/TestPlans/MullvadVPNScreenshots.xctestplan diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj index ae05d92879e4..26c2b4cb86e5 100644 --- a/ios/MullvadVPN.xcodeproj/project.pbxproj +++ b/ios/MullvadVPN.xcodeproj/project.pbxproj @@ -384,6 +384,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 */; }; 7A0C0F632A979C4A0058EFCE /* Coordinator+Router.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A0C0F622A979C4A0058EFCE /* Coordinator+Router.swift */; }; 7A11DD0B2A9495D400098CD8 /* AppRoutes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5802EBC42A8E44AC00E5CE4C /* AppRoutes.swift */; }; @@ -1292,6 +1293,7 @@ 58FDF2D82A0BA11900C2B061 /* DeviceCheckOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DeviceCheckOperation.swift; sourceTree = ""; }; 58FEEB57260B662E00A621A8 /* AutomaticKeyboardResponder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutomaticKeyboardResponder.swift; sourceTree = ""; }; 58FF2C02281BDE02009EF542 /* SettingsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsManager.swift; sourceTree = ""; }; + 7A02D4EA2A9CEC7A00C19E31 /* MullvadVPNScreenshots.xctestplan */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MullvadVPNScreenshots.xctestplan; sourceTree = ""; }; 7A09C98029D99215000C2CAC /* String+FuzzyMatch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+FuzzyMatch.swift"; sourceTree = ""; }; 7A0C0F622A979C4A0058EFCE /* Coordinator+Router.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Coordinator+Router.swift"; sourceTree = ""; }; 7A1A26422A2612AE00B978AA /* PaymentAlertPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentAlertPresenter.swift; sourceTree = ""; }; @@ -2525,6 +2527,7 @@ 7A83C3FC2A55B39500DFB83A /* TestPlans */ = { isa = PBXGroup; children = ( + 7A02D4EA2A9CEC7A00C19E31 /* MullvadVPNScreenshots.xctestplan */, 7A83C3FE2A55B72E00DFB83A /* MullvadVPNApp.xctestplan */, 7A83C4002A55B81A00DFB83A /* MullvadVPNCI.xctestplan */, ); @@ -3367,6 +3370,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 */, @@ -5055,6 +5059,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "$(APPLICATION_IDENTIFIER).Screenshots"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE = ""; SWIFT_VERSION = 5.0; TEST_TARGET_NAME = MullvadVPN; }; @@ -5072,6 +5077,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 5781a72fb5ef..a5e1cc53105b 100644 --- a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPN.xcscheme +++ b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPN.xcscheme @@ -161,6 +161,9 @@ + + + reference = "container:TestPlans/MullvadVPNApp.xctestplan"> + + - - - - diff --git a/ios/Snapfile b/ios/Snapfile index 1bb026abbb53..a3be439b6087 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 c802c86036e6..ba94d95b9852 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 eff510a5d6a9..f71d07ccfd89 100644 --- a/ios/TestPlans/MullvadVPNCI.xctestplan +++ b/ios/TestPlans/MullvadVPNCI.xctestplan @@ -17,14 +17,6 @@ "testTimeoutsEnabled" : true }, "testTargets" : [ - { - "enabled" : false, - "target" : { - "containerPath" : "container:MullvadVPN.xcodeproj", - "identifier" : "58D0C79223F1CE7000FE9BA7", - "name" : "MullvadVPNScreenshots" - } - }, { "parallelizable" : true, "target" : { diff --git a/ios/TestPlans/MullvadVPNScreenshots.xctestplan b/ios/TestPlans/MullvadVPNScreenshots.xctestplan new file mode 100644 index 000000000000..001a120aa81b --- /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 +}