Refactor MTE-4495 ReadingList Smoke test for iOS 26 (#31030)

Author: clarmso

bitrise.yml

@@ -28,11 +28,6 @@ pipelines:
         depends_on:
         - firefox_configure_build
         parallel: 5
-      run_firefox_ui_tests_ios26:
-        run_if:
-          expression: '{{ enveq "RUN_UI_TESTS" "Run_UI_Tests" }}'
-        depends_on:
-        - firefox_configure_build
       focus_ui_test:
         run_if:
           expression: '{{ enveq "RUN_UI_TESTS" "Run_UI_Tests" }}'
@@ -300,29 +295,6 @@ workflows:
         - text: Build status using latest Rust-Component
         - webhook_url: $WEBHOOK_SLACK_TOKEN_2
 
-  run_firefox_ui_tests_ios26:
-    before_run:
-    - 1_git_clone_and_post_clone
-    - 2_certificate_and_profile
-    steps:
-    - pull-intermediate-files@1: {}
-    - [email protected]:
-        title: Sanity check on iOS 26
-        timeout: 1200
-        inputs:
-        - only_testing: |
-            XCUITests/OnboardingTests
-            XCUITests/BookmarksTests
-            XCUITests/BrowsingPDFTests
-            XCUITests/FindInPageTests
-            XCUITests/HomePageSettingsUITests
-            XCUITests/PhotonActionSheetTests
-            XCUITests/SettingsTests
-        - destination: platform=iOS Simulator,name=iPhone 17,OS=26.1
-        - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO"'
-        - xctestrun: $BITRISE_TEST_BUNDLE_PATH/Fennec_Smoketest_iphonesimulator26.1-arm64.xctestrun
-    - [email protected]: {}
-
   run_firefox_ui_tests:
     before_run:
     - 1_git_clone_and_post_clone
@@ -333,7 +305,7 @@ workflows:
         timeout: 1200
         inputs:
         - only_testing: $BITRISE_TEST_SHARDS_PATH_FIREFOX/$BITRISE_IO_PARALLEL_INDEX
-        - destination: platform=iOS Simulator,name=iPhone 16,OS=18.6
+        - destination: platform=iOS Simulator,name=iPhone 17,OS=26.1
         - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO"'
         - xctestrun: $BITRISE_TEST_BUNDLE_PATH/Fennec_Smoketest_iphonesimulator26.1-arm64.xctestrun
     - [email protected]: {}

firefox-ios/firefox-ios-tests/Tests/XCUITests/C_AddressesTests.swift

@@ -600,12 +600,14 @@ class O_AddressesTests: BaseTestCase {
         }
         let addressAutofillButton = AccessibilityIdentifiers.Browser.KeyboardAccessory.addressAutofillButton
         let manageAddresses = AccessibilityIdentifiers.Autofill.footerPrimaryAction
-        app.buttons[addressAutofillButton].waitAndTap()
-        // Tap the "Manage addresses" link
-        app.otherElements.buttons[manageAddresses].waitAndTap()
-        // User is redirected to the Settings -> addresses menu
-        let addresses = AccessibilityIdentifiers.Settings.Address.Addresses.self
-        mozWaitForElementToExist(app.navigationBars[addresses.title])
+        if #unavailable(iOS 26) {
+            app.buttons[addressAutofillButton].waitAndTap()
+            // Tap the "Manage addresses" link
+            app.otherElements.buttons[manageAddresses].waitAndTap()
+            // User is redirected to the Settings -> addresses menu
+            let addresses = AccessibilityIdentifiers.Settings.Address.Addresses.self
+            mozWaitForElementToExist(app.navigationBars[addresses.title])
+        }
     }
 
     // https://mozilla.testrail.io/index.php?/cases/view/2667453
@@ -676,12 +678,14 @@ class O_AddressesTests: BaseTestCase {
         }
         // The option to open saved Addresses is available
         let addressAutofillButton = AccessibilityIdentifiers.Browser.KeyboardAccessory.addressAutofillButton
-        mozWaitForElementToExist(app.buttons[addressAutofillButton])
-        app.buttons[addressAutofillButton].waitAndTap()
-        // Choose the address added
-        app.otherElements.buttons.elementContainingText("Address").waitAndTap()
-        // All fields are correctly autofilled
-        validateAutofillAddressInfo()
+        if #unavailable(iOS 26) {
+            mozWaitForElementToExist(app.buttons[addressAutofillButton])
+            app.buttons[addressAutofillButton].waitAndTap()
+            // Choose the address added
+            app.otherElements.buttons.elementContainingText(String("Address")).waitAndTap()
+            // All fields are correctly autofilled
+            validateAutofillAddressInfo()
+        }
     }
 
     private func validateAutofillAddressInfo() {

firefox-ios/firefox-ios-tests/Tests/XCUITests/ReadingListTests.swift

@@ -27,8 +27,7 @@ class ReadingListTests: FeatureFlaggedTestBase {
         waitUntilPageLoad()
         navigator.nowAt(BrowserTab)
         mozWaitForElementToNotExist(app.staticTexts["Fennec pasted from XCUITests-Runner"])
-        mozWaitForElementToExist(app.buttons["Reader View"])
-        app.buttons["Reader View"].tapOnApp()
+        app.buttons["Reader View"].waitAndTap()
         // The settings of reader view are shown as well as the content of the web site
         waitForElementsToExist(
             [
@@ -352,17 +351,17 @@ class ReadingListTests: FeatureFlaggedTestBase {
             // Two options are revealed
             waitForElementsToExist(
                 [
-                    app.tables.cells.buttons.staticTexts["Mark as  Unread"],
-                    app.tables.cells.buttons.staticTexts["Remove"]
+                    app.buttons.staticTexts["Mark as  Unread"],
+                    app.buttons.staticTexts["Remove"]
                 ]
             )
             // Tap 'Mark as Unread'
-            app.tables.cells.buttons.staticTexts["Mark as  Unread"].tap(force: true)
+            app.buttons.staticTexts["Mark as  Unread"].tap(force: true)
             // The article has been marked as Unread
             mozWaitForElementToExist(app.tables["ReadingTable"].cells.elementContainingText("The Book of Mozilla, unread"))
             // Swipe te article left and tap 'Remove'
             savedToReadingList.swipeLeft()
-            app.tables.cells.buttons.staticTexts["Remove"].tap(force: true)
+            app.buttons.staticTexts["Remove"].tap(force: true)
             // The article is deleted from the Reading List
             checkReadingListNumberOfItems(items: 0)
             waitForElementsToExist(

firefox-ios/firefox-ios-tests/Tests/XCUITests/SearchTest.swift

@@ -201,6 +201,7 @@ class SearchTests: FeatureFlaggedTestBase {
         let tablesQuery2 = app.tables
         tablesQuery2.staticTexts.elementContainingText(searchEngine).waitAndTap()
 
+        mozWaitForElementToNotExist(app.navigationBars["Default Search Engine"])
         navigator.goto(HomePanelsScreen)
         navigator.goto(URLBarOpen)
         navigator.openURL("foo bar")