Skip to content

GitLab

T
tangled
Commit ed3fbbd4 authored by Javier Ernesto Flores Robles's avatar Javier Ernesto Flores Robles Committed by Commit Bot
Browse files
Options

[iOS] Use a simpler grey matcher for web view 

For some reason chrome_test_util::WebViewMatcher is flaky in these ones.
Could be related to the keyboard being in screen.

The flakiness appears to be related to iOS 13.4. Maybe a recent update
to the bots or a version upgrade of earl grey.

Using a simpler matcher seems to fix the issue.

Fixed: 1116043, 1116734, 1114899, 1111076, 1115321, 1111258, 1115282
Change-Id: I9172417a20d5b8e09dc47cd986256fc0a8cb46ba
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2362892Reviewed-by: default avatarDavid Jean <djean@chromium.org>
Commit-Queue: Javier Ernesto Flores Robles <javierrobles@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799544}
parent f1d3e023
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 79 deletions
ios/chrome/browser/ui/autofill/manual_fill/address_view_controller_egtest.mm
View file @ ed3fbbd4
...@@ -44,9 +44,14 @@ BOOL WaitForKeyboardToAppear() { ...@@ -44,9 +44,14 @@ BOOL WaitForKeyboardToAppear() {
return [waitForKeyboard waitWithTimeout:kWaitForActionTimeout]; return [waitForKeyboard waitWithTimeout:kWaitForActionTimeout];
} }
// Returns a matcher for a web view.
id<GREYMatcher> WebViewMatcher() {
return grey_kindOfClass(NSClassFromString(@"WKWebView"));
}
} // namespace } // namespace
// Integration Tests for Mannual Fallback Addresses View Controller. // Integration Tests for Manual Fallback Addresses View Controller.
@interface AddressViewControllerTestCase : ChromeTestCase @interface AddressViewControllerTestCase : ChromeTestCase
@end @end
...@@ -69,17 +74,9 @@ BOOL WaitForKeyboardToAppear() { ...@@ -69,17 +74,9 @@ BOOL WaitForKeyboardToAppear() {
} }
// Tests that the addresses view controller appears on screen. // Tests that the addresses view controller appears on screen.
// TODO(crbug.com/1116274): Flaky on ios simulator. - (void)testAddressesViewControllerIsPresented {
#if TARGET_IPHONE_SIMULATOR
#define MAYBE_testAddressesViewControllerIsPresented \
DISABLED_testAddressesViewControllerIsPresented
#else
#define MAYBE_testAddressesViewControllerIsPresented \
testAddressesViewControllerIsPresented
#endif
- (void)MAYBE_testAddressesViewControllerIsPresented {
// Bring up the keyboard. // Bring up the keyboard.
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:chrome_test_util::TapWebElementWithId(kFormElementName)]; performAction:chrome_test_util::TapWebElementWithId(kFormElementName)];
// Tap on the addresses icon. // Tap on the addresses icon.
...@@ -95,17 +92,9 @@ BOOL WaitForKeyboardToAppear() { ...@@ -95,17 +92,9 @@ BOOL WaitForKeyboardToAppear() {
// Tests that the addresses view controller contains the "Manage Addresses..." // Tests that the addresses view controller contains the "Manage Addresses..."
// action. // action.
// TODO(crbug.com/1116043): Flaky on ios simulator. - (void)testAddressesViewControllerContainsManageAddressesAction {
#if TARGET_IPHONE_SIMULATOR
#define MAYBE_testAddressesViewControllerContainsManageAddressesAction \
DISABLED_testAddressesViewControllerContainsManageAddressesAction
#else
#define MAYBE_testAddressesViewControllerContainsManageAddressesAction \
testAddressesViewControllerContainsManageAddressesAction
#endif
- (void)MAYBE_testAddressesViewControllerContainsManageAddressesAction {
// Bring up the keyboard. // Bring up the keyboard.
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:chrome_test_util::TapWebElementWithId(kFormElementName)]; performAction:chrome_test_util::TapWebElementWithId(kFormElementName)];
// Tap on the addresses icon. // Tap on the addresses icon.
...@@ -124,7 +113,7 @@ BOOL WaitForKeyboardToAppear() { ...@@ -124,7 +113,7 @@ BOOL WaitForKeyboardToAppear() {
// Tests that the "Manage Addresses..." action works. // Tests that the "Manage Addresses..." action works.
- (void)testManageAddressesActionOpensAddressSettings { - (void)testManageAddressesActionOpensAddressSettings {
// Bring up the keyboard. // Bring up the keyboard.
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:chrome_test_util::TapWebElementWithId(kFormElementName)]; performAction:chrome_test_util::TapWebElementWithId(kFormElementName)];
// Tap on the addresses icon. // Tap on the addresses icon.
...@@ -146,17 +135,9 @@ BOOL WaitForKeyboardToAppear() { ...@@ -146,17 +135,9 @@ BOOL WaitForKeyboardToAppear() {
// Tests that returning from "Manage Addresses..." leaves the icons and keyboard // Tests that returning from "Manage Addresses..." leaves the icons and keyboard
// in the right state. // in the right state.
// TODO(crbug.com/1111076): Flaky on iOS simulator. - (void)testAddressesStateAfterPresentingManageAddresses {
#if TARGET_IPHONE_SIMULATOR
#define MAYBE_testAddressesStateAfterPresentingManageAddresses \
DISABLED_testAddressesStateAfterPresentingManageAddresses
#else
#define MAYBE_testAddressesStateAfterPresentingManageAddresses \
testAddressesStateAfterPresentingManageAddresses
#endif
- (void)MAYBE_testAddressesStateAfterPresentingManageAddresses {
// Bring up the keyboard. // Bring up the keyboard.
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:chrome_test_util::TapWebElementWithId(kFormElementName)]; performAction:chrome_test_util::TapWebElementWithId(kFormElementName)];
// Tap on the addresses icon. // Tap on the addresses icon.
...@@ -211,7 +192,7 @@ BOOL WaitForKeyboardToAppear() { ...@@ -211,7 +192,7 @@ BOOL WaitForKeyboardToAppear() {
; ;
} }
// Bring up the keyboard. // Bring up the keyboard.
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:chrome_test_util::TapWebElementWithId(kFormElementName)]; performAction:chrome_test_util::TapWebElementWithId(kFormElementName)];
// Tap on the addresses icon. // Tap on the addresses icon.
...@@ -238,20 +219,12 @@ BOOL WaitForKeyboardToAppear() { ...@@ -238,20 +219,12 @@ BOOL WaitForKeyboardToAppear() {
// Tests that the Address View Controller is dismissed when tapping the outside // Tests that the Address View Controller is dismissed when tapping the outside
// the popover on iPad. // the popover on iPad.
// TODO(crbug.com/1116887) Flaky on iOS simulator - (void)testIPadTappingOutsidePopOverDismissAddressController {
#if TARGET_IPHONE_SIMULATOR
#define MAYBE_testIPadTappingOutsidePopOverDismissAddressController \
DISABLED_testIPadTappingOutsidePopOverDismissAddressController
#else
#define MAYBE_testIPadTappingOutsidePopOverDismissAddressController \
testIPadTappingOutsidePopOverDismissAddressController
#endif
- (void)MAYBE_testIPadTappingOutsidePopOverDismissAddressController {
if (![ChromeEarlGrey isIPadIdiom]) { if (![ChromeEarlGrey isIPadIdiom]) {
EARL_GREY_TEST_SKIPPED(@"Test is not applicable for iPhone"); EARL_GREY_TEST_SKIPPED(@"Test is not applicable for iPhone");
} }
// Bring up the keyboard. // Bring up the keyboard.
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:chrome_test_util::TapWebElementWithId(kFormElementName)]; performAction:chrome_test_util::TapWebElementWithId(kFormElementName)];
// Tap on the addresses icon. // Tap on the addresses icon.
...@@ -280,20 +253,12 @@ BOOL WaitForKeyboardToAppear() { ...@@ -280,20 +253,12 @@ BOOL WaitForKeyboardToAppear() {
} }
// Tests that the address icon is hidden when no addresses are available. // Tests that the address icon is hidden when no addresses are available.
// TODO(crbug.com/1116043): Flaky on ios simulator. - (void)testAddressIconIsNotVisibleWhenAddressStoreEmpty {
#if TARGET_IPHONE_SIMULATOR
#define MAYBE_testAddressIconIsNotVisibleWhenAddressStoreEmpty \
DISABLED_testAddressIconIsNotVisibleWhenAddressStoreEmpty
#else
#define MAYBE_testAddressIconIsNotVisibleWhenAddressStoreEmpty \
testAddressIconIsNotVisibleWhenAddressStoreEmpty
#endif
- (void)MAYBE_testAddressIconIsNotVisibleWhenAddressStoreEmpty {
// Delete the profile that is added on |-setUp|. // Delete the profile that is added on |-setUp|.
[AutofillAppInterface clearProfilesStore]; [AutofillAppInterface clearProfilesStore];
// Bring up the keyboard. // Bring up the keyboard.
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:chrome_test_util::TapWebElementWithId(kFormElementName)]; performAction:chrome_test_util::TapWebElementWithId(kFormElementName)];
// Wait for the keyboard to appear. // Wait for the keyboard to appear.
...@@ -307,7 +272,7 @@ BOOL WaitForKeyboardToAppear() { ...@@ -307,7 +272,7 @@ BOOL WaitForKeyboardToAppear() {
[AutofillAppInterface saveExampleProfile]; [AutofillAppInterface saveExampleProfile];
// Tap another field to trigger form activity. // Tap another field to trigger form activity.
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)]; performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)];
// Assert the address icon is visible now. // Assert the address icon is visible now.
......
ios/chrome/browser/ui/autofill/manual_fill/fallback_coordinator_egtest.mm
View file @ ed3fbbd4
...@@ -48,6 +48,11 @@ id<GREYMatcher> ProfileTableViewButtonMatcher() { ...@@ -48,6 +48,11 @@ id<GREYMatcher> ProfileTableViewButtonMatcher() {
return grey_buttonTitle(@"Underworld"); return grey_buttonTitle(@"Underworld");
} }
// Returns a matcher for a web view.
id<GREYMatcher> WebViewMatcher() {
return grey_kindOfClass(NSClassFromString(@"WKWebView"));
}
// Polls the JavaScript query |java_script_condition| until the returned // Polls the JavaScript query |java_script_condition| until the returned
// |boolValue| is YES with a kWaitForActionTimeout timeout. // |boolValue| is YES with a kWaitForActionTimeout timeout.
BOOL WaitForJavaScriptCondition(NSString* java_script_condition) { BOOL WaitForJavaScriptCondition(NSString* java_script_condition) {
...@@ -163,7 +168,7 @@ BOOL WaitForKeyboardToAppear() { ...@@ -163,7 +168,7 @@ BOOL WaitForKeyboardToAppear() {
// will dismiss any. // will dismiss any.
if ([ChromeEarlGrey isIPadIdiom]) { if ([ChromeEarlGrey isIPadIdiom]) {
// Tap in the web view so the popover dismisses. // Tap in the web view so the popover dismisses.
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:grey_tapAtPoint(CGPointMake(0, 0))]; performAction:grey_tapAtPoint(CGPointMake(0, 0))];
// Verify the table view is not visible. // Verify the table view is not visible.
...@@ -187,7 +192,7 @@ BOOL WaitForKeyboardToAppear() { ...@@ -187,7 +192,7 @@ BOOL WaitForKeyboardToAppear() {
[AutofillAppInterface saveExampleProfile]; [AutofillAppInterface saveExampleProfile];
// Bring up the keyboard. // Bring up the keyboard.
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:chrome_test_util::TapWebElementWithId(kFormElementName)]; performAction:chrome_test_util::TapWebElementWithId(kFormElementName)];
// Tap on the profiles icon. // Tap on the profiles icon.
...@@ -230,7 +235,7 @@ BOOL WaitForKeyboardToAppear() { ...@@ -230,7 +235,7 @@ BOOL WaitForKeyboardToAppear() {
[AutofillAppInterface saveExampleProfile]; [AutofillAppInterface saveExampleProfile];
// Bring up the keyboard. // Bring up the keyboard.
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)]; performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)];
// Tap on the profiles icon. // Tap on the profiles icon.
...@@ -276,7 +281,7 @@ BOOL WaitForKeyboardToAppear() { ...@@ -276,7 +281,7 @@ BOOL WaitForKeyboardToAppear() {
// Bring up the keyboard by tapping the city, which is the element before the // Bring up the keyboard by tapping the city, which is the element before the
// picker. // picker.
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)]; performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)];
// Tap on the profiles icon. // Tap on the profiles icon.
...@@ -301,7 +306,7 @@ BOOL WaitForKeyboardToAppear() { ...@@ -301,7 +306,7 @@ BOOL WaitForKeyboardToAppear() {
// first. // first.
if ([ChromeEarlGrey isIPadIdiom]) { if ([ChromeEarlGrey isIPadIdiom]) {
// Tap in the web view so the popover dismisses. // Tap in the web view so the popover dismisses.
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:grey_tapAtPoint(CGPointMake(0, 0))]; performAction:grey_tapAtPoint(CGPointMake(0, 0))];
// Verify the table view is not visible. // Verify the table view is not visible.
...@@ -313,7 +318,7 @@ BOOL WaitForKeyboardToAppear() { ...@@ -313,7 +318,7 @@ BOOL WaitForKeyboardToAppear() {
} }
// Bring up the regular keyboard again. // Bring up the regular keyboard again.
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)]; performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)];
// Wait for the accessory icon to appear. // Wait for the accessory icon to appear.
...@@ -344,7 +349,7 @@ BOOL WaitForKeyboardToAppear() { ...@@ -344,7 +349,7 @@ BOOL WaitForKeyboardToAppear() {
// Bring up the keyboard by tapping the city, which is the element before the // Bring up the keyboard by tapping the city, which is the element before the
// picker. // picker.
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)]; performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)];
if (!UndockAndSplitKeyboard()) { if (!UndockAndSplitKeyboard()) {
...@@ -389,7 +394,7 @@ BOOL WaitForKeyboardToAppear() { ...@@ -389,7 +394,7 @@ BOOL WaitForKeyboardToAppear() {
assertWithMatcher:grey_nil()]; assertWithMatcher:grey_nil()];
// Bring up the regular keyboard again. // Bring up the regular keyboard again.
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:chrome_test_util::TapWebElementWithId(kFormElementName)]; performAction:chrome_test_util::TapWebElementWithId(kFormElementName)];
// Wait for the accessory icon to appear. // Wait for the accessory icon to appear.
...@@ -420,7 +425,7 @@ BOOL WaitForKeyboardToAppear() { ...@@ -420,7 +425,7 @@ BOOL WaitForKeyboardToAppear() {
// Bring up the keyboard by tapping the city, which is the element before the // Bring up the keyboard by tapping the city, which is the element before the
// picker. // picker.
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)]; performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)];
if (!UndockAndSplitKeyboard()) { if (!UndockAndSplitKeyboard()) {
...@@ -449,14 +454,13 @@ BOOL WaitForKeyboardToAppear() { ...@@ -449,14 +454,13 @@ BOOL WaitForKeyboardToAppear() {
} }
// Tests that the manual fallback view is present in incognito. // Tests that the manual fallback view is present in incognito.
// Disabled due to flakiness. See crbug.com/1115321. - (void)testIncognitoManualFallbackMenu {
- (void)DISABLED_testIncognitoManualFallbackMenu {
// Add the profile to use for verification. // Add the profile to use for verification.
[AutofillAppInterface saveExampleProfile]; [AutofillAppInterface saveExampleProfile];
// Bring up the keyboard by tapping the city, which is the element before the // Bring up the keyboard by tapping the city, which is the element before the
// picker. // picker.
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)]; performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)];
// Verify the profiles icon is visible. // Verify the profiles icon is visible.
...@@ -473,7 +477,7 @@ BOOL WaitForKeyboardToAppear() { ...@@ -473,7 +477,7 @@ BOOL WaitForKeyboardToAppear() {
// Bring up the keyboard by tapping the city, which is the element before the // Bring up the keyboard by tapping the city, which is the element before the
// picker. // picker.
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)]; performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)];
// Verify the profiles icon is visible. // Verify the profiles icon is visible.
...@@ -486,13 +490,12 @@ BOOL WaitForKeyboardToAppear() { ...@@ -486,13 +490,12 @@ BOOL WaitForKeyboardToAppear() {
// Tests the mediator stops observing objects when the incognito BVC is // Tests the mediator stops observing objects when the incognito BVC is
// destroyed. Waiting for dealloc was causing a race condition with the // destroyed. Waiting for dealloc was causing a race condition with the
// autorelease pool, and some times a DCHECK will be hit. // autorelease pool, and some times a DCHECK will be hit.
// TODO(crbug.com/1111258): Investigate cause of flakiness and re-enable. - (void)testOpeningIncognitoTabsDoNotLeak {
- (void)DISABLED_testOpeningIncognitoTabsDoNotLeak {
const GURL URL = self.testServer->GetURL(kFormHTMLFile); const GURL URL = self.testServer->GetURL(kFormHTMLFile);
std::string webViewText("Profile form"); std::string webViewText("Profile form");
[AutofillAppInterface saveExampleProfile]; [AutofillAppInterface saveExampleProfile];
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)]; performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)];
// Verify the profiles icon is visible. // Verify the profiles icon is visible.
...@@ -506,7 +509,7 @@ BOOL WaitForKeyboardToAppear() { ...@@ -506,7 +509,7 @@ BOOL WaitForKeyboardToAppear() {
[ChromeEarlGrey loadURL:URL]; [ChromeEarlGrey loadURL:URL];
[ChromeEarlGrey waitForWebStateContainingText:webViewText]; [ChromeEarlGrey waitForWebStateContainingText:webViewText];
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)]; performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)];
// Verify the profiles icon is visible. // Verify the profiles icon is visible.
...@@ -522,7 +525,7 @@ BOOL WaitForKeyboardToAppear() { ...@@ -522,7 +525,7 @@ BOOL WaitForKeyboardToAppear() {
// Bring up the keyboard by tapping the city, which is the element before the // Bring up the keyboard by tapping the city, which is the element before the
// picker. // picker.
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)]; performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)];
// Verify the profiles icon is visible. // Verify the profiles icon is visible.
...@@ -538,7 +541,7 @@ BOOL WaitForKeyboardToAppear() { ...@@ -538,7 +541,7 @@ BOOL WaitForKeyboardToAppear() {
// Bring up the keyboard by tapping the city, which is the element before the // Bring up the keyboard by tapping the city, which is the element before the
// picker. // picker.
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)]; performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)];
// Open a regular tab. // Open a regular tab.
...@@ -548,7 +551,7 @@ BOOL WaitForKeyboardToAppear() { ...@@ -548,7 +551,7 @@ BOOL WaitForKeyboardToAppear() {
// Bring up the keyboard by tapping the city, which is the element before the // Bring up the keyboard by tapping the city, which is the element before the
// picker. // picker.
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)]; performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)];
// This will fail if there is more than one profiles icon in the hierarchy. // This will fail if there is more than one profiles icon in the hierarchy.
...@@ -559,14 +562,13 @@ BOOL WaitForKeyboardToAppear() { ...@@ -559,14 +562,13 @@ BOOL WaitForKeyboardToAppear() {
} }
// Tests that the manual fallback view is not duplicated after incognito. // Tests that the manual fallback view is not duplicated after incognito.
// Disabled due to flakiness. See crbug.com/1115282. - (void)testReturningFromIncognitoDoesNotDuplicatesManualFallbackMenu {
- (void)DISABLED_testReturningFromIncognitoDoesNotDuplicatesManualFallbackMenu {
// Add the profile to use for verification. // Add the profile to use for verification.
[AutofillAppInterface saveExampleProfile]; [AutofillAppInterface saveExampleProfile];
// Bring up the keyboard by tapping the city, which is the element before the // Bring up the keyboard by tapping the city, which is the element before the
// picker. // picker.
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)]; performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)];
// Verify the profiles icon is visible. // Verify the profiles icon is visible.
...@@ -583,7 +585,7 @@ BOOL WaitForKeyboardToAppear() { ...@@ -583,7 +585,7 @@ BOOL WaitForKeyboardToAppear() {
// Bring up the keyboard by tapping the city, which is the element before the // Bring up the keyboard by tapping the city, which is the element before the
// picker. // picker.
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)]; performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)];
// Open a regular tab. // Open a regular tab.
...@@ -593,7 +595,7 @@ BOOL WaitForKeyboardToAppear() { ...@@ -593,7 +595,7 @@ BOOL WaitForKeyboardToAppear() {
// Bring up the keyboard by tapping the city, which is the element before the // Bring up the keyboard by tapping the city, which is the element before the
// picker. // picker.
[[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewMatcher()] [[EarlGrey selectElementWithMatcher:WebViewMatcher()]
performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)]; performAction:chrome_test_util::TapWebElementWithId(kFormElementCity)];
// This will fail if there is more than one profiles icon in the hierarchy. // This will fail if there is more than one profiles icon in the hierarchy.
......
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