Adjust UI tests

Author: lmarceau

firefox-ios/firefox-ios-tests/Tests/FullFunctionalTestPlan.xctestplan

@@ -239,8 +239,7 @@
         "OnboardingTests\/testOnboardingSignIn_TAE()",
         "PerformanceTests",
         "PhotonActionSheetTests\/testPinToShortcuts()",
-        "PhotonActionSheetTests\/testPinToShortcuts_testPinToShortcuts_topSitesVisualRefreshFlagEnabled()",
-        "PhotonActionSheetTests\/testPinToShortcuts_topSitesVisualRefreshFlagDisabled()",
+        "PhotonActionSheetTests\/testPinToShortcuts_testPinToShortcuts()",
         "PhotonActionSheetTests\/testSharePageWithShareSheetOptions()",
         "PrivateBrowsingTest\/testClosePrivateTabsOptionClosesPrivateTabsShortCutiPad()",
         "PrivateBrowsingTest\/testLongPressLinkOptionsPrivateMode_TAE()",

firefox-ios/firefox-ios-tests/Tests/Smoketest.xctestplan

@@ -415,8 +415,7 @@
         "OnboardingTests\/testWhatsNewPage()",
         "OpeningScreenTests",
         "PerformanceTests",
-        "PhotonActionSheetTests\/testPinToShortcuts_andThenRemovingShortcuts_topSitesVisualRefreshFlagDisabled()",
-        "PhotonActionSheetTests\/testPinToShortcuts_andThenRemovingShortcuts_topSitesVisualRefreshFlagEnabled()",
+        "PhotonActionSheetTests\/testPinToShortcuts_andThenRemovingShortcuts()",
         "PhotonActionSheetTests\/testShareSheetOpenAndCancel()",
         "PhotonActionSheetTests\/testShareSheetSendToDevice()",
         "PocketTest",

firefox-ios/firefox-ios-tests/Tests/TAESmokeTestPlan.xctestplan

@@ -439,10 +439,8 @@
         "PerformanceTests\/testPerfTabs_3_20tabTray()",
         "PerformanceTests\/testPerfTabs_4_1280tabTray()",
         "PhotonActionSheetTests",
-        "PhotonActionSheetTests\/testPinToShortcuts_andThenRemovingShortcuts_topSitesVisualRefreshFlagDisabled()",
-        "PhotonActionSheetTests\/testPinToShortcuts_andThenRemovingShortcuts_topSitesVisualRefreshFlagEnabled()",
-        "PhotonActionSheetTests\/testPinToShortcuts_testPinToShortcuts_topSitesVisualRefreshFlagEnabled()",
-        "PhotonActionSheetTests\/testPinToShortcuts_topSitesVisualRefreshFlagDisabled()",
+        "PhotonActionSheetTests\/testPinToShortcuts_andThenRemovingShortcuts()",
+        "PhotonActionSheetTests\/testPinToShortcuts_testPinToShortcuts()",
         "PhotonActionSheetTests\/testSharePageWithShareSheetOptions()",
         "PhotonActionSheetTests\/testShareSheetOpenAndCancel()",
         "PhotonActionSheetTests\/testShareSheetSendToDevice()",

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

