Chromium Code Reviews| Index: ios/chrome/browser/ui/authentication/signin_interaction_controller_egtest.mm |
| diff --git a/ios/chrome/browser/ui/authentication/signin_interaction_controller_egtest.mm b/ios/chrome/browser/ui/authentication/signin_interaction_controller_egtest.mm |
| index 79d2da36a926a4451b86a28529852addc06b3fb9..92ad594fa745b62d393750c5f082885bda0f1425 100644 |
| --- a/ios/chrome/browser/ui/authentication/signin_interaction_controller_egtest.mm |
| +++ b/ios/chrome/browser/ui/authentication/signin_interaction_controller_egtest.mm |
| @@ -359,11 +359,7 @@ void AssertAuthenticatedIdentityInActiveProfile(ChromeIdentity* identity) { |
| AssertAuthenticatedIdentityInActiveProfile(nil); |
| } |
| -// Tests that signing in, tapping the Settings link on the confirmation screen |
| -// and closing the Settings correctly leaves the user signed in without any |
| -// Settings shown. |
|
baxley
2017/06/01 17:16:25
The previous 3 lines are test comments, could you
jlebel
2017/06/02 09:28:26
Done.
|
| -// TODO(crbug.com/718023): Re-enable test. |
| -- (void)DISABLED_testSignInOpenSettings { |
| +- (void)FLAKY_testSignInOpenSettings { |
|
baxley
2017/06/01 17:16:25
Could you keep the TODO comment?
jlebel
2017/06/02 09:28:26
Done.
|
| ChromeIdentity* identity = GetFakeIdentity1(); |
| ios::FakeChromeIdentityService::GetInstanceFromChromeProvider()->AddIdentity( |
| identity); |
| @@ -375,11 +371,15 @@ void AssertAuthenticatedIdentityInActiveProfile(ChromeIdentity* 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); |
|
baxley
2017/06/01 17:16:25
are these extra constraints needed?
Or with these
jlebel
2017/06/02 09:28:25
Yes, both of them are not needed.
|
| + WaitForMatcher(settings_link_matcher); |
| [[EarlGrey selectElementWithMatcher:settings_link_matcher] |
| performAction:grey_tap()]; |
| - [[EarlGrey selectElementWithMatcher:NavigationBarDoneButton()] |
| + id<GREYMatcher> done_button_matcher = NavigationBarDoneButton(); |
| + WaitForMatcher(done_button_matcher); |
| + [[EarlGrey selectElementWithMatcher:done_button_matcher] |
| performAction:grey_tap()]; |
| // All Settings should be gone and user signed in. |