Making the gradient click-through in ChromeSigninViewController

ios/chrome/browser/ui/first_run/first_run_egtest.mm

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import <EarlGrey/EarlGrey.h>
 #import <XCTest/XCTest.h>
 
 #include "base/strings/sys_string_conversions.h"
+#import "base/test/ios/wait_util.h"
 #include "components/metrics/metrics_pref_names.h"
 #include "components/metrics/metrics_reporting_default_state.h"
 #include "components/prefs/pref_member.h"
 #include "components/prefs/pref_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #import "ios/chrome/app/main_controller.h"
 #include "ios/chrome/browser/application_context.h"
 #import "ios/chrome/browser/geolocation/omnibox_geolocation_controller+Testing.h"
 #import "ios/chrome/browser/geolocation/omnibox_geolocation_controller.h"
 #import "ios/chrome/browser/geolocation/test_location_manager.h"
 #include "ios/chrome/browser/signin/signin_manager_factory.h"
 #include "ios/chrome/browser/sync/sync_setup_service.h"
 #include "ios/chrome/browser/sync/sync_setup_service_factory.h"
 #import "ios/chrome/browser/ui/first_run/first_run_chrome_signin_view_controller.h"
 #include "ios/chrome/browser/ui/first_run/welcome_to_chrome_view_controller.h"
 #include "ios/chrome/grit/ios_chromium_strings.h"
 #include "ios/chrome/grit/ios_strings.h"
 #import "ios/chrome/test/app/chrome_test_util.h"
 #import "ios/chrome/test/earl_grey/chrome_matchers.h"
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
 #import "ios/public/provider/chrome/browser/signin/fake_chrome_identity.h"
 #import "ios/public/provider/chrome/browser/signin/fake_chrome_identity_service.h"
+#import "ios/testing/wait_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 using chrome_test_util::AccountConsistencySetupSigninButton;
 using chrome_test_util::ButtonWithAccessibilityLabel;
 using chrome_test_util::ButtonWithAccessibilityLabelId;
 using chrome_test_util::NavigationBarDoneButton;
@@ skipping 38 matching lines @@
       chrome_test_util::GetOriginalBrowserState();
   AccountInfo info =
       ios::SigninManagerFactory::GetForBrowserState(browser_state)
           ->GetAuthenticatedAccountInfo();
 
   GREYAssertEqual(base::SysNSStringToUTF8(identity.gaiaID), info.gaia,
                   @"Unexpected Gaia ID of the signed in user [expected = "
                   @"\"%@\", actual = \"%s\"]",
                   identity.gaiaID, info.gaia.c_str());
 }
+
+// Wait until |matcher| is accessible (not nil)
+void WaitForMatcher(id<GREYMatcher> matcher) {
+  ConditionBlock condition = ^{
+    NSError* error = nil;
+    [[EarlGrey selectElementWithMatcher:matcher] assertWithMatcher:grey_notNil()
+                                                             error:&error];
+    return error == nil;
+  };
+  GREYAssert(testing::WaitUntilConditionOrTimeout(
+                 testing::kWaitForUIElementTimeout, condition),
+             @"Waiting for matcher %@ failed.", matcher);
+}
 }
 
 @interface MainController (ExposedForTesting)
 - (void)showFirstRunUI;
 @end
 
 // Tests first run settings and navigation.
 @interface FirstRunTestCase : ChromeTestCase
 @end
 
@@ skipping 109 matching lines @@
   // Undo the sign-in and dismiss the Sign In screen.
   [[EarlGrey selectElementWithMatcher:UndoAccountConsistencyButton()]
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:FirstRunAccountConsistencySkipButton()]
       performAction:grey_tap()];
 
   // |identity| shouldn't be signed in.
   AssertAuthenticatedIdentityInActiveProfile(nil);
 }
 
-// Signs in to an account and then taps the Advanced link to go to settings.

[baxley, 2017/06/01 17:16:25]

This is the test comment, so it should stay.

[jlebel, 2017/06/02 09:28:26]

Done.

-// TODO(crbug.com/718023): Re-enable test.
-- (void)DISABLED_testSignInAndTapSettingsLink {
+- (void)FLAKY_testSignInAndTapSettingsLink {

[baxley, 2017/06/01 17:16:25]

Could you keep the TODO?

[jlebel, 2017/06/02 09:28:26]

Done.

   ChromeIdentity* identity = GetFakeIdentity();
   ios::FakeChromeIdentityService::GetInstanceFromChromeProvider()->AddIdentity(
       identity);
 
   // Launch First Run and accept tems of services.
   [chrome_test_util::GetMainController() showFirstRunUI];
   [[EarlGrey selectElementWithMatcher:FirstRunOptInAcceptButton()]
       performAction:grey_tap()];
 
   // Sign In |identity|.
   [[EarlGrey selectElementWithMatcher:AccountConsistencySetupSigninButton()]
       performAction:grey_tap()];
   AssertAuthenticatedIdentityInActiveProfile(identity);
 
   // Tap Settings link.
   id<GREYMatcher> settings_link_matcher = grey_allOf(
-      grey_accessibilityLabel(@"Settings"), grey_sufficientlyVisible(), nil);
+      grey_accessibilityLabel(@"Settings"), grey_sufficientlyVisible(),
+      grey_enabled(), grey_interactable(), nil);
+  WaitForMatcher(settings_link_matcher);

[baxley, 2017/06/01 17:16:25]

Similar to in the other file, do we need the extra matchers and to wait for the
matcher?

Ideally, we wouldn't WaitForMatcher. But if that's required we shouldn't use
more matchers than we need. If we need all of it, then it's fine as is.

[jlebel, 2017/06/02 09:28:26]

Done.

   [[EarlGrey selectElementWithMatcher:settings_link_matcher]
       performAction:grey_tap()];
 
   // Check Sync hasn't started yet, allowing the user to change somes settings.
   SyncSetupService* sync_service = SyncSetupServiceFactory::GetForBrowserState(
       chrome_test_util::GetOriginalBrowserState());
   GREYAssertFalse(sync_service->HasFinishedInitialSetup(),
                   @"Sync shouldn't have finished its original setup yet");
 
   // Close Settings, user is still signed in and sync is now starting.
   [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()]
       performAction:grey_tap()];
   AssertAuthenticatedIdentityInActiveProfile(identity);
   GREYAssertTrue(sync_service->HasFinishedInitialSetup(),
                  @"Sync should have finished its original setup");
 }
 
 @end