Skip to content

GitLab

T
tangled
Commit 0f29a100 authored by Eugene But's avatar Eugene But Committed by Commit Bot
Browse files
Options

Improve testTapPrerenderSuggestions to catch crbug.com/995641 

This test verifies that prerender request reaches the server
before the use taps on omnibox suggestion and that there are no
further requests.

Bug: 995641, 834116
Change-Id: I06cdc323ccd2eafc500fad6e6849a2a5223e7238
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1815712
Commit-Queue: Eugene But <eugenebut@chromium.org>
Reviewed-by: default avatarKurt Horimoto <kkhorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699976}
parent c1737f76
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 1 deletion
ios/chrome/browser/prerender/prerender_egtest.mm
View file @ 0f29a100
......@@ -8,6 +8,7 @@
#include "base/bind.h"
#include "base/memory/ptr_util.h"
#include "base/strings/sys_string_conversions.h"
#import "base/test/ios/wait_util.h"
#import "ios/chrome/browser/ui/content_suggestions/ntp_home_constant.h"
#import "ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.h"
#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_truncating_label.h"
......@@ -22,6 +23,9 @@
#error "This file requires ARC support."
#endif
using base::test::ios::WaitUntilConditionOrTimeout;
using base::test::ios::kWaitForPageLoadTimeout;
namespace {
const char kPageURL[] = "/test-page.html";
const char kPageTitle[] = "Page title!";
......@@ -29,6 +33,7 @@ const char kPageLoadedString[] = "Page loaded!";
// Provides responses for redirect and changed window location URLs.
std::unique_ptr<net::test_server::HttpResponse> StandardResponse(
int* counter,
const net::test_server::HttpRequest& request) {
if (request.relative_url != kPageURL) {
return nullptr;
......@@ -39,6 +44,7 @@ std::unique_ptr<net::test_server::HttpResponse> StandardResponse(
http_response->set_content("<html><head><title>" + std::string(kPageTitle) +
"</title></head><body>" +
std::string(kPageLoadedString) + "</body></html>");
(*counter)++;
return std::move(http_response);
}
} // namespace
......@@ -59,16 +65,23 @@ std::unique_ptr<net::test_server::HttpResponse> StandardResponse(
@"Disabled for iPad due to alternate letters educational screen.");
}
if ([ChromeEarlGrey isSlimNavigationManagerEnabled]) {
// TODO(crbug.com/834116): Fix and enable this test.
EARL_GREY_TEST_DISABLED(@"Prerender is not supported by slim-nav yet.");
}
[ChromeEarlGrey clearBrowsingHistory];
// Set server up.
int visitCounter = 0;
self.testServer->RegisterRequestHandler(
base::BindRepeating(&StandardResponse));
base::BindRepeating(&StandardResponse, &visitCounter));
GREYAssertTrue(self.testServer->Start(), @"Test server failed to start.");
const GURL pageURL = self.testServer->GetURL(kPageURL);
NSString* pageString = base::SysUTF8ToNSString(pageURL.GetContent());
// Go to the page a couple of time so it shows as suggestion.
[ChromeEarlGrey loadURL:pageURL];
GREYAssertEqual(1, visitCounter, @"The page should have been loaded once");
[ChromeEarlGrey goBack];
[[self class] closeAllTabs];
[ChromeEarlGrey openNewTab];
......@@ -80,6 +93,7 @@ std::unique_ptr<net::test_server::HttpResponse> StandardResponse(
[[EarlGrey selectElementWithMatcher:chrome_test_util::Omnibox()]
performAction:grey_typeText([pageString stringByAppendingString:@"\n"])];
[ChromeEarlGrey waitForPageToFinishLoading];
GREYAssertEqual(2, visitCounter, @"The page should have been loaded twice");
[[self class] closeAllTabs];
[ChromeEarlGrey openNewTab];
......@@ -92,6 +106,12 @@ std::unique_ptr<net::test_server::HttpResponse> StandardResponse(
performAction:grey_typeText(
[pageString substringToIndex:[pageString length] - 6])];
// Wait until prerender request reaches the server.
bool prerendered = WaitUntilConditionOrTimeout(kWaitForPageLoadTimeout, ^{
return visitCounter == 3;
});
GREYAssertTrue(prerendered, @"Prerender did not happen");
// Make sure the omnibox is autocompleted.
[[EarlGrey
selectElementWithMatcher:grey_allOf(grey_accessibilityLabel(pageString),
......@@ -111,6 +131,9 @@ std::unique_ptr<net::test_server::HttpResponse> StandardResponse(
@"omnibox suggestion 0")),
grey_sufficientlyVisible(), nil)]
performAction:grey_tap()];
[ChromeEarlGrey waitForWebStateContainingText:kPageLoadedString];
GREYAssertEqual(3, visitCounter, @"Prerender should have been the last load");
}
@end
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