Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(57)

Side by Side Diff: ios/chrome/browser/ui/authentication/signin_interaction_controller_egtest.mm

Issue 2666833003: Revert of Removing "All Bookmarks" (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import <EarlGrey/EarlGrey.h> 5 #import <EarlGrey/EarlGrey.h>
6 #import <XCTest/XCTest.h> 6 #import <XCTest/XCTest.h>
7 7
8 #include "base/strings/sys_string_conversions.h" 8 #include "base/strings/sys_string_conversions.h"
9 #import "base/test/ios/wait_util.h" 9 #import "base/test/ios/wait_util.h"
10 #include "components/signin/core/browser/signin_manager.h" 10 #include "components/signin/core/browser/signin_manager.h"
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 onElementWithMatcher:grey_accessibilityID(kToolsMenuTableViewId)] 540 onElementWithMatcher:grey_accessibilityID(kToolsMenuTableViewId)]
541 performAction:grey_tap()]; 541 performAction:grey_tap()];
542 542
543 if (!IsIPadIdiom()) { 543 if (!IsIPadIdiom()) {
544 // Opens the bookmark manager sidebar on handsets. 544 // Opens the bookmark manager sidebar on handsets.
545 [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Menu")] 545 [[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"Menu")]
546 performAction:grey_tap()]; 546 performAction:grey_tap()];
547 } 547 }
548 548
549 // Selects the top level folder (Sign In promo is only shown there). 549 // Selects the top level folder (Sign In promo is only shown there).
550 NSString* topLevelFolderTitle = @"Mobile Bookmarks"; 550 NSString* topLevelFolderTitle = experimental_flags::IsAllBookmarksEnabled()
551 ? @"All Bookmarks"
552 : @"Mobile Bookmarks";
551 id<GREYMatcher> all_bookmarks_matcher = 553 id<GREYMatcher> all_bookmarks_matcher =
552 grey_allOf(grey_kindOfClass(NSClassFromString(@"BookmarkMenuCell")), 554 grey_allOf(grey_kindOfClass(NSClassFromString(@"BookmarkMenuCell")),
553 grey_descendant(grey_text(topLevelFolderTitle)), nil); 555 grey_descendant(grey_text(topLevelFolderTitle)), nil);
554 [[EarlGrey selectElementWithMatcher:all_bookmarks_matcher] 556 [[EarlGrey selectElementWithMatcher:all_bookmarks_matcher]
555 performAction:grey_tap()]; 557 performAction:grey_tap()];
556 558
557 TapButtonWithLabelId(IDS_IOS_BOOKMARK_PROMO_SIGN_IN_BUTTON); 559 TapButtonWithLabelId(IDS_IOS_BOOKMARK_PROMO_SIGN_IN_BUTTON);
558 560
559 // Assert sign-in screen was shown. 561 // Assert sign-in screen was shown.
560 id<GREYMatcher> signin_matcher = 562 id<GREYMatcher> signin_matcher =
(...skipping 27 matching lines...) Expand all
588 assertWithMatcher:grey_sufficientlyVisible()]; 590 assertWithMatcher:grey_sufficientlyVisible()];
589 591
590 // Close sign-in screen and Bookmarks. 592 // Close sign-in screen and Bookmarks.
591 TapButtonWithLabelId(IDS_IOS_ACCOUNT_CONSISTENCY_SETUP_SKIP_BUTTON); 593 TapButtonWithLabelId(IDS_IOS_ACCOUNT_CONSISTENCY_SETUP_SKIP_BUTTON);
592 if (!IsIPadIdiom()) { 594 if (!IsIPadIdiom()) {
593 TapButtonWithLabelId(IDS_IOS_NAVIGATION_BAR_DONE_BUTTON); 595 TapButtonWithLabelId(IDS_IOS_NAVIGATION_BAR_DONE_BUTTON);
594 } 596 }
595 } 597 }
596 598
597 @end 599 @end
OLDNEW
« no previous file with comments | « ios/chrome/browser/resources/Settings.bundle/Experimental.plist ('k') | ios/chrome/browser/ui/bookmarks/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698