Commit 291798b8 authored by Robbie Gibson's avatar Robbie Gibson Committed by Commit Bot

[iOS] Fix bookmarks tests broken on iPhone SE

The root cause here for both tests is that the iPhone SE is short.
Using the new modal presentation style on iOS 13 (maybe CL
crrev.com/c/1719455), the view the tests are looking for, "First URL"
is hidden below the keyboard. Switching to tap on "French URL", a
bookmark that is earlier in the list and still on screen, fixes the
tests.

Bug: 999079, 999080
Change-Id: I78ae1360c264283413aa98cd6b5b50960aa9b9f2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1776264Reviewed-by: default avatarMark Cogan <marq@chromium.org>
Commit-Queue: Robbie Gibson <rkgibson@google.com>
Cr-Commit-Position: refs/heads/master@{#692040}
parent 3a54efae
...@@ -4054,10 +4054,6 @@ id<GREYMatcher> SearchIconButton() { ...@@ -4054,10 +4054,6 @@ id<GREYMatcher> SearchIconButton() {
// Tests the new folder name is committed when name editing is interrupted by // Tests the new folder name is committed when name editing is interrupted by
// navigating away. // navigating away.
- (void)testNewFolderNameCommittedOnNavigatingAway { - (void)testNewFolderNameCommittedOnNavigatingAway {
// TODO(crbug.com/999079): Reenable for iPhone SE.
if (UIScreen.mainScreen.bounds.size.height == 568) {
EARL_GREY_TEST_DISABLED(@"Test disabled on iPhone SE.");
}
[BookmarksTestCase setupStandardBookmarks]; [BookmarksTestCase setupStandardBookmarks];
[BookmarksTestCase openBookmarks]; [BookmarksTestCase openBookmarks];
[BookmarksTestCase openMobileBookmarks]; [BookmarksTestCase openMobileBookmarks];
...@@ -4116,7 +4112,7 @@ id<GREYMatcher> SearchIconButton() { ...@@ -4116,7 +4112,7 @@ id<GREYMatcher> SearchIconButton() {
// Interrupt the folder name editing by tapping on First URL. // Interrupt the folder name editing by tapping on First URL.
[BookmarksTestCase scrollToTop]; [BookmarksTestCase scrollToTop];
[[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"First URL")] [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"French URL")]
performAction:grey_tap()]; performAction:grey_tap()];
// Reopen bookmarks. // Reopen bookmarks.
[BookmarksTestCase openBookmarks]; [BookmarksTestCase openBookmarks];
...@@ -4415,10 +4411,6 @@ id<GREYMatcher> SearchIconButton() { ...@@ -4415,10 +4411,6 @@ id<GREYMatcher> SearchIconButton() {
// Tests that long press on scrim while search box is enabled dismisses the // Tests that long press on scrim while search box is enabled dismisses the
// search controller. // search controller.
- (void)testSearchLongPressOnScrimCancelsSearchController { - (void)testSearchLongPressOnScrimCancelsSearchController {
// TODO(crbug.com/999080): Reenable for iPhone SE.
if (UIScreen.mainScreen.bounds.size.height == 568) {
EARL_GREY_TEST_DISABLED(@"Test disabled on iPhone SE.");
}
[BookmarksTestCase setupStandardBookmarks]; [BookmarksTestCase setupStandardBookmarks];
[BookmarksTestCase openBookmarks]; [BookmarksTestCase openBookmarks];
[BookmarksTestCase openMobileBookmarks]; [BookmarksTestCase openMobileBookmarks];
...@@ -4428,7 +4420,7 @@ id<GREYMatcher> SearchIconButton() { ...@@ -4428,7 +4420,7 @@ id<GREYMatcher> SearchIconButton() {
// Try long press. // Try long press.
[[EarlGrey [[EarlGrey
selectElementWithMatcher:TappableBookmarkNodeWithLabel(@"First URL")] selectElementWithMatcher:TappableBookmarkNodeWithLabel(@"French URL")]
performAction:grey_longPress()]; performAction:grey_longPress()];
// Verify context menu is not visible. // Verify context menu is not visible.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment