diff --git a/PIA VPN.xcodeproj/project.pbxproj b/PIA VPN.xcodeproj/project.pbxproj index 8208389a..c9f1acf7 100644 --- a/PIA VPN.xcodeproj/project.pbxproj +++ b/PIA VPN.xcodeproj/project.pbxproj @@ -154,6 +154,9 @@ 35EDD63E2AE76A3B007B9ACB /* WaitHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35EDD63D2AE76A3B007B9ACB /* WaitHelper.swift */; }; 35EDD6422AE7A83D007B9ACB /* WelcomeScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35EDD6412AE7A83D007B9ACB /* WelcomeScreen.swift */; }; 35EDD6442AE7B480007B9ACB /* Common.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35EDD6432AE7B480007B9ACB /* Common.swift */; }; + 35EDD65A2B035B51007B9ACB /* SideMenuScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35EDD6592B035B51007B9ACB /* SideMenuScreen.swift */; }; + 35EDD65C2B047839007B9ACB /* QuickSettingsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35EDD65B2B047839007B9ACB /* QuickSettingsTests.swift */; }; + 35EDD65E2B048C68007B9ACB /* QuickSettingsScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35EDD65D2B048C68007B9ACB /* QuickSettingsScreen.swift */; }; 6924831A2AB045A5002A0407 /* PIAWidgetAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 692483192AB045A5002A0407 /* PIAWidgetAttributes.swift */; }; 6924831B2AB045A5002A0407 /* PIAWidgetAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 692483192AB045A5002A0407 /* PIAWidgetAttributes.swift */; }; 6924831C2AB045A5002A0407 /* PIAWidgetAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 692483192AB045A5002A0407 /* PIAWidgetAttributes.swift */; }; @@ -783,6 +786,9 @@ 35EDD63D2AE76A3B007B9ACB /* WaitHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WaitHelper.swift; sourceTree = ""; }; 35EDD6412AE7A83D007B9ACB /* WelcomeScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeScreen.swift; sourceTree = ""; }; 35EDD6432AE7B480007B9ACB /* Common.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Common.swift; sourceTree = ""; }; + 35EDD6592B035B51007B9ACB /* SideMenuScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideMenuScreen.swift; sourceTree = ""; }; + 35EDD65B2B047839007B9ACB /* QuickSettingsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuickSettingsTests.swift; sourceTree = ""; }; + 35EDD65D2B048C68007B9ACB /* QuickSettingsScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuickSettingsScreen.swift; sourceTree = ""; }; 692483192AB045A5002A0407 /* PIAWidgetAttributes.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = PIAWidgetAttributes.swift; sourceTree = ""; tabWidth = 4; }; 6924831D2AB04FFD002A0407 /* PIAWidgetBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PIAWidgetBundle.swift; sourceTree = ""; }; 6924831F2AB05F18002A0407 /* PIAConnectionView.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = PIAConnectionView.swift; sourceTree = ""; tabWidth = 4; }; @@ -1503,6 +1509,7 @@ 69C587FC2AD00C6300B95EF9 /* PIAExampleWithAuthenticatedAppTest.swift */, 35EDD6292ADE5F08007B9ACB /* SignInTests.swift */, 35EDD6322ADE7281007B9ACB /* OnboardingTests.swift */, + 35EDD65B2B047839007B9ACB /* QuickSettingsTests.swift */, ); path = Tests; sourceTree = ""; @@ -1516,6 +1523,7 @@ 35EDD6362ADE761A007B9ACB /* HomeScreen.swift */, 35EDD6412AE7A83D007B9ACB /* WelcomeScreen.swift */, 35EDD6432AE7B480007B9ACB /* Common.swift */, + 35EDD6592B035B51007B9ACB /* SideMenuScreen.swift */, ); path = Screens; sourceTree = ""; @@ -1546,6 +1554,7 @@ 699F23AF2AFBA66000EBC5E6 /* ProtocolsSettingsScreen.swift */, 699F23B02AFBA66000EBC5E6 /* GeneralSettingsScreen.swift */, 699F23B12AFBA66000EBC5E6 /* PrivacySettingsScreen.swift */, + 35EDD65D2B048C68007B9ACB /* QuickSettingsScreen.swift */, ); path = Settings; sourceTree = ""; @@ -2809,6 +2818,8 @@ 35EDD6442AE7B480007B9ACB /* Common.swift in Sources */, 35EDD63E2AE76A3B007B9ACB /* WaitHelper.swift in Sources */, 35EDD6282ADE5D31007B9ACB /* BaseTest.swift in Sources */, + 35EDD65E2B048C68007B9ACB /* QuickSettingsScreen.swift in Sources */, + 35EDD65A2B035B51007B9ACB /* SideMenuScreen.swift in Sources */, 35EDD6352ADE7424007B9ACB /* VPNPermissionScreen.swift in Sources */, 699F23B32AFBA66000EBC5E6 /* HelpSettingsScreen.swift in Sources */, 69B70ABC2ACBF8300072A09D /* CredentialsUtil.swift in Sources */, @@ -2821,6 +2832,7 @@ 699F23B42AFBA66000EBC5E6 /* AutomationSettingsScreen.swift in Sources */, 35EDD62A2ADE5F08007B9ACB /* SignInTests.swift in Sources */, 69B70AB52ACBF51C0072A09D /* LoginScreen.swift in Sources */, + 35EDD65C2B047839007B9ACB /* QuickSettingsTests.swift in Sources */, 35EDD6332ADE7281007B9ACB /* OnboardingTests.swift in Sources */, 699F23B52AFBA66000EBC5E6 /* ProtocolsSettingsScreen.swift in Sources */, 69B70AC02ACC2CFE0072A09D /* AccessibilityId.swift in Sources */, diff --git a/PIA VPN/Tiles/QuickSettingsTileCollectionViewCell.swift b/PIA VPN/Tiles/QuickSettingsTileCollectionViewCell.swift index 55bc8c97..e50c2776 100644 --- a/PIA VPN/Tiles/QuickSettingsTileCollectionViewCell.swift +++ b/PIA VPN/Tiles/QuickSettingsTileCollectionViewCell.swift @@ -46,6 +46,7 @@ class QuickSettingsTileCollectionViewCell: UICollectionViewCell, TileableCell { } func setupCellForStatus(_ status: TileStatus) { + self.accessibilityIdentifier = "QuickSettingsTileCollectionViewCell" Theme.current.applyPrincipalBackground(self) Theme.current.applyPrincipalBackground(self.contentView) self.accessoryImageRight.image = Theme.current.dragDropImage() diff --git a/PIA-VPN_E2E_Tests/Core/BaseTest.swift b/PIA-VPN_E2E_Tests/Core/BaseTest.swift index d56ea546..f47c5fa5 100644 --- a/PIA-VPN_E2E_Tests/Core/BaseTest.swift +++ b/PIA-VPN_E2E_Tests/Core/BaseTest.swift @@ -9,20 +9,33 @@ import Quick import Nimble import XCTest +import Foundation class BaseTest: QuickSpec { static var app: XCUIApplication! override class func spec() { - beforeEach { + beforeSuite { app = XCUIApplication() app.launch() - app.logOut() - app.navigateToLoginScreen() + if(!app.connectionButton.waitForExistence(timeout: app.defaultTimeout)) { + app.navigateToLoginScreen() + app.logIn(with: CredentialsUtil.credentials(type: .valid)) + app.acceptVPNPermission() + } + } + + beforeEach { + app.launch() + } afterEach { app.terminate() } + + afterSuite { + app.terminate() + } } } diff --git a/PIA-VPN_E2E_Tests/Helpers/ElementHelper.swift b/PIA-VPN_E2E_Tests/Helpers/ElementHelper.swift index 593e36ef..00471085 100644 --- a/PIA-VPN_E2E_Tests/Helpers/ElementHelper.swift +++ b/PIA-VPN_E2E_Tests/Helpers/ElementHelper.swift @@ -12,7 +12,7 @@ extension XCUIApplication { var defaultTimeout: TimeInterval { 10.0 } var shortTimeout: TimeInterval { 5.0 } - func navigationbar(with id: String) -> XCUIElement { + func navigationBar(with id: String) -> XCUIElement { return navigationBars[id] } @@ -55,5 +55,9 @@ extension XCUIApplication { func switches(with id: String) -> XCUIElement { return switches[id] } + + func dialog(with id: String) -> XCUIElement { + return switches[id] + } } diff --git a/PIA-VPN_E2E_Tests/Screens/HomeScreen.swift b/PIA-VPN_E2E_Tests/Screens/HomeScreen.swift index c76bc507..684a180f 100644 --- a/PIA-VPN_E2E_Tests/Screens/HomeScreen.swift +++ b/PIA-VPN_E2E_Tests/Screens/HomeScreen.swift @@ -21,18 +21,29 @@ extension XCUIApplication { button(with: PIALibraryAccessibility.Id.Dialog.destructive) } - var logOutButton: XCUIElement { - staticText(with: "Log out") + var quickSettingsButton: XCUIElement { + cell(with: "QuickSettingsTileCollectionViewCell") } - var settingsButton: XCUIElement { - staticText(with: "Settings") + var privateBrowserButton: XCUIElement { + button(with: "Private Browser") } - var settingsBackButton: XCUIElement { - button(with: "Settings") + var enableNetworkManagementButton: XCUIElement { + button(with: "Enable Network Management") } + var disableNetworkManagementButton: XCUIElement { + button(with: "Disable Network Management") + } + + var enableVPNKillSwitchButton: XCUIElement { + button(with: "Enable VPN Kill Switch") + } + + var disableVPNKillSwitchButton: XCUIElement { + button(with: "Disable VPN Kill Switch") + } func logOut() { guard dashboardMenuButton.exists else { return } @@ -56,10 +67,43 @@ extension XCUIApplication { } } - func navigateToHomeScreenFromSettings() { + func navigateToHomeFromSettings() { if settingsBackButton.waitForExistence(timeout: defaultTimeout) { settingsBackButton.tap() + navigateToHome() } + } + + func navigateToQuickSettings() { + quickSettingsButton.staticTexts["QUICK SETTINGS"].tap() + } + + func navigateToHome() { closeButton.tap() + dashboardMenuButton.waitForExistence(timeout: defaultTimeout) + } + + func enableVPNKillSwitchOnHome() { + if(enableVPNKillSwitchButton.exists) { + enableVPNKillSwitchButton.tap() + } + } + + func disableVPNKillSwitchOnHome() { + if(disableVPNKillSwitchButton.exists) { + disableVPNKillSwitchButton.tap() + } + } + + func enableNetworkManagementOnHome() { + if(enableNetworkManagementButton.exists) { + enableNetworkManagementButton.tap() + } + } + + func disableNetworkManagementOnHome() { + if(disableNetworkManagementButton.exists) { + disableNetworkManagementButton.tap() + } } } diff --git a/PIA-VPN_E2E_Tests/Screens/Settings/QuickSettingsScreen.swift b/PIA-VPN_E2E_Tests/Screens/Settings/QuickSettingsScreen.swift new file mode 100644 index 00000000..c5c423a4 --- /dev/null +++ b/PIA-VPN_E2E_Tests/Screens/Settings/QuickSettingsScreen.swift @@ -0,0 +1,59 @@ +// +// QuickSettingsScreen.swift +// PIA-VPN_E2E_Tests +// +// Created by Geneva Parayno on 15/11/23. +// Copyright © 2023 Private Internet Access Inc. All rights reserved. +// + +import XCTest + +extension XCUIApplication { + var vpnKillSwitchQuickSettings: XCUIElement { + cells.containing(.staticText, identifier: "VPN Kill Switch").firstMatch.switches.firstMatch + } + + var networkManagementQuickSettings: XCUIElement { + cells.containing(.staticText, identifier: "Network Management").firstMatch.switches.firstMatch + } + + var privateBrowserQuickSettings: XCUIElement { + cells.containing(.staticText, identifier: "Private Browser").firstMatch.switches.firstMatch + } + + func enableVPNKillSwitchQuickSetting() { + if(vpnKillSwitchQuickSettings.value as! String == "0"){ + vpnKillSwitchQuickSettings.tap() + } + } + + func disableVPNKillSwitchQuickSetting() { + if(vpnKillSwitchQuickSettings.value as! String == "1"){ + vpnKillSwitchQuickSettings.tap() + } + } + + func enableNetworkManagementQuickSetting() { + if(networkManagementQuickSettings.value as! String == "0"){ + networkManagementQuickSettings.tap() + } + } + + func disableNetworkManagementQuickSetting() { + if(networkManagementQuickSettings.value as! String == "1"){ + networkManagementQuickSettings.tap() + } + } + + func enablePrivateBrowserQuickSetting() { + if(privateBrowserQuickSettings.value as! String == "0"){ + privateBrowserQuickSettings.tap() + } + } + + func disablePrivateBrowserQuickSetting() { + if(privateBrowserQuickSettings.value as! String == "1"){ + privateBrowserQuickSettings.tap() + } + } +} diff --git a/PIA-VPN_E2E_Tests/Screens/Settings/SettingsScreen.swift b/PIA-VPN_E2E_Tests/Screens/Settings/SettingsScreen.swift index 6de81432..4d82a73e 100644 --- a/PIA-VPN_E2E_Tests/Screens/Settings/SettingsScreen.swift +++ b/PIA-VPN_E2E_Tests/Screens/Settings/SettingsScreen.swift @@ -36,4 +36,8 @@ extension XCUIApplication { var closeButton: XCUIElement { button(with: "Close") } + + var settingsBackButton: XCUIElement { + button(with: "Settings") + } } diff --git a/PIA-VPN_E2E_Tests/Screens/SideMenuScreen.swift b/PIA-VPN_E2E_Tests/Screens/SideMenuScreen.swift new file mode 100644 index 00000000..580cd644 --- /dev/null +++ b/PIA-VPN_E2E_Tests/Screens/SideMenuScreen.swift @@ -0,0 +1,19 @@ +// +// SideMenuScreen.swift +// PIA-VPN_E2E_Tests +// +// Created by Geneva Parayno on 14/11/23. +// Copyright © 2023 Private Internet Access Inc. All rights reserved. +// + +import XCTest + +extension XCUIApplication { + var logOutButton: XCUIElement { + staticText(with: "Log out") + } + + var settingsButton: XCUIElement { + staticText(with: "Settings") + } +} diff --git a/PIA-VPN_E2E_Tests/Tests/OnboardingTests.swift b/PIA-VPN_E2E_Tests/Tests/OnboardingTests.swift index 5238c822..289c3924 100644 --- a/PIA-VPN_E2E_Tests/Tests/OnboardingTests.swift +++ b/PIA-VPN_E2E_Tests/Tests/OnboardingTests.swift @@ -15,6 +15,9 @@ class OnboardingTests:BaseTest { describe("onboarding vpn permission tests") { context("vpn profile installation permission") { it("should display the home screen after allowing vpn profile installation"){ + app.logOut() + app.navigateToLoginScreen() + app.logIn(with: CredentialsUtil.credentials(type: .valid)) app.acceptVPNPermission() @@ -22,7 +25,7 @@ class OnboardingTests:BaseTest { app.vpnAllowButton.waitForExistence(timeout: app.defaultTimeout) app.swipeUp() - expect(app.dashboardMenuButton.waitForExistence(timeout: app.defaultTimeout)) + expect(app.dashboardMenuButton.waitForExistence(timeout: app.defaultTimeout)).to(beTrue()) expect(app.vpnPermissionScreen.exists).to(beFalse()) } } diff --git a/PIA-VPN_E2E_Tests/Tests/QuickSettingsTests.swift b/PIA-VPN_E2E_Tests/Tests/QuickSettingsTests.swift new file mode 100644 index 00000000..068180f3 --- /dev/null +++ b/PIA-VPN_E2E_Tests/Tests/QuickSettingsTests.swift @@ -0,0 +1,142 @@ +// +// QuickSettingsTests.swift +// PIA-VPN_E2E_Tests +// +// Created by Geneva Parayno on 15/11/23. +// Copyright © 2023 Private Internet Access Inc. All rights reserved. +// + +import Nimble +import Foundation + +class QuickSettingsTests : BaseTest { + override class func spec() { + let enabledValue = "1" + let disabledValue = "0" + + super.spec() + + describe("quick settings on homescreen tests") { + context("when quick settings items are displayed on homescreen") { + it("should indicate that it's enabled when the user enables it") { + app.navigateToQuickSettings() + app.enableVPNKillSwitchQuickSetting() + app.enableNetworkManagementQuickSetting() + + app.navigateToHome() + + app.enableVPNKillSwitchOnHome() + expect(app.disableVPNKillSwitchButton.exists).to(beTrue()) + + app.enableNetworkManagementOnHome() + expect(app.disableNetworkManagementButton.exists).to(beTrue()) + } + + it("should indicate that it's disabled when the user disables it") { + app.navigateToQuickSettings() + app.enableVPNKillSwitchQuickSetting() + app.enableNetworkManagementQuickSetting() + + app.navigateToHome() + + app.disableVPNKillSwitchOnHome() + expect(app.enableVPNKillSwitchButton.exists).to(beTrue()) + + app.enableVPNKillSwitchOnHome() + app.disableNetworkManagementOnHome() + expect(app.disableVPNKillSwitchButton.exists).to(beTrue()) + } + + it("should display a notification message and not allow enabling the network management when vpn kill switch is disabled") { + app.navigateToQuickSettings() + app.enableVPNKillSwitchQuickSetting() + app.enableNetworkManagementQuickSetting() + + app.navigateToHome() + + app.enableVPNKillSwitchOnHome() + app.disableVPNKillSwitchOnHome() + app.enableNetworkManagementOnHome() + + app.staticText(with: "ENABLE").tap() + expect(app.disableVPNKillSwitchButton.exists).to(beTrue()) + expect(app.disableNetworkManagementButton.exists).to(beTrue()) + + app.disableVPNKillSwitchOnHome() + app.staticText(with: "CLOSE").tap() + expect(app.enableVPNKillSwitchButton.exists).to(beTrue()) + expect(app.enableNetworkManagementButton.exists).to(beTrue()) + } + } + + context("when selecting items to be displayed for Quick Settings") { + it("should not display disabled selection on homescreen") { + app.navigateToQuickSettings() + + app.disableVPNKillSwitchQuickSetting() + expect(app.vpnKillSwitchQuickSettings.value as! String == disabledValue).to(beTrue()) + app.navigateToHome() + expect{ + let enableVPNKillSwitchButtonPresent = app.enableVPNKillSwitchButton.exists + let disableVPNKillSwitchButtonPresent = app.disableVPNKillSwitchButton.exists + return enableVPNKillSwitchButtonPresent || disableVPNKillSwitchButtonPresent + }.to(beFalse()) + + app.navigateToQuickSettings() + app.enableVPNKillSwitchQuickSetting() + expect(app.vpnKillSwitchQuickSettings.value as! String == enabledValue).to(beTrue()) + app.disableNetworkManagementQuickSetting() + expect(app.networkManagementQuickSettings.value as! String == disabledValue).to(beTrue()) + app.navigateToHome() + expect{ + let enableNetworkManagementButtonPresent = app.enableNetworkManagementButton.exists + let disableNetworkManagementButtonPresent = app.disableNetworkManagementButton.exists + return enableNetworkManagementButtonPresent || disableNetworkManagementButtonPresent + }.to(beFalse()) + + app.navigateToQuickSettings() + app.disablePrivateBrowserQuickSetting() + expect(app.privateBrowserQuickSettings.value as! String == disabledValue).to(beTrue()) + app.navigateToHome() + expect(app.privateBrowserButton.exists).to(beFalse()) + + } + + it("should display enabled selection on homescreen") { + app.navigateToQuickSettings() + + app.enableVPNKillSwitchQuickSetting() + expect(app.vpnKillSwitchQuickSettings.value as! String == enabledValue).to(beTrue()) + + app.enableNetworkManagementQuickSetting() + expect(app.networkManagementQuickSettings.value as! String == enabledValue).to(beTrue()) + + app.enablePrivateBrowserQuickSetting() + expect(app.privateBrowserQuickSettings.value as! String == enabledValue).to(beTrue()) + + app.navigateToHome() + expect(app.privateBrowserButton.exists).to(beTrue()) + expect{ + let enableVPNKillSwitchButtonPresent = app.enableVPNKillSwitchButton.exists + let disableVPNKillSwitchButtonPresent = app.disableVPNKillSwitchButton.exists + return enableVPNKillSwitchButtonPresent || disableVPNKillSwitchButtonPresent + }.to(beTrue()) + expect{ + let enableNetworkManagementButtonPresent = app.enableNetworkManagementButton.exists + let disableNetworkManagementButtonPresent = app.disableNetworkManagementButton.exists + return enableNetworkManagementButtonPresent || disableNetworkManagementButtonPresent + }.to(beTrue()) + } + + it("should return a notification message when all selections are being disabled") { + app.navigateToQuickSettings() + + app.disableVPNKillSwitchQuickSetting() + app.disableNetworkManagementQuickSetting() + app.disablePrivateBrowserQuickSetting() + expect(app.staticText(with: "You should keep at least one element visible in the Quick Settings Tile").waitForExistence(timeout: app.defaultTimeout)).to(beTrue()) + } + } + } + } +} diff --git a/PIA-VPN_E2E_Tests/Tests/SignInTests.swift b/PIA-VPN_E2E_Tests/Tests/SignInTests.swift index 81befdca..919cef87 100644 --- a/PIA-VPN_E2E_Tests/Tests/SignInTests.swift +++ b/PIA-VPN_E2E_Tests/Tests/SignInTests.swift @@ -12,14 +12,18 @@ class SignInTests: BaseTest { override class func spec(){ super.spec() - describe("test sign-in") { + describe("sign in tests") { context("account validations") { it("should successfully sign in with valid credentials") { + app.logOut() + app.navigateToLoginScreen() app.logIn(with: CredentialsUtil.credentials(type: .valid)) expect(app.vpnPermissionScreen.waitForExistence(timeout:app.defaultTimeout)).to(beTrue()) } it("should display error mesages with invalid credentials") { + app.logOut() + app.navigateToLoginScreen() app.logIn(with: CredentialsUtil.credentials(type: .invalid)) expect(app.loginErrorMessage.waitForExistence(timeout: app.shortTimeout)).to(beTrue()) expect(app.vpnPermissionScreen.waitForExistence(timeout:app.defaultTimeout)).to(beFalse()) diff --git a/PIA-VPN_E2E_Tests/Tests/UpdateSettingsTests.swift b/PIA-VPN_E2E_Tests/Tests/UpdateSettingsTests.swift index 5d55360c..c72f1f92 100644 --- a/PIA-VPN_E2E_Tests/Tests/UpdateSettingsTests.swift +++ b/PIA-VPN_E2E_Tests/Tests/UpdateSettingsTests.swift @@ -10,17 +10,15 @@ import Nimble class UpdateSettingsTests : BaseTest { override class func spec() { - var geoLocatedRegionDefaultValue = "1" - var vpnKillSwitchDefaultValue = "1" - var automationDefaultValue = "0" + let geoLocatedRegionDefaultValue = "1" + let vpnKillSwitchDefaultValue = "1" + let automationDefaultValue = "0" super.spec() describe("settings return to default value after logging out") { context("updated settings for each category") { it("should revert changes made on general settings to default after logging out and logging back in") { - app.logIn(with: CredentialsUtil.credentials(type: .valid)) - app.acceptVPNPermission() app.navigateToGeneralSettings() app.geoLocatedRegionsSwitch.tap() @@ -28,7 +26,7 @@ class UpdateSettingsTests : BaseTest { // TODO: Enable this check when we disable the animations on E2E tests // expect((app.geoLocatedRegionsSwitch.value as! String)) != geoLocatedRegionDefaultValue - app.navigateToHomeScreenFromSettings() + app.navigateToHomeFromSettings() app.logOut() app.navigateToLoginScreen() app.logIn(with: CredentialsUtil.credentials(type: .valid)) @@ -38,13 +36,11 @@ class UpdateSettingsTests : BaseTest { } it("should revert changes made on protocol settings to default after logging out and logging back in") { - app.logIn(with: CredentialsUtil.credentials(type: .valid)) - app.acceptVPNPermission() app.navigateToProtocolSettings() app.protocolSelectionButton.tap() app.openVPN.tap() expect(app.openVPN.exists).to(beTrue()) - app.navigateToHomeScreenFromSettings() + app.navigateToHomeFromSettings() app.logOut() app.navigateToLoginScreen() app.logIn(with: CredentialsUtil.credentials(type: .valid)) @@ -54,12 +50,10 @@ class UpdateSettingsTests : BaseTest { } it("should revert changes made on privacy features settings to default after logging out and logging back in") { - app.logIn(with: CredentialsUtil.credentials(type: .valid)) - app.acceptVPNPermission() app.navigateToPrivacySettings() app.vpnKillSwitch.tap() expect((app.vpnKillSwitch.value as! String)) != vpnKillSwitchDefaultValue - app.navigateToHomeScreenFromSettings() + app.navigateToHomeFromSettings() app.logOut() app.navigateToLoginScreen() app.logIn(with: CredentialsUtil.credentials(type: .valid)) @@ -69,8 +63,6 @@ class UpdateSettingsTests : BaseTest { } it("should revert changes made on automation settings to default after logging out and logging back in") { - app.logIn(with: CredentialsUtil.credentials(type: .valid)) - app.acceptVPNPermission() app.navigateToAutomationSettings() app.enableAutomationSwitch.tap() @@ -78,7 +70,7 @@ class UpdateSettingsTests : BaseTest { // TODO: Enable this check when we disable the animations on E2E tests // expect((app.enableAutomationSwitch.value as! String)) != automationDefaultValue - app.navigateToHomeScreenFromSettings() + app.navigateToHomeFromSettings() app.logOut() app.navigateToLoginScreen() app.logIn(with: CredentialsUtil.credentials(type: .valid))