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

Unified Diff: LayoutTests/http/tests/serviceworker/resources/test-helpers.js

Issue 435453002: [ServiceWorker] Update formatting for tests. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 1 month 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: LayoutTests/http/tests/serviceworker/resources/test-helpers.js
diff --git a/LayoutTests/http/tests/serviceworker/resources/test-helpers.js b/LayoutTests/http/tests/serviceworker/resources/test-helpers.js
index 4889f547ffc361c79ed928d8663a3dbcc4f9d3fb..1f79f4d59c2d16559d6a2a6c6df6f7ac223c5f0c 100644
--- a/LayoutTests/http/tests/serviceworker/resources/test-helpers.js
+++ b/LayoutTests/http/tests/serviceworker/resources/test-helpers.js
@@ -6,48 +6,48 @@ function service_worker_unregister_and_register(test, url, scope) {
var options = { scope: scope };
return service_worker_unregister(test, scope)
- .then(function() {
- return navigator.serviceWorker.register(url, options);
- })
- .catch(unreached_rejection(test,
- 'unregister and register should not fail'));
+ .then(function() {
+ return navigator.serviceWorker.register(url, options);
+ })
+ .catch(unreached_rejection(test,
+ 'unregister and register should not fail'));
}
function service_worker_unregister(test, documentUrl) {
return navigator.serviceWorker.getRegistration(documentUrl)
- .then(function(registration) {
- if (registration)
- return registration.unregister();
- })
- .catch(unreached_rejection(test, 'unregister should not fail'));
+ .then(function(registration) {
+ if (registration)
+ return registration.unregister();
+ })
+ .catch(unreached_rejection(test, 'unregister should not fail'));
}
function service_worker_unregister_and_done(test, scope) {
return service_worker_unregister(test, scope)
- .then(test.done.bind(test));
+ .then(test.done.bind(test));
}
// Rejection-specific helper that provides more details
function unreached_rejection(test, prefix) {
- return test.step_func(function(error) {
- var reason = error.message || error.name || error;
- var error_prefix = prefix || 'unexpected rejection';
- assert_unreached(error_prefix + ': ' + reason);
+ return test.step_func(function(error) {
+ var reason = error.message || error.name || error;
+ var error_prefix = prefix || 'unexpected rejection';
+ assert_unreached(error_prefix + ': ' + reason);
});
}
// FIXME: Clean up the iframe when the test completes.
function with_iframe(url, f) {
- return new Promise(function(resolve, reject) {
- var frame = document.createElement('iframe');
- frame.src = url;
- frame.onload = function() {
- if (f) {
- f(frame);
- }
- resolve(frame);
- };
- document.body.appendChild(frame);
+ return new Promise(function(resolve, reject) {
+ var frame = document.createElement('iframe');
+ frame.src = url;
+ frame.onload = function() {
+ if (f) {
+ f(frame);
+ }
+ resolve(frame);
+ };
+ document.body.appendChild(frame);
});
}
@@ -69,7 +69,7 @@ function normalizeURL(url) {
function get_newest_worker(registration) {
if (!registration) {
return Promise.reject(new Error(
- 'get_newest_worker must be passed a ServiceWorkerRegistration'));
+ 'get_newest_worker must be passed a ServiceWorkerRegistration'));
}
if (registration.installing)
return Promise.resolve(registration.installing);
@@ -78,64 +78,64 @@ function get_newest_worker(registration) {
if (registration.active)
return Promise.resolve(registration.active);
return Promise.reject(new Error(
- 'registration must have at least one version'));
+ 'registration must have at least one version'));
}
function wait_for_update(test, registration) {
if (!registration || registration.unregister == undefined) {
return Promise.reject(new Error(
- 'wait_for_update must be passed a ServiceWorkerRegistration'));
+ 'wait_for_update must be passed a ServiceWorkerRegistration'));
}
return new Promise(test.step_func(function(resolve) {
registration.addEventListener('updatefound', test.step_func(function() {
resolve(registration.installing);
- }));
+ }));
}));
}
function wait_for_state(test, worker, state) {
if (!worker || worker.state == undefined) {
return Promise.reject(new Error(
- 'wait_for_state must be passed a ServiceWorker'));
+ 'wait_for_state must be passed a ServiceWorker'));
}
if (worker.state === state)
return Promise.resolve(state);
if (state === 'installing') {
switch (worker.state) {
- case 'installed':
- case 'activating':
- case 'activated':
- case 'redundant':
- return Promise.reject(new Error(
+ case 'installed':
+ case 'activating':
+ case 'activated':
+ case 'redundant':
+ return Promise.reject(new Error(
'worker is ' + worker.state + ' but waiting for ' + state));
}
}
if (state === 'installed') {
switch (worker.state) {
- case 'activating':
- case 'activated':
- case 'redundant':
- return Promise.reject(new Error(
+ case 'activating':
+ case 'activated':
+ case 'redundant':
+ return Promise.reject(new Error(
'worker is ' + worker.state + ' but waiting for ' + state));
}
}
if (state === 'activating') {
switch (worker.state) {
- case 'activated':
- case 'redundant':
- return Promise.reject(new Error(
+ case 'activated':
+ case 'redundant':
+ return Promise.reject(new Error(
'worker is ' + worker.state + ' but waiting for ' + state));
}
}
if (state === 'activated') {
switch (worker.state) {
- case 'redundant':
- return Promise.reject(new Error(
+ case 'redundant':
+ return Promise.reject(new Error(
'worker is ' + worker.state + ' but waiting for ' + state));
}
}
@@ -157,7 +157,7 @@ function wait_for_activated(test, registration) {
if (registration.installing)
return wait_for_state(test, registration.installing, expected_state);
return Promise.reject(
- new Error('registration must have at least one version'));
+ new Error('registration must have at least one version'));
}
(function() {
@@ -219,32 +219,32 @@ function wait_for_activated(test, registration) {
})();
function get_host_info() {
- var ORIGINAL_HOST = '127.0.0.1';
- var REMOTE_HOST = 'localhost';
- var UNAUTHENTICATED_HOST = 'example.test';
- var HTTP_PORT = 8000;
- var HTTPS_PORT = 8443;
- try {
- // In W3C test, we can get the hostname and port number in config.json
- // using wptserve's built-in pipe.
- // http://wptserve.readthedocs.org/en/latest/pipes.html#built-in-pipes
- HTTP_PORT = eval('{{ports[http][0]}}');
- HTTPS_PORT = eval('{{ports[https][0]}}');
- ORIGINAL_HOST = eval('\'{{host}}\'');
- REMOTE_HOST = 'www1.' + ORIGINAL_HOST;
- } catch(e) {
- }
- return {
- HTTP_ORIGIN: 'http://' + ORIGINAL_HOST + ':' + HTTP_PORT,
- HTTPS_ORIGIN: 'https://' + ORIGINAL_HOST + ':' + HTTPS_PORT,
- HTTP_REMOTE_ORIGIN: 'http://' + REMOTE_HOST + ':' + HTTP_PORT,
- HTTPS_REMOTE_ORIGIN: 'https://' + REMOTE_HOST + ':' + HTTPS_PORT,
- UNAUTHENTICATED_ORIGIN: 'http://' + UNAUTHENTICATED_HOST + ':' + HTTP_PORT
- };
+ var ORIGINAL_HOST = '127.0.0.1';
+ var REMOTE_HOST = 'localhost';
+ var UNAUTHENTICATED_HOST = 'example.test';
+ var HTTP_PORT = 8000;
+ var HTTPS_PORT = 8443;
+ try {
+ // In W3C test, we can get the hostname and port number in config.json
+ // using wptserve's built-in pipe.
+ // http://wptserve.readthedocs.org/en/latest/pipes.html#built-in-pipes
+ HTTP_PORT = eval('{{ports[http][0]}}');
+ HTTPS_PORT = eval('{{ports[https][0]}}');
+ ORIGINAL_HOST = eval('\'{{host}}\'');
+ REMOTE_HOST = 'www1.' + ORIGINAL_HOST;
+ } catch (e) {
+ }
+ return {
+ HTTP_ORIGIN: 'http://' + ORIGINAL_HOST + ':' + HTTP_PORT,
+ HTTPS_ORIGIN: 'https://' + ORIGINAL_HOST + ':' + HTTPS_PORT,
+ HTTP_REMOTE_ORIGIN: 'http://' + REMOTE_HOST + ':' + HTTP_PORT,
+ HTTPS_REMOTE_ORIGIN: 'https://' + REMOTE_HOST + ':' + HTTPS_PORT,
+ UNAUTHENTICATED_ORIGIN: 'http://' + UNAUTHENTICATED_HOST + ':' + HTTP_PORT
+ };
}
function base_path() {
- return location.pathname.replace(/\/[^\/]*$/, '/');
+ return location.pathname.replace(/\/[^\/]*$/, '/');
}
function test_login(test, origin, username, password) {

Powered by Google App Engine
This is Rietveld 408576698