[UI Tests] Re-enable Reader tests (#23748)

tiagomar · web-flow · commit d1799c5f4025 · 2025-03-11T00:46:48.000Z
* Add network mocks for related posts and likes * Increase post content loading timeout * Update Reader's side menu button element * Add accessibility identifier to topics card cell * Disable testDiscover() * Update network mock * Re-enable reader tests * testSavePost() * testLikePost() * Fix test failing on iPad * testViewPost() * testViewPostInSafari() * Fix lint errors * Increase timeout for post content to load for iPad in CI * Fix test for iPad * testViewPost() * Re-enable testDiscover() * Wait for the Apple's black loading screen to disappear after launching the app. * Revert "Wait for the Apple's black loading screen to disappear after launching the app." This reverts commit 8c8e73f.
diff --git a/API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/rest_sites_106707880_posts_439_likes.json b/API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/rest_sites_106707880_posts_439_likes.json
@@ -0,0 +1,14 @@
+{
+  "request": {
+    "method": "GET",
+    "urlPath": "/rest/v1.2/sites/106707880/posts/439/likes"
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": {
+      "found": 0,
+      "i_like": false,
+      "likes": []
+    }
+  }
+}
diff --git a/API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/rest_sites_106707880_posts_439_related.json b/API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/rest_sites_106707880_posts_439_related.json
@@ -0,0 +1,42 @@
+{
+  "request": {
+    "method": "GET",
+    "urlPath": "/rest/v1.2/read/site/106707880/post/439/related"
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": {
+      "algorithm_local": "read:related:posts:local/7",
+      "algorithm_global": "read:related:posts:global/1",
+      "posts": [
+        {
+          "ID": 974,
+          "site_ID": 80511,
+          "author": {
+            "ID": 29043,
+            "login": "test",
+            "email": false,
+            "name": "Test User",
+            "first_name": "Test",
+            "last_name": "User",
+            "site_ID": 80511
+          },
+          "date": "2024-03-07T23:00:40+00:00",
+          "modified": "2024-03-07T23:00:40+00:00",
+          "title": "title-a",
+          "URL": "https://example.wordpress.com/2024/03/07/hello-974",
+          "content": "content-a",
+          "excerpt": "content-a",
+          "slug": "hello-974",
+          "status": "draft",
+          "sticky": false,
+          "password": "",
+          "parent": false,
+          "type": "post",
+          "featured_image": "",
+          "format": "standard"
+        }
+      ]
+    }
+  }
+}
diff --git a/API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/reader/reader_tags.json b/API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/reader/reader_tags.json
@@ -16,7 +16,7 @@
     "jsonBody": {
       "success": true,
       "tags": [
-        "travel"
+        "{{lookup request.query 'tags[]'}}"
       ],
       "sort": "date",
       "lang": "en",
@@ -73,7 +73,23 @@
             "height": 600
           },
           "format": "standard",
-          "tags": {},
+          "tags": {
+            "{{capitalize (lookup request.query 'tags[]')}}": {
+              "ID": 2290,
+              "name": "{{lookup request.query 'tags[]'}}",
+              "slug": "{{lookup request.query 'tags[]'}}",
+              "description": "",
+              "post_count": 24,
+              "parent": 0,
+              "meta": {
+                "links": {
+                  "self": "https://public-api.wordpress.com/rest/v1.1/sites/181977606/categories/slug:architecture",
+                  "help": "https://public-api.wordpress.com/rest/v/sites/181977606/categories/slug:architecture/help",
+                  "site": "https://public-api.wordpress.com/rest/v1.2/sites/181977606"
+                }
+              }
+            }
+          },
           "categories": {
             "Architecture": {
               "ID": 2290,
@@ -322,7 +338,7 @@
           }
         }
       ],
