| Index: LayoutTests/http/tests/serviceworker/resources/fetch-access-control-util.js
|
| diff --git a/LayoutTests/http/tests/serviceworker/resources/fetch-access-control-util.js b/LayoutTests/http/tests/serviceworker/resources/fetch-access-control-util.js
|
| index 3e5df60ac096696d9640038a884c4712b78dbd84..4b0d39bf956110509e192d8d8189a4d399e80c8a 100644
|
| --- a/LayoutTests/http/tests/serviceworker/resources/fetch-access-control-util.js
|
| +++ b/LayoutTests/http/tests/serviceworker/resources/fetch-access-control-util.js
|
| @@ -7,10 +7,10 @@ var WORKER_URL = 'http://127.0.0.1:8000/serviceworker/resources/fetch-access-con
|
| var IFRAME_ORIGIN = 'http://127.0.0.1:8000';
|
|
|
| // Functions to check the result from the ServiceWorker.
|
| -var checkFetchResult = function (expected, url, data) {
|
| +var checkFetchResult = function(expected, url, data) {
|
| assert_equals(data.fetchResult, expected, url + ' should be ' + expected);
|
| };
|
| -var checkFetchResponseBody = function (hasBody, url, data) {
|
| +var checkFetchResponseBody = function(hasBody, url, data) {
|
| assert_equals(data.fetchResult,
|
| 'resolved',
|
| 'fetchResult must be resolved. url: ' + url);
|
| @@ -22,7 +22,7 @@ var checkFetchResponseBody = function (hasBody, url, data) {
|
| 'response must not have body. url: ' + url);
|
| }
|
| };
|
| -var checkFetchResponseHeader = function (name, expected, url, data) {
|
| +var checkFetchResponseHeader = function(name, expected, url, data) {
|
| assert_equals(data.fetchResult,
|
| 'resolved',
|
| 'fetchResult must be resolved. url: ' + url);
|
| @@ -36,7 +36,7 @@ var checkFetchResponseHeader = function (name, expected, url, data) {
|
| expected,
|
| 'header check failed url: ' + url + ' name: ' + name);
|
| };
|
| -var checkFetchResponseType = function (type, url, data) {
|
| +var checkFetchResponseType = function(type, url, data) {
|
| assert_equals(data.fetchResult,
|
| 'resolved',
|
| 'fetchResult must be resolved. url = ' + url);
|
| @@ -51,25 +51,25 @@ var fetchError = checkFetchResult.bind(this, 'error');
|
| var hasBody = checkFetchResponseBody.bind(this, true);
|
| var noBody = checkFetchResponseBody.bind(this, false);
|
| var hasContentLength =
|
| - checkFetchResponseHeader.bind(this, 'content-length', true);
|
| + checkFetchResponseHeader.bind(this, 'content-length', true);
|
| var noContentLength =
|
| - checkFetchResponseHeader.bind(this, 'content-length', false);
|
| + checkFetchResponseHeader.bind(this, 'content-length', false);
|
| var hasServerHeader =
|
| - checkFetchResponseHeader.bind(this, 'x-serviceworker-serverheader', true);
|
| + checkFetchResponseHeader.bind(this, 'x-serviceworker-serverheader', true);
|
| var noServerHeader =
|
| - checkFetchResponseHeader.bind(this, 'x-serviceworker-serverheader', false);
|
| + checkFetchResponseHeader.bind(this, 'x-serviceworker-serverheader', false);
|
| var typeBasic = checkFetchResponseType.bind(this, 'basic');
|
| var typeCors = checkFetchResponseType.bind(this, 'cors');
|
| var typeOpaque = checkFetchResponseType.bind(this, 'opaque');
|
|
|
| // Functions to check the result of JSONP which is evaluated in
|
| // fetch-access-control-iframe.html by appending <script> element.
|
| -var checkJsonpResult = function (expected, url, data) {
|
| +var checkJsonpResult = function(expected, url, data) {
|
| assert_equals(data.jsonpResult,
|
| expected,
|
| url + ' jsonpResult should match');
|
| };
|
| -var checkJsonpHeader = function (name, value, url, data) {
|
| +var checkJsonpHeader = function(name, value, url, data) {
|
| assert_equals(data.jsonpResult,
|
| 'success',
|
| url + ' jsonpResult must be success');
|
| @@ -77,7 +77,7 @@ var checkJsonpHeader = function (name, value, url, data) {
|
| value,
|
| 'Request header check failed url:' + url + ' name:' + name);
|
| };
|
| -var checkJsonpMethod = function (method, url, data) {
|
| +var checkJsonpMethod = function(method, url, data) {
|
| assert_equals(data.jsonpResult,
|
| 'success',
|
| url + ' jsonpResult must be success');
|
| @@ -85,7 +85,7 @@ var checkJsonpMethod = function (method, url, data) {
|
| method,
|
| 'Method must match url:' + url);
|
| };
|
| -var checkJsonpAuth = function (username, password, url, data) {
|
| +var checkJsonpAuth = function(username, password, url, data) {
|
| assert_equals(data.jsonpResult,
|
| 'success',
|
| url + ' jsonpResult must be success');
|
| @@ -102,9 +102,9 @@ var checkJsonpAuth = function (username, password, url, data) {
|
| var checkJsonpError = checkJsonpResult.bind(this, 'error');
|
| var checkJsonpSuccess = checkJsonpResult.bind(this, 'success');
|
| var hasCustomHeader =
|
| - checkJsonpHeader.bind(this, 'x-serviceworker-test', 'test');
|
| + checkJsonpHeader.bind(this, 'x-serviceworker-test', 'test');
|
| var noCustomHeader =
|
| - checkJsonpHeader.bind(this, 'x-serviceworker-test', undefined);
|
| + checkJsonpHeader.bind(this, 'x-serviceworker-test', undefined);
|
| var methodIsGET = checkJsonpMethod.bind(this, 'GET');
|
| var methodIsPOST = checkJsonpMethod.bind(this, 'POST');
|
| var methodIsPUT = checkJsonpMethod.bind(this, 'PUT');
|
| @@ -115,101 +115,101 @@ var authCheck2 = checkJsonpAuth.bind(this, 'username2', 'password2');
|
|
|
| function executeTests(test, test_targets) {
|
| test.step(function() {
|
| - var login1 =
|
| + var login1 =
|
| test_login(test, 'http://127.0.0.1:8000', 'username1', 'password1');
|
| - var login2 =
|
| + var login2 =
|
| test_login(test, 'http://localhost:8000', 'username2', 'password2');
|
| - var workerScript = 'resources/fetch-access-control-worker.js';
|
| - var worker = undefined;
|
| - var frameWindow = {};
|
| - var counter = 0;
|
| - window.addEventListener('message', test.step_func(onMessage), false);
|
| + var workerScript = 'resources/fetch-access-control-worker.js';
|
| + var worker = undefined;
|
| + var frameWindow = {};
|
| + var counter = 0;
|
| + window.addEventListener('message', test.step_func(onMessage), false);
|
|
|
| - Promise.all([login1, login2])
|
| - .then(function() {
|
| - return service_worker_unregister_and_register(test,
|
| - workerScript,
|
| - SCOPE);
|
| - })
|
| - .then(function(registration) {
|
| - return wait_for_update(test, registration);
|
| - })
|
| - .then(function(sw) {
|
| - worker = sw;
|
| - var messageChannel = new MessageChannel();
|
| - messageChannel.port1.onmessage = test.step_func(onWorkerMessage);
|
| - sw.postMessage(
|
| + Promise.all([login1, login2])
|
| + .then(function() {
|
| + return service_worker_unregister_and_register(test,
|
| + workerScript,
|
| + SCOPE);
|
| + })
|
| + .then(function(registration) {
|
| + return wait_for_update(test, registration);
|
| + })
|
| + .then(function(sw) {
|
| + worker = sw;
|
| + var messageChannel = new MessageChannel();
|
| + messageChannel.port1.onmessage = test.step_func(onWorkerMessage);
|
| + sw.postMessage(
|
| {port: messageChannel.port2}, [messageChannel.port2]);
|
| - return wait_for_state(test, sw, 'activated');
|
| - })
|
| - .then(function() {
|
| - return with_iframe(SCOPE);
|
| - })
|
| - .then(function(frame) {
|
| - frameWindow = frame.contentWindow;
|
| - // Start tests.
|
| - loadNext();
|
| - })
|
| - .catch(unreached_rejection(test));
|
| + return wait_for_state(test, sw, 'activated');
|
| + })
|
| + .then(function() {
|
| + return with_iframe(SCOPE);
|
| + })
|
| + .then(function(frame) {
|
| + frameWindow = frame.contentWindow;
|
| + // Start tests.
|
| + loadNext();
|
| + })
|
| + .catch(unreached_rejection(test));
|
|
|
| - var readyFromWorkerReceived = undefined;
|
| - var resultFromWorkerReceived = undefined;
|
| - var resultFromIframeReceived = undefined;
|
| + var readyFromWorkerReceived = undefined;
|
| + var resultFromWorkerReceived = undefined;
|
| + var resultFromIframeReceived = undefined;
|
|
|
| - function onMessage(e) {
|
| - // The message is sent from fetch-access-control-iframe.html in report()
|
| - // which is called by appending <script> element which source code is
|
| - // generated by fetch-access-control.php.
|
| - if (TEST_TARGETS[counter][2]) {
|
| - TEST_TARGETS[counter][2].forEach(function(checkFunc) {
|
| - checkFunc.call(this,
|
| - TEST_TARGETS[counter][0],
|
| - e.data);
|
| - });
|
| + function onMessage(e) {
|
| + // The message is sent from fetch-access-control-iframe.html in report()
|
| + // which is called by appending <script> element which source code is
|
| + // generated by fetch-access-control.php.
|
| + if (TEST_TARGETS[counter][2]) {
|
| + TEST_TARGETS[counter][2].forEach(function(checkFunc) {
|
| + checkFunc.call(this,
|
| + TEST_TARGETS[counter][0],
|
| + e.data);
|
| + });
|
| + }
|
| + resultFromIframeReceived();
|
| }
|
| - resultFromIframeReceived();
|
| - }
|
|
|
| - function onWorkerMessage(e) {
|
| - // The message is sent from the ServiceWorker.
|
| - var message = e.data;
|
| - if (message.msg === 'READY') {
|
| - readyFromWorkerReceived();
|
| - return;
|
| + function onWorkerMessage(e) {
|
| + // The message is sent from the ServiceWorker.
|
| + var message = e.data;
|
| + if (message.msg === 'READY') {
|
| + readyFromWorkerReceived();
|
| + return;
|
| + }
|
| + TEST_TARGETS[counter][1].forEach(function(checkFunc) {
|
| + checkFunc.call(this,
|
| + TEST_TARGETS[counter][0],
|
| + message);
|
| + });
|
| + resultFromWorkerReceived();
|
| }
|
| - TEST_TARGETS[counter][1].forEach(function(checkFunc) {
|
| - checkFunc.call(this,
|
| - TEST_TARGETS[counter][0],
|
| - message);
|
| - });
|
| - resultFromWorkerReceived();
|
| - }
|
|
|
| - function loadNext() {
|
| - var workerPromise = new Promise(function(resolve, reject) {
|
| - resultFromWorkerReceived = resolve;
|
| - });
|
| - var iframePromise = new Promise(function(resolve, reject) {
|
| - resultFromIframeReceived = resolve;
|
| - });
|
| - Promise.all([workerPromise, iframePromise])
|
| - .then(test.step_func(function() {
|
| - ++counter;
|
| - if (counter === TEST_TARGETS.length) {
|
| - service_worker_unregister_and_done(test, SCOPE);
|
| - } else {
|
| - loadNext();
|
| - }
|
| - }));
|
| - (new Promise(function(resolve, reject) {
|
| - readyFromWorkerReceived = resolve;
|
| - worker.postMessage({msg: 'START TEST CASE'});
|
| - }))
|
| - .then(test.step_func(function() {
|
| - frameWindow.postMessage(
|
| + function loadNext() {
|
| + var workerPromise = new Promise(function(resolve, reject) {
|
| + resultFromWorkerReceived = resolve;
|
| + });
|
| + var iframePromise = new Promise(function(resolve, reject) {
|
| + resultFromIframeReceived = resolve;
|
| + });
|
| + Promise.all([workerPromise, iframePromise])
|
| + .then(test.step_func(function() {
|
| + ++counter;
|
| + if (counter === TEST_TARGETS.length) {
|
| + service_worker_unregister_and_done(test, SCOPE);
|
| + } else {
|
| + loadNext();
|
| + }
|
| + }));
|
| + (new Promise(function(resolve, reject) {
|
| + readyFromWorkerReceived = resolve;
|
| + worker.postMessage({msg: 'START TEST CASE'});
|
| + }))
|
| + .then(test.step_func(function() {
|
| + frameWindow.postMessage(
|
| {url: TEST_TARGETS[counter][0]},
|
| IFRAME_ORIGIN);
|
| - }));
|
| - }
|
| - });
|
| + }));
|
| + }
|
| + });
|
| }
|
|
|