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

Unified Diff: ios/chrome/browser/ui/error_page_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/ui/error_page_egtest.mm
diff --git a/ios/chrome/browser/ui/error_page_egtest.mm b/ios/chrome/browser/ui/error_page_egtest.mm
index b7935cd389642180e88d4b899b11188ab8644630..0651839806daa22ef27d638e86bed19f9a50db9c 100644
--- a/ios/chrome/browser/ui/error_page_egtest.mm
+++ b/ios/chrome/browser/ui/error_page_egtest.mm
@@ -23,7 +23,6 @@
#endif
using chrome_test_util::OmniboxText;
-using chrome_test_util::StaticHtmlViewContainingText;
using chrome_test_util::TapWebViewElementWithId;
using chrome_test_util::WebViewContainingText;
@@ -32,9 +31,6 @@ using web::test::HttpServer;
// Tests display of error pages for bad URLs.
@interface ErrorPageTestCase : ChromeTestCase
-// Checks that the DNS error page is visible.
-- (void)checkErrorPageIsVisible;
-
// Checks that the DNS error page is not visible.
- (void)checkErrorPageIsNotVisible;
@@ -44,16 +40,6 @@ using web::test::HttpServer;
#pragma mark - utilities
-// TODO(crbug.com/638674): Evaluate if this can move to shared code.
-- (void)checkErrorPageIsVisible {
- // The DNS error page is static HTML content, so it isn't part of the webview
- // owned by the webstate.
- NSString* const kError =
- l10n_util::GetNSString(IDS_ERRORPAGES_HEADING_NOT_AVAILABLE);
- [[EarlGrey selectElementWithMatcher:StaticHtmlViewContainingText(kError)]
- assertWithMatcher:grey_notNil()];
-}
-
- (void)checkErrorPageIsNotVisible {
// Check that the webview belongs to the web controller, and that the error
// text doesn't appear in the webview.
@@ -77,7 +63,7 @@ using web::test::HttpServer;
[ChromeEarlGrey loadURL:ErrorPageResponseProvider::GetDnsFailureUrl()];
- [self checkErrorPageIsVisible];
+ [ChromeEarlGrey waitForErrorPage];
}
// Tests whether the error page is displayed if it is behind a redirect.
@@ -96,7 +82,7 @@ using web::test::HttpServer;
[[EarlGrey selectElementWithMatcher:OmniboxText(redirectedURL)]
assertWithMatcher:grey_notNil()];
- [self checkErrorPageIsVisible];
+ [ChromeEarlGrey waitForErrorPage];
}
// Tests that the error page is not displayed if the bad URL is in a <iframe>

Powered by Google App Engine
This is Rietveld 408576698