third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/resources/fetch-csp-iframe.html - Issue 2415873002: Import w3c tests for the service workers

Unified Diff: third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/resources/fetch-csp-iframe.html

Issue 2415873002: Import w3c tests for the service workers (Closed)

Patch Set: Rebase Created 4 years, 2 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

« third_party/WebKit/LayoutTests/TestExpectations ('K') | « third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/resources/fetch-cors-xhr-iframe.html ('k') | third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/resources/fetch-csp-iframe.html.sub.headers » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/resources/fetch-csp-iframe.html

diff --git a/third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/fetch-mixed-content-iframe-inscope-to-outscope.html b/third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/resources/fetch-csp-iframe.html

similarity index 66%

copy from third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/fetch-mixed-content-iframe-inscope-to-outscope.html

copy to third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/resources/fetch-csp-iframe.html

index dc7c47b3baed5d46d0b3df3c47adedfb4a948c9c..cf7175bc83df1c092e175d19b0ebd33c58a2109e 100644

--- a/third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/fetch-mixed-content-iframe-inscope-to-outscope.html

+++ b/third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/resources/fetch-csp-iframe.html

@@ -1,9 +1,10 @@

-<script src="../../resources/get-host-info.js?pipe=sub"></script>

-<script src="test-helpers.js"></script>

+<script src="../resources/get-host-info.sub.js"></script>

+<script src="test-helpers.sub.js?pipe=sub"></script>

-var image_path = base_path() + 'fetch-access-control.php?PNGIMAGE';

+var image_path = base_path() + 'fetch-access-control.py?PNGIMAGE';

var host_info = get_host_info();

var results = '';

+var port = undefined;

function test1() {

var img = document.createElement('img');

@@ -22,10 +23,10 @@ function test2() {

var img = document.createElement('img');

document.body.appendChild(img);

img.onload = function() {

+ results += 'FAIL(2)';

test3();

};

img.onerror = function() {

- results += 'FAIL(2)';

test3();

};

img.src = host_info['HTTPS_REMOTE_ORIGIN'] + image_path;

@@ -35,33 +36,37 @@ function test3() {

var img = document.createElement('img');

document.body.appendChild(img);

img.onload = function() {

- results += 'FAIL(3)';

test4();

};

img.onerror = function() {

+ results += 'FAIL(3)';

test4();

};

- img.src = host_info['UNAUTHENTICATED_ORIGIN'] + image_path;

+ img.src = './dummy?url=' +

+ encodeURIComponent(host_info['HTTPS_ORIGIN'] + image_path);

}

function test4() {

var img = document.createElement('img');

document.body.appendChild(img);

img.onload = function() {

+ results += 'FAIL(4)';

finish();

};

img.onerror = function() {

- results += 'FAIL(4)';

finish();

};

- img.src = './dummy?generate-png';

+ img.src = './dummy?mode=no-cors&url=' +

+ encodeURIComponent(host_info['HTTPS_REMOTE_ORIGIN'] + image_path);

}

function finish() {

results += 'finish';

- window.parent.postMessage({results: results}, host_info['HTTPS_ORIGIN']);

+ port.postMessage({results: results});

}

-</script>

-<body onload='test1();'>

-</body>

+window.addEventListener('message', function(evt) {

+ port = evt.ports[0];

+ test1();

+ }, false);

+</script>