@@ -8,50 +8,7 @@ import Common
 class PhotonActionSheetTests: FeatureFlaggedTestBase {
     // https://mozilla.testrail.io/index.php?/cases/view/2306849
     // Smoketest
-    func testPinToShortcuts_topSitesVisualRefreshFlagDisabled() {
-        addLaunchArgument(jsonFileName: "defaultEnabledOff", featureName: "hnt-top-sites-visual-refresh-feature")
-        app.launch()
-        navigator.nowAt(HomePanelsScreen)
-        navigator.goto(URLBarOpen)
-        navigator.openURL(path(forTestPage: "test-example.html"))
-        waitUntilPageLoad()
-        // Open Page Action Menu Sheet and Pin the site
-        navigator.nowAt(BrowserTab)
-        navigator.goto(BrowserTabMenuMore)
-        navigator.performAction(Action.PinToTopSitesPAM)
-
-        // Navigate to topsites to verify that the site has been pinned
-        navigator.nowAt(BrowserTab)
-        navigator.performAction(Action.OpenNewTabFromTabTray)
-
-        // Verify that the site is pinned to top
-        let itemCell = app.links[AccessibilityIdentifiers.FirefoxHomepage.TopSites.itemCell]
-        let cell = itemCell.staticTexts["Example Domain"]
-        mozWaitForElementToExist(cell)
-        if #available(iOS 17, *) {
-            mozWaitForElementToExist(app.links["Pinned: Example Domain"].images[StandardImageIdentifiers.Small.pinBadgeFill])
-        } else {
-            // No identifier is available for iOS 17 amd below
-            mozWaitForElementToExist(app.links["Pinned: Example Domain"].images.element(boundBy: 1))
-        }
-
-        // Remove pin
-        cell.press(forDuration: 2)
-        app.tables.cells.buttons[StandardImageIdentifiers.Large.pinSlash].waitAndTap()
-        // Check that it has been unpinned
-        if #available(iOS 17, *) {
-            mozWaitForElementToNotExist(app.links["Example Domain"].images[StandardImageIdentifiers.Small.pinBadgeFill])
-        } else {
-            mozWaitForElementToNotExist(app.links["Example Domain"].images.element(boundBy: 1))
-        }
-
-        mozWaitForElementToNotExist(cell)
-    }
-
-    // https://mozilla.testrail.io/index.php?/cases/view/2306849
-    // Smoketest
-    func testPinToShortcuts_testPinToShortcuts_topSitesVisualRefreshFlagEnabled() {
-        addLaunchArgument(jsonFileName: "defaultEnabledOn", featureName: "hnt-top-sites-visual-refresh-feature")
+    func testPinToShortcuts_testPinToShortcuts() {
         app.launch()
         navigator.nowAt(HomePanelsScreen)
         navigator.goto(URLBarOpen)
@@ -90,8 +47,7 @@ class PhotonActionSheetTests: FeatureFlaggedTestBase {
         mozWaitForElementToNotExist(cell)
     }
 
-    func testPinToShortcuts_andThenRemovingShortcuts_topSitesVisualRefreshFlagEnabled() {
-        addLaunchArgument(jsonFileName: "defaultEnabledOn", featureName: "hnt-top-sites-visual-refresh-feature")
+    func testPinToShortcuts_andThenRemovingShortcuts() {
         app.launch()
         navigator.nowAt(HomePanelsScreen)
         navigator.goto(URLBarOpen)
@@ -121,38 +77,6 @@ class PhotonActionSheetTests: FeatureFlaggedTestBase {
         mozWaitForElementToNotExist(shortcutCell)
     }
 
-    // https://mozilla.testrail.io/index.php?/cases/view/3102521
-    func testPinToShortcuts_andThenRemovingShortcuts_topSitesVisualRefreshFlagDisabled() {
-        addLaunchArgument(jsonFileName: "defaultEnabledOff", featureName: "hnt-top-sites-visual-refresh-feature")
-        app.launch()
-        navigator.nowAt(HomePanelsScreen)
-        navigator.goto(URLBarOpen)
-        navigator.openURL(path(forTestPage: "test-example.html"))
-        waitUntilPageLoad()
-        navigator.nowAt(BrowserTab)
-        navigator.goto(BrowserTabMenuMore)
-        navigator.performAction(Action.PinToTopSitesPAM)
-        navigator.nowAt(BrowserTab)
-        navigator.performAction(Action.OpenNewTabFromTabTray)
-
-        let itemCell = app.links[AccessibilityIdentifiers.FirefoxHomepage.TopSites.itemCell]
-        let shortcutCell = itemCell.staticTexts["Example Domain"]
-        mozWaitForElementToExist(shortcutCell)
-        if #available(iOS 17, *) {
-            mozWaitForElementToExist(app.links["Pinned: Example Domain"].images[StandardImageIdentifiers.Small.pinBadgeFill])
-        } else {
-            // No identifier is available for iOS 17 amd below
-            mozWaitForElementToExist(app.links["Pinned: Example Domain"].images.element(boundBy: 1))
-        }
-
-        let pinnedShortcutCell = app.collectionViews.links["Pinned: Example Domain"]
-        pinnedShortcutCell.press(forDuration: 2)
-        app.tables.cells.buttons[StandardImageIdentifiers.Large.cross].waitAndTap()
-
-        mozWaitForElementToNotExist(shortcutCell)
-        mozWaitForElementToNotExist(pinnedShortcutCell)
-    }
-
     private func openNewShareSheet() {
         app.launch()
         navigator.nowAt(HomePanelsScreen)