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

Side by Side Diff: ios/web/shell/test/earl_grey/shell_earl_grey.mm

Issue 2798773002: Create ChromeEarlGrey waitForWebViewContainingText. (Closed)
Patch Set: better formatting Created 3 years, 8 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 unified diff | Download patch
OLDNEW
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 "ios/web/shell/test/earl_grey/shell_earl_grey.h" 5 #import "ios/web/shell/test/earl_grey/shell_earl_grey.h"
6 6
7 #import <EarlGrey/EarlGrey.h> 7 #import <EarlGrey/EarlGrey.h>
8 8
9 #include "base/strings/sys_string_conversions.h"
9 #import "ios/testing/wait_util.h" 10 #import "ios/testing/wait_util.h"
10 #import "ios/web/public/test/earl_grey/js_test_util.h" 11 #import "ios/web/public/test/earl_grey/js_test_util.h"
12 #import "ios/web/public/test/web_view_content_test_util.h"
11 #include "ios/web/shell/test/app/navigation_test_util.h" 13 #include "ios/web/shell/test/app/navigation_test_util.h"
12 #import "ios/web/shell/test/app/web_shell_test_util.h" 14 #import "ios/web/shell/test/app/web_shell_test_util.h"
13 15
14 #if !defined(__has_feature) || !__has_feature(objc_arc) 16 #if !defined(__has_feature) || !__has_feature(objc_arc)
15 #error "This file requires ARC support." 17 #error "This file requires ARC support."
16 #endif 18 #endif
17 19
18 @implementation ShellEarlGrey 20 @implementation ShellEarlGrey
19 21
20 + (void)loadURL:(const GURL&)URL { 22 + (void)loadURL:(const GURL&)URL {
(...skipping 12 matching lines...) Expand all
33 35
34 web::WebState* webState = web::shell_test_util::GetCurrentWebState(); 36 web::WebState* webState = web::shell_test_util::GetCurrentWebState();
35 if (webState->ContentIsHTML()) 37 if (webState->ContentIsHTML())
36 web::WaitUntilWindowIdInjected(webState); 38 web::WaitUntilWindowIdInjected(webState);
37 39
38 // Ensure any UI elements handled by EarlGrey become idle for any subsequent 40 // Ensure any UI elements handled by EarlGrey become idle for any subsequent
39 // EarlGrey steps. 41 // EarlGrey steps.
40 [[GREYUIThreadExecutor sharedInstance] drainUntilIdle]; 42 [[GREYUIThreadExecutor sharedInstance] drainUntilIdle];
41 } 43 }
42 44
45 + (void)waitForWebViewContainingText:(NSString*)text {
46 GREYCondition* condition = [GREYCondition
47 conditionWithName:@"Wait for web view containing text"
48 block:^BOOL {
49 return web::test::WebViewContainingText(
50 web::shell_test_util::GetCurrentWebState(),
51 base::SysNSStringToUTF8(text));
52 }];
53 GREYAssert([condition waitWithTimeout:testing::kWaitForUIElementTimeout],
54 @"Failed waiting for web view containing %@", text);
55 }
56
43 @end 57 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698