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

Unified Diff: content/browser/service_worker/service_worker_browsertest.cc

Issue 205563006: Add a status code to install event handled message from Service Worker (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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: content/browser/service_worker/service_worker_browsertest.cc
diff --git a/content/browser/service_worker/service_worker_browsertest.cc b/content/browser/service_worker/service_worker_browsertest.cc
index b833a0ffc3bfabc7d0bc86fccc2d36f5a9e2ddaa..0d5ed1de86829a409eea1b78c81845eb80a2a1d3 100644
--- a/content/browser/service_worker/service_worker_browsertest.cc
+++ b/content/browser/service_worker/service_worker_browsertest.cc
@@ -217,7 +217,8 @@ class ServiceWorkerVersionBrowserTest : public ServiceWorkerBrowserTest {
}
}
- void InstallTestHelper(const std::string& worker_url) {
+ void InstallTestHelper(const std::string& worker_url,
+ ServiceWorkerStatusCode expected) {
dominicc (has gone to gerrit) 2014/03/26 01:28:01 Would it be better to name this expected_status? I
falken 2014/03/26 07:53:56 Done.
RunOnIOThread(base::Bind(&self::SetUpRegistrationOnIOThread, this,
worker_url));
@@ -229,7 +230,7 @@ class ServiceWorkerVersionBrowserTest : public ServiceWorkerBrowserTest {
install_run_loop.QuitClosure(),
&status));
install_run_loop.Run();
- ASSERT_EQ(SERVICE_WORKER_OK, status);
+ ASSERT_EQ(expected, status);
// Stop the worker.
status = SERVICE_WORKER_ERROR_FAILED;
@@ -373,19 +374,21 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, StartNotFound) {
}
IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, Install) {
- InstallTestHelper("/service_worker/worker.js");
+ InstallTestHelper("/service_worker/worker.js", SERVICE_WORKER_OK);
}
IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
InstallWithWaitUntil_Fulfilled) {
- InstallTestHelper("/service_worker/worker_install_fulfilled.js");
+ InstallTestHelper("/service_worker/worker_install_fulfilled.js",
+ SERVICE_WORKER_OK);
}
+// Temporarily disabled until a Blink change lands that hooks up the install
+// failure code.
IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
- InstallWithWaitUntil_Rejected) {
- // TODO(kinuko): This should also report back an error, but we
- // don't have plumbing for it yet.
- InstallTestHelper("/service_worker/worker_install_rejected.js");
+ DISABLED_InstallWithWaitUntil_Rejected) {
+ InstallTestHelper("/service_worker/worker_install_rejected.js",
+ SERVICE_WORKER_ERROR_INSTALL_WORKER_FAILED);
}
IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, FetchEvent_Response) {

Powered by Google App Engine
This is Rietveld 408576698