Revert "[iOS] Add Tab Grid Item Context Menu Share Action EGTest" This reverts commit 8ce8356c55d388a2786f8152f13bbbf4dd6cdca2. Reason for revert: Landed on the wrong branch Original change's description: > [iOS] Add Tab Grid Item Context Menu Share Action EGTest > > Bug: 1202945 > Change-Id: I514c71510773eb79698ca79660f337957b92abe3 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2852504 > Reviewed-by: edchin <[email protected]> > Reviewed-by: Mohammad Refaat <[email protected]> Bug: 1202945 Change-Id: I9d366fcd9d6c0980fc14075883346b33d621ecbe No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2857445 Auto-Submit: Mohammad Refaat <[email protected]> Reviewed-by: edchin <[email protected]>
diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_egtest.mm b/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_egtest.mm index 81b6aa1..865b90b 100644 --- a/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_egtest.mm +++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_egtest.mm
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/ios/ios_util.h" #include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" #import "ios/chrome/browser/ui/tab_switcher/tab_grid/features.h" @@ -70,18 +69,6 @@ @implementation TabGridTestCase -- (AppLaunchConfiguration)appConfigurationForTestCase { - AppLaunchConfiguration config; - - // Features are enabled or disabled based on the name of the test that is - // running. This is done because it is inefficient to use - // ensureAppLaunchedWithConfiguration for each test. - if ([self isRunningTest:@selector(testTabGridItemContextMenuShare)]) { - config.features_enabled.push_back(kTabGridContextMenu); - } - return config; -} - - (void)setUp { [super setUp]; @@ -212,8 +199,6 @@ [ChromeEarlGreyUI assertHistoryHasNoEntries]; } -#pragma mark - Recent Tabs Context Menu - // Tests the Copy Link action on a recent tab's context menu. - (void)testRecentTabsContextMenuCopyLink { if (![ChromeEarlGrey isNativeContextMenusEnabled]) { @@ -222,7 +207,7 @@ } [self prepareRecentTabWithURL:_URL1 response:kResponse1]; - [self longPressTabWithTitle:[NSString stringWithUTF8String:kTitle1]]; + [self longPressRecentTabWithTitle:[NSString stringWithUTF8String:kTitle1]]; [ChromeEarlGrey verifyCopyLinkActionWithText:[NSString stringWithUTF8String:_URL1.spec() @@ -238,7 +223,7 @@ } [self prepareRecentTabWithURL:_URL1 response:kResponse1]; - [self longPressTabWithTitle:[NSString stringWithUTF8String:kTitle1]]; + [self longPressRecentTabWithTitle:[NSString stringWithUTF8String:kTitle1]]; [ChromeEarlGrey verifyOpenInNewTabActionWithURL:_URL1.GetContent()]; @@ -259,7 +244,7 @@ } [self prepareRecentTabWithURL:_URL1 response:kResponse1]; - [self longPressTabWithTitle:[NSString stringWithUTF8String:kTitle1]]; + [self longPressRecentTabWithTitle:[NSString stringWithUTF8String:kTitle1]]; [ChromeEarlGrey verifyOpenInNewWindowActionWithContent:kResponse1]; } @@ -272,35 +257,12 @@ } [self prepareRecentTabWithURL:_URL1 response:kResponse1]; - [self longPressTabWithTitle:[NSString stringWithUTF8String:kTitle1]]; + [self longPressRecentTabWithTitle:[NSString stringWithUTF8String:kTitle1]]; [ChromeEarlGrey verifyShareActionWithPageTitle:[NSString stringWithUTF8String:kTitle1]]; } -#pragma mark - Tab Grid Item Context Menu - -// Tests the Share action on a tab grid item's context menu. -- (void)testTabGridItemContextMenuShare { - if (!base::ios::IsRunningOnIOS13OrLater()) { - EARL_GREY_TEST_SKIPPED( - @"Tab Grid context menu only supported on iOS 13 and later."); - } - - [ChromeEarlGrey loadURL:_URL1]; - [ChromeEarlGrey waitForWebStateContainingText:kResponse1]; - - [[EarlGrey selectElementWithMatcher:chrome_test_util::ShowTabsButton()] - performAction:grey_tap()]; - - [self longPressTabWithTitle:[NSString stringWithUTF8String:kTitle1]]; - - [ChromeEarlGrey - verifyShareActionWithPageTitle:[NSString stringWithUTF8String:kTitle1]]; -} - -#pragma mark - - // Tests that tapping on "Close All" shows a confirmation dialog. // It also tests that tapping on "Close x Tab(s)" on the confirmation dialog // displays an empty grid and tapping on "Cancel" doesn't modify the grid. @@ -835,9 +797,7 @@ performAction:grey_tap()]; } -// Long press on the recent tab entry or the tab item in the tab grid with -// |title|. -- (void)longPressTabWithTitle:(NSString*)title { +- (void)longPressRecentTabWithTitle:(NSString*)title { // The test page may be there multiple times. [[[EarlGrey selectElementWithMatcher:grey_allOf(grey_accessibilityLabel(title),