Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PIA-1574: optimise methods and tests #126

Merged
merged 1 commit into from
Mar 25, 2024
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions PIA VPN.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1271,7 +1271,7 @@
69CA26B12B59668700E78894 /* RegionsListUseCaseMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegionsListUseCaseMock.swift; sourceTree = "<group>"; };
69E192422B8E14DF00A97286 /* PIA VPN-tvOS.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = "PIA VPN-tvOS.xctestplan"; sourceTree = "<group>"; };
69E192432B8E22FC00A97286 /* PIA-VPN_E2E_Tests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = "PIA-VPN_E2E_Tests.xctestplan"; sourceTree = "<group>"; };
69E192442B8E274500A97286 /* PIA VPN-tvOS_E2E_Tests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = "PIA VPN-tvOS_E2E_Tests.xctestplan"; sourceTree = "<group>"; };
69E192442B8E274500A97286 /* PIA-VPN_tvOS_E2E_Tests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = "PIA-VPN_tvOS_E2E_Tests.xctestplan"; sourceTree = "<group>"; };
69E192462B8E3E8700A97286 /* HelpOptionsViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HelpOptionsViewModelTests.swift; sourceTree = "<group>"; };
69E192482B8E4BCC00A97286 /* PrivacyPolicyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivacyPolicyView.swift; sourceTree = "<group>"; };
69E1924A2B8E63DD00A97286 /* Licences.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = Licences.plist; path = "PIA VPN-tvOS/Resources/Licences.plist"; sourceTree = SOURCE_ROOT; };
Expand Down Expand Up @@ -2045,7 +2045,7 @@
isa = PBXGroup;
children = (
E58A45592BA8D1BD002A0704 /* PIA Common */,
69E192442B8E274500A97286 /* PIA VPN-tvOS_E2E_Tests.xctestplan */,
69E192442B8E274500A97286 /* PIA-VPN_tvOS_E2E_Tests.xctestplan */,
69E192432B8E22FC00A97286 /* PIA-VPN_E2E_Tests.xctestplan */,
69E192422B8E14DF00A97286 /* PIA VPN-tvOS.xctestplan */,
8269A6ED251CB5ED000B4DBF /* PIAWidgetExtension.entitlements */,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
default = "YES">
</TestPlanReference>
<TestPlanReference
reference = "container:PIA VPN-tvOS_E2E_Tests.xctestplan">
reference = "container:PIA-VPN_tvOS_E2E_Tests.xctestplan">
</TestPlanReference>
</TestPlans>
<Testables>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1430"
version = "2.2">
version = "2.1">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
Expand All @@ -12,8 +12,9 @@
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "NO">
<AutocreatedTestPlanReference>
</AutocreatedTestPlanReference>
<TestPlanReference
reference = "container:PIA-VPN_E2E_Tests.xctestplan">
</TestPlanReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,13 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
shouldUseLaunchSchemeArgsEnv = "YES">
<TestPlans>
<TestPlanReference
reference = "container:PIA-VPN_tvOS_E2E_Tests.xctestplan"
default = "YES">
</TestPlanReference>
</TestPlans>
<Testables>
<TestableReference
skipped = "NO"
Expand Down
5 changes: 4 additions & 1 deletion PIA-VPN_E2E_Tests.xctestplan
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@
"key" : "PIA_TEST_DEDICATEDIP",
"value" : "xxx"
}
]
],
"maximumTestRepetitions" : 2,
"repeatInNewRunnerProcess" : true,
"testRepetitionMode" : "retryOnFailure"
},
"testTargets" : [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,14 @@
"key" : "PIA_TEST_PASSWORD",
"value" : "xxx"
}
]
],
"maximumTestRepetitions" : 2,
"repeatInNewRunnerProcess" : true,
"testRepetitionMode" : "retryOnFailure"
},
"testTargets" : [
{
"parallelizable" : true,
"target" : {
"containerPath" : "container:PIA VPN.xcodeproj",
"identifier" : "35E8E6572B870AD200A3A3DB",
Expand Down
2 changes: 1 addition & 1 deletion fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ platform :ios do
lane :tvos_e2e_tests do
run_tests(
scheme: "PIA VPN-tvOS",
testplan: "PIA VPN-tvOS_E2E_Tests",
testplan: "PIA-VPN_tvOS_E2E_Tests",
test_without_building: true,
prelaunch_simulator: true,
device: "Apple TV"
Expand Down
Loading