Verify Plan selection is opened after confirming Domain selection

Author: staskus

API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/me/rest_v11_me_shopping_cart_post.json

@@ -1,6 +1,6 @@
 {
     "request": {
-      "urlPattern": "/rest/v1.1/me/shopping-cart/*",
+      "urlPattern": "/rest/v1.1/me/shopping-cart/.*",
       "method": "POST"
     },
     "response": {

WordPress/UITests/Tests/DashboardTests.swift

@@ -2,7 +2,6 @@ import UITestsFoundation
 import XCTest
 
 class DashboardTests: XCTestCase {
-
     override func setUpWithError() throws {
         setUpTestSuite()
 
@@ -26,6 +25,7 @@ class DashboardTests: XCTestCase {
             .tapFreeToPaidPlansCard()
             .verifyDomainsSuggestionsScreenLoaded()
             .selectDomain()
-            .confirmDomainSelection()
+            .goToPlanSelection()
+            .verifyPlanSelectionScreenLoaded()
     }
 }

WordPress/UITestsFoundation/Screens/DomainsSuggestionsScreen.swift

@@ -37,8 +37,8 @@ public class DomainsSuggestionsScreen: ScreenObject {
     }
 
     @discardableResult
-    public func confirmDomainSelection() throws -> Self {
+    public func goToPlanSelection() throws -> PlanSelectionScreen {
         app.buttons["Select domain"].tap()
-        return self
+        return try PlanSelectionScreen()
     }
 }

WordPress/UITestsFoundation/Screens/PlanSelectionScreen.swift

@@ -0,0 +1,26 @@
+import ScreenObject
+import XCTest
+
+public class PlanSelectionScreen: ScreenObject {
+    private let webViewGetter: (XCUIApplication) -> XCUIElement = {
+        $0.webViews.firstMatch
+    }
+
+    public init(app: XCUIApplication = XCUIApplication()) throws {
+        try super.init(
+            expectedElementGetters: [ webViewGetter ],
+            app: app,
+            waitTimeout: 7
+        )
+    }
+
+    public static func isLoaded() -> Bool {
+        (try? PlanSelectionScreen().isLoaded) ?? false
+    }
+
+    @discardableResult
+    public func verifyPlanSelectionScreenLoaded() -> Self {
+        XCTAssertTrue(PlanSelectionScreen.isLoaded(), "\"Plan Selection\" screen isn't loaded.")
+        return self
+    }
+}

WordPress/WordPress.xcodeproj/project.pbxproj

@@ -158,6 +158,7 @@
 		011F52C92A16551A00B04114 /* FreeToPaidPlansCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 011F52C72A16551A00B04114 /* FreeToPaidPlansCoordinator.swift */; };
 		011F52D32A1B84FF00B04114 /* PlansTracker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 011F52D22A1B84FF00B04114 /* PlansTracker.swift */; };
 		011F52D42A1B84FF00B04114 /* PlansTracker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 011F52D22A1B84FF00B04114 /* PlansTracker.swift */; };
+		011F52D82A1BECA200B04114 /* PlanSelectionScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 011F52D72A1BECA200B04114 /* PlanSelectionScreen.swift */; };
 		01281E9A2A0456CB00464F8F /* DomainsSuggestionsScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01281E992A0456CB00464F8F /* DomainsSuggestionsScreen.swift */; };
 		01281E9C2A051EEA00464F8F /* MenuNavigationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01281E9B2A051EEA00464F8F /* MenuNavigationTests.swift */; };
 		01281E9D2A051EEA00464F8F /* MenuNavigationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01281E9B2A051EEA00464F8F /* MenuNavigationTests.swift */; };
@@ -5798,6 +5799,7 @@
 		011F52C52A15413800B04114 /* FreeToPaidPlansDashboardCardHelperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FreeToPaidPlansDashboardCardHelperTests.swift; sourceTree = "<group>"; };
 		011F52C72A16551A00B04114 /* FreeToPaidPlansCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FreeToPaidPlansCoordinator.swift; sourceTree = "<group>"; };
 		011F52D22A1B84FF00B04114 /* PlansTracker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PlansTracker.swift; sourceTree = "<group>"; };
+		011F52D72A1BECA200B04114 /* PlanSelectionScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlanSelectionScreen.swift; sourceTree = "<group>"; };
 		01281E992A0456CB00464F8F /* DomainsSuggestionsScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DomainsSuggestionsScreen.swift; sourceTree = "<group>"; };
 		01281E9B2A051EEA00464F8F /* MenuNavigationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuNavigationTests.swift; sourceTree = "<group>"; };
 		0141929B2983F0A300CAEDB0 /* SupportConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SupportConfiguration.swift; sourceTree = "<group>"; };
@@ -11538,6 +11540,7 @@
 				EAD08D0D29D45E23001A72F9 /* CommentsScreen.swift */,
 				D82E087729EEB7AF0098F500 /* DomainsScreen.swift */,
 				01281E992A0456CB00464F8F /* DomainsSuggestionsScreen.swift */,
+				011F52D72A1BECA200B04114 /* PlanSelectionScreen.swift */,
 			);
 			path = Screens;
 			sourceTree = "<group>";
@@ -22721,6 +22724,7 @@
 				3F107B1929B6F7E0009B3658 /* XCTestCase+Utils.swift in Sources */,
 				3F2F855326FAF227000FCDA5 /* EditorPostSettings.swift in Sources */,
 				3F2F856026FAF235000FCDA5 /* NotificationsScreen.swift in Sources */,
+				011F52D82A1BECA200B04114 /* PlanSelectionScreen.swift in Sources */,
 				3F2F854026FAE9DC000FCDA5 /* BlockEditorScreen.swift in Sources */,
 				3FB5C2B327059AC8007D0ECE /* XCUIElement+Scroll.swift in Sources */,
 				3F2F854726FAED51000FCDA5 /* MediaPickerAlbumListScreen.swift in Sources */,