From c4c4746d14384382930797749a553e470ac138d4 Mon Sep 17 00:00:00 2001 From: Oana Horvath Date: Wed, 24 Nov 2021 13:51:06 +0200 Subject: [PATCH] run #5 --- .../java/org/mozilla/fenix/ui/SmokeTest.kt | 8 ++++++-- .../taskcluster/androidTest/flank-x86-beta.yml | 14 +++++++------- .../androidTest/flank-x86-start-test.yml | 14 +++++++------- automation/taskcluster/androidTest/flank-x86.yml | 2 +- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt index b06fa36ce8f1..e50f2696ba3b 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt @@ -888,10 +888,12 @@ class SmokeTest { navigationToolbar { }.enterURLAndEnterToBrowser(firstWebsite.url) { + verifyPageContent(firstWebsite.content) }.openTabDrawer { createCollection(firstWebsite.title, collectionName) }.openNewTab { }.submitQuery(secondWebsite.url.toString()) { + verifyPageContent(secondWebsite.content) }.openThreeDotMenu { }.openSaveToCollection { }.selectExistingCollection(collectionName) { @@ -975,14 +977,16 @@ class SmokeTest { val firstWebsiteTitle = firstWebsite.title val secondWebsiteTitle = secondWebsite.title val sharingApp = "Gmail" - val urlString = "${firstWebsite.url}\n\n${secondWebsite.url}" + val sharedUrlsString = "${firstWebsite.url}\n\n${secondWebsite.url}" homeScreen { }.openNavigationToolbar { }.enterURLAndEnterToBrowser(firstWebsite.url) { + verifyPageContent(firstWebsite.content) }.openTabDrawer { }.openNewTab { }.submitQuery(secondWebsite.url.toString()) { + verifyPageContent(secondWebsite.content) }.openTabDrawer { verifyExistingOpenTabs("Test_Page_1") verifyExistingOpenTabs("Test_Page_2") @@ -992,7 +996,7 @@ class SmokeTest { verifyShareTabsOverlay(firstWebsiteTitle, secondWebsiteTitle) selectAppToShareWith(sharingApp) verifySharedTabsIntent( - urlString, + sharedUrlsString, "$firstWebsiteTitle, $secondWebsiteTitle" ) } diff --git a/automation/taskcluster/androidTest/flank-x86-beta.yml b/automation/taskcluster/androidTest/flank-x86-beta.yml index 9f9d2689028f..66e99686a00c 100644 --- a/automation/taskcluster/androidTest/flank-x86-beta.yml +++ b/automation/taskcluster/androidTest/flank-x86-beta.yml @@ -38,13 +38,13 @@ gcloud: performance-metrics: true test-targets: - - class org.mozilla.fenix.ui.NavigationToolbarTest#visitURLTest - - class org.mozilla.fenix.ui.HistoryTest#visitedUrlHistoryTest - - class org.mozilla.fenix.ui.SmokeTest#openMainMenuSettingsItemTest - - class org.mozilla.fenix.ui.SmokeTest#toggleSearchSuggestions - - class org.mozilla.fenix.ui.SmokeTest#deleteCollectionTest - - class org.mozilla.fenix.ui.SmokeTest#noHistoryInPrivateBrowsingTest - - class org.mozilla.fenix.ui.NoNetworkAccessStartupTests#noNetworkConnectionStartupTest +# - class org.mozilla.fenix.ui.NavigationToolbarTest#visitURLTest +# - class org.mozilla.fenix.ui.HistoryTest#visitedUrlHistoryTest +# - class org.mozilla.fenix.ui.SmokeTest#openMainMenuSettingsItemTest +# - class org.mozilla.fenix.ui.SmokeTest#toggleSearchSuggestions +# - class org.mozilla.fenix.ui.SmokeTest#deleteCollectionTest +# - class org.mozilla.fenix.ui.SmokeTest#noHistoryInPrivateBrowsingTest +# - class org.mozilla.fenix.ui.NoNetworkAccessStartupTests#noNetworkConnectionStartupTest device: - model: Pixel2 diff --git a/automation/taskcluster/androidTest/flank-x86-start-test.yml b/automation/taskcluster/androidTest/flank-x86-start-test.yml index c9a24e662b25..21d523bcf0bb 100644 --- a/automation/taskcluster/androidTest/flank-x86-start-test.yml +++ b/automation/taskcluster/androidTest/flank-x86-start-test.yml @@ -34,13 +34,13 @@ gcloud: performance-metrics: true test-targets: - - class org.mozilla.fenix.ui.NavigationToolbarTest#visitURLTest - - class org.mozilla.fenix.ui.HistoryTest#visitedUrlHistoryTest - - class org.mozilla.fenix.ui.SmokeTest#openMainMenuSettingsItemTest - - class org.mozilla.fenix.ui.SmokeTest#toggleSearchSuggestions - - class org.mozilla.fenix.ui.SmokeTest#deleteCollectionTest - - class org.mozilla.fenix.ui.SmokeTest#noHistoryInPrivateBrowsingTest - - class org.mozilla.fenix.ui.NoNetworkAccessStartupTests#noNetworkConnectionStartupTest +# - class org.mozilla.fenix.ui.NavigationToolbarTest#visitURLTest +# - class org.mozilla.fenix.ui.HistoryTest#visitedUrlHistoryTest +# - class org.mozilla.fenix.ui.SmokeTest#openMainMenuSettingsItemTest +# - class org.mozilla.fenix.ui.SmokeTest#toggleSearchSuggestions +# - class org.mozilla.fenix.ui.SmokeTest#deleteCollectionTest +# - class org.mozilla.fenix.ui.SmokeTest#noHistoryInPrivateBrowsingTest +# - class org.mozilla.fenix.ui.NoNetworkAccessStartupTests#noNetworkConnectionStartupTest device: - model: Pixel2 diff --git a/automation/taskcluster/androidTest/flank-x86.yml b/automation/taskcluster/androidTest/flank-x86.yml index a708b07546db..192026e523c0 100644 --- a/automation/taskcluster/androidTest/flank-x86.yml +++ b/automation/taskcluster/androidTest/flank-x86.yml @@ -57,7 +57,7 @@ flank: max-test-shards: -1 # num-test-runs: the amount of times to run the tests. # 1 runs the tests once. 10 runs all the tests 10x - num-test-runs: 5 + num-test-runs: 60 ### Output Style flag ## Output style of execution status. May be one of [verbose, multi, single, compact]. ## For runs with only one test execution the default value is 'verbose', in other cases