-      "next_page_handle": "ZnJvbT0xMCZiZWZvcmU9MjAyMy0wOC0yMlQwOSUzQTAyJTNBMTElMkIwOCUzQTAw",
+      "next_page_handle": null,
       "date_range": {
         "before": "2023-08-21T22:44:57-04:00",
         "after": "2023-08-22T09:02:11+08:00"
diff --git a/API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/reader/reader_tags_follow.json b/API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/reader/reader_tags_follow.json
@@ -1,7 +1,7 @@
 {
   "request": {
     "method": "POST",
-    "urlPath": "/rest/v1.1/read/tags/travel/mine/new",
+    "urlPathPattern": "/rest/v1.1/read/tags/([^/]+)/mine/new",
     "queryParameters": {
       "locale": {
         "matches": "(.*)"
@@ -15,11 +15,11 @@
       "tags": [
         {
           "ID": "123",
-          "slug": "travel",
-          "title": "Travel",
-          "display_name": "travel",
+          "slug": "{{request.pathSegments.[4]}}",
+          "title": "{{capitalize request.pathSegments.[4]}}",
+          "display_name": "{{request.pathSegments.[4]}}",
           "description": null,
-          "URL": "https://public-api.wordpress.com/rest/v1.1/read/tags/travel/posts"
+          "URL": "https://public-api.wordpress.com/rest/v1.1/read/tags/{{request.pathSegments.[4]}}/posts"
         }
       ],
       "added_tag": "123"
@@ -28,6 +28,9 @@
       "Content-Type": "application/json",
       "Connection": "keep-alive",
       "Cache-Control": "no-cache, must-revalidate, max-age=0"
-    }
+    },
+    "transformers": [
+      "response-template"
+    ]
   }
 }
diff --git a/Modules/Sources/UITestsFoundation/Screens/CommentsScreen.swift b/Modules/Sources/UITestsFoundation/Screens/CommentsScreen.swift
@@ -3,36 +3,46 @@ import XCTest
 
 public class CommentsScreen: ScreenObject {
 
+    private let addCommentButtonGetter: (XCUIApplication) -> XCUIElement = {
+        $0.otherElements["button_add_comment_large"]
+    }
+
+    private let backButtonGetter: (XCUIApplication) -> XCUIElement = {
+        $0.navigationBars.buttons["Reader"]
+    }
+
+    private let emptyImageGetter: (XCUIApplication) -> XCUIElement = {
+        $0.images["wp-illustration-reader-empty"]
+    }
+
     private let navigationBarTitleGetter: (XCUIApplication) -> XCUIElement = {
         $0.navigationBars["Comments"]
     }
 
     private let replyFieldGetter: (XCUIApplication) -> XCUIElement = {
-        $0.otherElements["reply-to-post-text-field"]
+        $0.textViews["edit_comment_text_view"]
     }
 
     private let replyMessageNoticeGetter: (XCUIApplication) -> XCUIElement = {
         $0.otherElements["notice_title_and_message"]
     }
 
-    private let backButtonGetter: (XCUIApplication) -> XCUIElement = {
-        $0.navigationBars.buttons["Reader"]
-    }
-
-    private let replyButtonGetter: (XCUIApplication) -> XCUIElement = {
-        $0.buttons["Reply"]
+    private let sendButtonGetter: (XCUIApplication) -> XCUIElement = {
+        $0.buttons["button_send_comment"]
     }
 
+    var addCommentButton: XCUIElement { addCommentButtonGetter(app) }
     var backButton: XCUIElement { backButtonGetter(app) }
-    var replyButton: XCUIElement { replyButtonGetter(app) }
+    var emptyImage: XCUIElement { emptyImageGetter(app) }
     var replyField: XCUIElement { replyFieldGetter(app) }
     var replyMessageNotice: XCUIElement { replyMessageNoticeGetter(app) }
+    var sendButton: XCUIElement { sendButtonGetter(app) }
 
     init(app: XCUIApplication = XCUIApplication()) throws {
         try super.init(
             expectedElementGetters: [
                 navigationBarTitleGetter,
-                replyFieldGetter
+                addCommentButtonGetter
             ],
             app: app
         )
@@ -49,21 +59,25 @@ public class CommentsScreen: ScreenObject {
 
     @discardableResult
     public func replyToPost(_ comment: String) -> CommentsScreen {
-        replyField.tap()
+        addCommentButton.tap()
         replyField.typeText(comment)
-        replyButton.tap()
+        sendButton.tap()
         return self
     }
 
     public func verifyCommentsListEmpty() -> CommentsScreen {
-        XCTAssertTrue(app.tables.firstMatch.label == "Empty list")
+        XCTAssertTrue(emptyImage.waitForExistence(timeout: 3))
         XCTAssertTrue(app.staticTexts["Be the first to leave a comment."].isHittable)
-        XCTAssertTrue(app.cells.count == 0)
+        XCTAssertTrue(app.cells.containing(.button, identifier: "reply-comment-button").count == 0)
         return self
     }
 
     public func verifyCommentSent(_ content: String) {
-        XCTAssertTrue(replyMessageNotice.waitForIsHittable(), "'Reply Sent' message was not displayed.")
-        XCTAssertTrue(app.cells.containing(.textView, identifier: content).count == 1, "Comment was not visible")
+        let comment = app.cells.containing(.staticText, identifier: content)
+        let commentExists = comment.firstMatch.waitForExistence(timeout: 3)
+        let commentIsUnique = comment.count == 1
+
+        XCTAssertTrue(commentExists, "Comment not found.")
+        XCTAssertTrue(commentIsUnique, "Multiple comments found.")
     }
 }
diff --git a/Modules/Sources/UITestsFoundation/Screens/ReaderMenuScreen.swift b/Modules/Sources/UITestsFoundation/Screens/ReaderMenuScreen.swift
@@ -13,9 +13,10 @@ public final class ReaderMenuScreen: ScreenObject {
         case discover
         case saved
         case likes
+        case search
 
         func menuButton(_ app: XCUIApplication) -> XCUIElement {
-            app.staticTexts["reader_sidebar_\(rawValue)"].firstMatch
+            app.otherElements["reader_sidebar_\(rawValue)"].firstMatch
         }
     }
 
diff --git a/Modules/Sources/UITestsFoundation/Screens/ReaderScreen.swift b/Modules/Sources/UITestsFoundation/Screens/ReaderScreen.swift
@@ -9,11 +9,10 @@ public class ReaderScreen: ScreenObject {
     var followingButton: XCUIElement { app.buttons["Following"] }
     var subscriptionsMenuButton: XCUIElement { app.buttons["Subscriptions"] }
     var likesTabButton: XCUIElement { app.buttons["Likes"] }
-    var noResultsView: XCUIElement { app.staticTexts["no-results-label-stack-view"].firstMatch }
     var readerButton: XCUIElement { app.buttons["Reader"] }
     var readerTable: XCUIElement { app.tables["reader_table_view"] }
     var savedButton: XCUIElement { app.buttons["Saved"] }
-    var tagCellButton: XCUIElement { app.cells["topics-card-cell-button"] }
+    var tagCellButton: XCUIElement { app.cells["topics-card-cell"].firstMatch.buttons.firstMatch }
     var visitButton: XCUIElement { app.buttons["Visit"] }
     var ghostLoading: XCUIElement { app.tables["Reader Ghost Loading"] }
 
@@ -45,7 +44,7 @@ public class ReaderScreen: ScreenObject {
 
     @discardableResult
     public func getLastPost() throws -> XCUIElement {
-        guard let post = app.cells.lastMatch else {
+        guard let post = readerTable.cells.lastMatch else {
             throw UIElementNotFoundError(message: "ReaderScreen: No posts loaded")
         }
         scrollDownUntilElementIsFullyVisible(element: post)
@@ -64,7 +63,7 @@ public class ReaderScreen: ScreenObject {
 
     private func postContentEquals(_ expected: String) -> Bool {
         let equalsPostContent = NSPredicate(format: "label == %@", expected)
-        let isPostContentEqual = app.staticTexts.element(matching: equalsPostContent).waitForIsHittable(timeout: 3)
+        let isPostContentEqual = app.staticTexts.element(matching: equalsPostContent).waitForIsHittable(timeout: 60)
 
         return isPostContentEqual
     }
@@ -213,7 +212,6 @@ public class ReaderScreen: ScreenObject {
     }
 
     private func verifyEmptyPostList(file: StaticString = #file, line: UInt = #line) {
-        XCTAssertTrue(noResultsView.waitForExistence(timeout: 5), file: file, line: line)
         XCTAssertTrue(readerTable.label == .emptyListLabel, file: file, line: line)
     }
 }
diff --git a/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderDiscoverViewController.swift b/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderDiscoverViewController.swift
@@ -283,6 +283,7 @@ private class ReaderDiscoverStreamViewController: ReaderStreamViewController {
     private func makeRecommendedTagsCell(for interests: [ReaderTagTopic]) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: readerCardTopicsIdentifier) as! ReaderRecommendedTagsCell
         cell.configure(with: interests, delegate: self)
+        cell.accessibilityIdentifier = "topics-card-cell"
         hideSeparator(for: cell)
         return cell
     }
diff --git a/WordPress/UITests/Tests/ReaderTests.swift b/WordPress/UITests/Tests/ReaderTests.swift
@@ -25,19 +25,19 @@ class ReaderTests: XCTestCase {
 }
 
 class ReaderTests_01: ReaderTests {
-    func _testViewPost() throws {
+    func testViewPost() throws {
         try openStream(.recent)
             .openLastPost()
             .verifyPostContentEquals(.expectedPostContent)
     }
 
-    func _testViewPostInSafari() throws {
+    func testViewPostInSafari() throws {
         try openStream(.recent)
             .openLastPostInSafari()
             .verifyPostContentEquals(.expectedPostContent)
     }
 
-    func _testDiscover() throws {
+    func testDiscover() throws {
         try openStream(.discover)
             .selectTag()
             .verifyTagLoaded()
@@ -47,15 +47,15 @@ class ReaderTests_01: ReaderTests {
 }
 
 class ReaderTests_02: ReaderTests {
-    func _testAddCommentToPost() throws {
+    func testAddCommentToPost() throws {
         try openStream(.recent)
             .openLastPostComments()
             .verifyCommentsListEmpty()
             .replyToPost(.commentContent)
             .verifyCommentSent(.commentContent)
     }
 
-    func _testSavePost() throws {
+    func testSavePost() throws {
         // Get saved post label
         let (updatedReaderScreen, savedPostLabel) = try openStream(.saved)
             .verifySavedPosts(state: .withoutPosts)
@@ -68,7 +68,7 @@ class ReaderTests_02: ReaderTests {
             .verifySavedPosts(state: .withPosts, postLabel: savedPostLabel)
     }
 
-    func _testLikePost() throws {
+    func testLikePost() throws {
         try openStream(.likes)
             .verifyLikedPosts(state: .withoutPosts)
             .switchToStream(.recent)

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,10 @@ public final class ReaderMenuScreen: ScreenObject {`
`13`	`13`	`case discover`
`14`	`14`	`case saved`
`15`	`15`	`case likes`
	`16`	`+ case search`
`16`	`17`
`17`	`18`	`func menuButton(_ app: XCUIApplication) -> XCUIElement {`
`18`		`- app.staticTexts["reader_sidebar_\(rawValue)"].firstMatch`
	`19`	`+ app.otherElements["reader_sidebar_\(rawValue)"].firstMatch`
`19`	`20`	`}`
`20`	`21`	`}`
`21`	`22`
Original file line number	Diff line number	Diff line change
`@@ -283,6 +283,7 @@ private class ReaderDiscoverStreamViewController: ReaderStreamViewController {`
`283`	`283`	`private func makeRecommendedTagsCell(for interests: [ReaderTagTopic]) -> UITableViewCell {`
`284`	`284`	`let cell = tableView.dequeueReusableCell(withIdentifier: readerCardTopicsIdentifier) as! ReaderRecommendedTagsCell`
`285`	`285`	`cell.configure(with: interests, delegate: self)`
	`286`	`+ cell.accessibilityIdentifier = "topics-card-cell"`
`286`	`287`	`hideSeparator(for: cell)`
`287`	`288`	`return cell`
`288`	`289`	`}`