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

Unified Diff: ios/chrome/test/earl_grey/chrome_earl_grey.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
« no previous file with comments | « ios/chrome/test/earl_grey/chrome_earl_grey.h ('k') | ios/chrome/test/earl_grey/chrome_matchers.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/test/earl_grey/chrome_earl_grey.mm
diff --git a/ios/chrome/test/earl_grey/chrome_earl_grey.mm b/ios/chrome/test/earl_grey/chrome_earl_grey.mm
index efbd2d3fef7d377ce8674f3420ac9e1d15c28355..8506bb71116a7130ff0b63318d6cb319233e3a7b 100644
--- a/ios/chrome/test/earl_grey/chrome_earl_grey.mm
+++ b/ios/chrome/test/earl_grey/chrome_earl_grey.mm
@@ -9,14 +9,19 @@
#include "base/mac/foundation_util.h"
#include "base/strings/sys_string_conversions.h"
+#import "base/test/ios/wait_util.h"
+#include "components/strings/grit/components_strings.h"
+#import "ios/chrome/browser/ui/static_content/static_html_view_controller.h"
#import "ios/chrome/test/app/chrome_test_util.h"
#import "ios/chrome/test/app/history_test_util.h"
#include "ios/chrome/test/app/navigation_test_util.h"
+#import "ios/chrome/test/app/static_html_view_test_util.h"
#import "ios/testing/wait_util.h"
#import "ios/web/public/test/earl_grey/js_test_util.h"
#import "ios/web/public/test/web_view_interaction_test_util.h"
#import "ios/web/public/web_state/js/crw_js_injection_receiver.h"
#import "ios/web/public/web_state/web_state.h"
+#include "ui/base/l10n/l10n_util.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
@@ -125,4 +130,34 @@ id ExecuteJavaScript(NSString* javascript,
elementID);
}
++ (void)waitForErrorPage {
+ NSString* const kInternetDisconnectedError =
lpromero 2017/04/19 11:35:10 The error is not about internet disconnection, but
baxley 2017/04/19 14:39:49 Thanks for pointing out the inconsistency. Do you
lpromero 2017/04/19 14:44:52 The variable name might be sufficient, but since t
+ l10n_util::GetNSString(IDS_ERRORPAGES_HEADING_NOT_AVAILABLE);
+ [self waitForStaticHTMLViewContainingText:kInternetDisconnectedError];
+}
+
++ (void)waitForStaticHTMLViewContainingText:(NSString*)text {
+ GREYCondition* condition = [GREYCondition
+ conditionWithName:@"Wait for static HTML text."
+ block:^BOOL {
+ return chrome_test_util::StaticHtmlViewContainingText(
+ chrome_test_util::GetCurrentWebState(),
+ base::SysNSStringToUTF8(text));
+ }];
+ GREYAssert([condition waitWithTimeout:testing::kWaitForUIElementTimeout],
+ @"Failed to find static html view containing %@", text);
+}
+
++ (void)waitForStaticHTMLViewNotContainingText:(NSString*)text {
+ GREYCondition* condition = [GREYCondition
+ conditionWithName:@"Wait for absence of static HTML text."
+ block:^BOOL {
+ return !chrome_test_util::StaticHtmlViewContainingText(
+ chrome_test_util::GetCurrentWebState(),
+ base::SysNSStringToUTF8(text));
+ }];
+ GREYAssert([condition waitWithTimeout:testing::kWaitForUIElementTimeout],
+ @"Failed, there was a static html view containing %@", text);
+}
+
@end
« no previous file with comments | « ios/chrome/test/earl_grey/chrome_earl_grey.h ('k') | ios/chrome/test/earl_grey/chrome_matchers.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698