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

Unified Diff: ios/chrome/browser/web/navigation_egtest.mm

Issue 2784943002: Remove matcher to wait for static HTML view. (Closed)
Patch Set: typo Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: ios/chrome/browser/web/navigation_egtest.mm
diff --git a/ios/chrome/browser/web/navigation_egtest.mm b/ios/chrome/browser/web/navigation_egtest.mm
index 9f967ed4124e4328cbec7e3d3d25756726f14753..eb477d929d7f78def70fcfcafdf07a57ac1142d3 100644
--- a/ios/chrome/browser/web/navigation_egtest.mm
+++ b/ios/chrome/browser/web/navigation_egtest.mm
@@ -102,20 +102,6 @@ void SetupBackAndForwardResponseProvider() {
web::test::SetUpSimpleHttpServer(responses);
}
-// Matcher for the error page.
-// TODO(crbug.com/638674): Evaluate if this can move to shared code. See
-// ios/chrome/browser/ui/error_page_egtest.mm.
-id<GREYMatcher> ErrorPage() {
- NSString* const kDNSError =
- l10n_util::GetNSString(IDS_ERRORPAGES_HEADING_NOT_AVAILABLE);
- NSString* const kInternetDisconnectedError =
- l10n_util::GetNSString(IDS_ERRORPAGES_HEADING_INTERNET_DISCONNECTED);
- return grey_anyOf(chrome_test_util::StaticHtmlViewContainingText(kDNSError),
- chrome_test_util::StaticHtmlViewContainingText(
- kInternetDisconnectedError),
- nil);
-}
-
// URLs for server redirect tests.
const char kRedirectIndexURL[] = "http://redirect";
const char kRedirect301URL[] = "http://redirect/redirect?code=301";
@@ -437,8 +423,7 @@ class RedirectResponseProvider : public web::DataResponseProvider {
// page not available error.
const GURL badURL("http://www.badurljkljkljklfloofy.com");
[ChromeEarlGrey loadURL:badURL];
- [[EarlGrey selectElementWithMatcher:ErrorPage()]
- assertWithMatcher:grey_notNil()];
+ [ChromeEarlGrey waitForErrorPage];
// Go back to page 1 by clicking back button.
[[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()];
@@ -449,8 +434,7 @@ class RedirectResponseProvider : public web::DataResponseProvider {
// Go forward to page 2 by calling window.history.forward() and assert that
// the error page is shown.
TapWebViewElementWithId(kForwardHTMLButtonLabel);
- [[EarlGrey selectElementWithMatcher:ErrorPage()]
- assertWithMatcher:grey_notNil()];
+ [ChromeEarlGrey waitForErrorPage];
}
#pragma mark window.location.hash operations

Powered by Google App Engine
This is Rietveld 408576698