OLD | NEW |
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 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
362 // Close Settings. | 362 // Close Settings. |
363 TapButtonWithLabelId(IDS_IOS_NAVIGATION_BAR_DONE_BUTTON); | 363 TapButtonWithLabelId(IDS_IOS_NAVIGATION_BAR_DONE_BUTTON); |
364 | 364 |
365 // Check that there is no signed in user. | 365 // Check that there is no signed in user. |
366 AssertAuthenticatedIdentityInActiveProfile(nil); | 366 AssertAuthenticatedIdentityInActiveProfile(nil); |
367 } | 367 } |
368 | 368 |
369 // Tests that signing in, tapping the Settings link on the confirmation screen | 369 // Tests that signing in, tapping the Settings link on the confirmation screen |
370 // and closing the Settings correctly leaves the user signed in without any | 370 // and closing the Settings correctly leaves the user signed in without any |
371 // Settings shown. | 371 // Settings shown. |
372 - (void)testSignInOpenSettings { | 372 // TODO(crbug.com/718023): Re-enable test. |
| 373 - (void)testSignInOpenSettings_DISABLED { |
373 ChromeIdentity* identity = GetFakeIdentity1(); | 374 ChromeIdentity* identity = GetFakeIdentity1(); |
374 ios::FakeChromeIdentityService::GetInstanceFromChromeProvider()->AddIdentity( | 375 ios::FakeChromeIdentityService::GetInstanceFromChromeProvider()->AddIdentity( |
375 identity); | 376 identity); |
376 | 377 |
377 // Sign in to |identity|. | 378 // Sign in to |identity|. |
378 OpenSignInFromSettings(); | 379 OpenSignInFromSettings(); |
379 TapButtonWithAccessibilityLabel(identity.userEmail); | 380 TapButtonWithAccessibilityLabel(identity.userEmail); |
380 TapButtonWithLabelId(IDS_IOS_ACCOUNT_CONSISTENCY_SETUP_SIGNIN_BUTTON); | 381 TapButtonWithLabelId(IDS_IOS_ACCOUNT_CONSISTENCY_SETUP_SIGNIN_BUTTON); |
381 | 382 |
382 // Tap Settings link. | 383 // Tap Settings link. |
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
591 assertWithMatcher:grey_sufficientlyVisible()]; | 592 assertWithMatcher:grey_sufficientlyVisible()]; |
592 | 593 |
593 // Close sign-in screen and Bookmarks. | 594 // Close sign-in screen and Bookmarks. |
594 TapButtonWithLabelId(IDS_IOS_ACCOUNT_CONSISTENCY_SETUP_SKIP_BUTTON); | 595 TapButtonWithLabelId(IDS_IOS_ACCOUNT_CONSISTENCY_SETUP_SKIP_BUTTON); |
595 if (!IsIPadIdiom()) { | 596 if (!IsIPadIdiom()) { |
596 TapButtonWithLabelId(IDS_IOS_NAVIGATION_BAR_DONE_BUTTON); | 597 TapButtonWithLabelId(IDS_IOS_NAVIGATION_BAR_DONE_BUTTON); |
597 } | 598 } |
598 } | 599 } |
599 | 600 |
600 @end | 601 @end |
OLD | NEW |