Skip to content

Fetch: use .any.js syntax #5129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
annevk merged 5 commits into from
Mar 27, 2017
Merged

Fetch: use .any.js syntax #5129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9174ad2
Fetch: use .any.js syntax
annevk Mar 13, 2017
5875a0e
all from basic/ without ?sub
annevk Mar 14, 2017
d33e104
forgot to remove referrer resources (and adjust one special case)
annevk Mar 14, 2017
4e6e3fe
cors/ cleanup
annevk Mar 14, 2017
b21376b
credentials/ cleanup
annevk Mar 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions fetch/api/basic/accept-header-worker.html
View file
Open in desktop

This file was deleted.

7 changes: 1 addition & 6 deletions fetch/api/basic/accept-header.js → fetch/api/basic/accept-header.any.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
if (this.document === undefined) {
importScripts("/resources/testharness.js");
importScripts("../resources/utils.js");
}
// META: script=../resources/utils.js
Copy link
Member

@domenic domenic Mar 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Woah, this works? That's neat...


promise_test(function() {
return fetch(RESOURCES_DIR + "inspect-headers.py?headers=Accept").then(function(response) {
Expand Down Expand Up @@ -34,5 +31,3 @@ promise_test(function() {
assert_equals(response.headers.get("x-request-accept-language"), "bzh", "Request has accept header with value 'bzh'");
});
}, "Request through fetch should have 'accept-language' header with value 'bzh'");

done();
15 changes: 0 additions & 15 deletions fetch/api/basic/accept-header.html
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions fetch/api/basic/mode-same-origin-worker.html
View file
Open in desktop

This file was deleted.

10 changes: 2 additions & 8 deletions fetch/api/basic/mode-same-origin.js → fetch/api/basic/mode-same-origin.any.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
if (this.document === undefined) {
importScripts("/resources/testharness.js");
importScripts("../resources/utils.js");
importScripts("/common/get-host-info.sub.js")
}
// META: script=../resources/utils.js
// META: script=/common/get-host-info.sub.js

function fetchSameOrigin(url, shouldPass) {
promise_test(function(test) {
Expand All @@ -29,6 +26,3 @@ fetchSameOrigin(redirPath + RESOURCES_DIR + "top.txt", true);
fetchSameOrigin(redirPath + host_info.HTTP_ORIGIN + "/fetch/api/resources/top.txt", true);
fetchSameOrigin(redirPath + host_info.HTTPS_ORIGIN + "/fetch/api/resources/top.txt", false);
fetchSameOrigin(redirPath + host_info.HTTP_REMOTE_ORIGIN + "/fetch/api/resources/top.txt", false);

done();

17 changes: 0 additions & 17 deletions fetch/api/basic/mode-same-origin.html
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions fetch/api/basic/referrer-worker.html
View file
Open in desktop

This file was deleted.

10 changes: 2 additions & 8 deletions fetch/api/basic/referrer.js → fetch/api/basic/referrer.any.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
if (this.document === undefined) {
importScripts("/resources/testharness.js");
importScripts("../resources/utils.js");
importScripts("/common/get-host-info.sub.js")
}
// META: script=../resources/utils.js
// META: script=/common/get-host-info.sub.js

function runTest(url, init, expectedReferrer, title) {
promise_test(function(test) {
Expand Down Expand Up @@ -30,6 +27,3 @@ var referrerUrlWithCredentials = get_host_info().HTTP_ORIGIN.replace("http://",
runTest(fetchedUrl, {referrer: referrerUrlWithCredentials}, get_host_info().HTTP_ORIGIN + "/", "Referrer with credentials should be stripped");
var referrerUrlWithFragmentIdentifier = get_host_info().HTTP_ORIGIN + "#fragmentIdentifier";
runTest(fetchedUrl, {referrer: referrerUrlWithFragmentIdentifier}, get_host_info().HTTP_ORIGIN + "/", "Referrer with fragment ID should be stripped");

done();

17 changes: 0 additions & 17 deletions fetch/api/basic/referrer.html
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions fetch/api/basic/request-forbidden-headers-worker.html
View file
Open in desktop

This file was deleted.

8 changes: 1 addition & 7 deletions fetch/api/basic/request-forbidden-headers.js → ...pi/basic/request-forbidden-headers.any.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
if (this.document === undefined) {
importScripts("/resources/testharness.js");
importScripts("../resources/utils.js");
}
// META: script=../resources/utils.js

function requestForbiddenHeaders(desc, forbiddenHeaders) {
var url = RESOURCES_DIR + "inspect-headers.py";
Expand Down Expand Up @@ -43,6 +40,3 @@ requestForbiddenHeaders("Proxy- is a forbidden request header", {"Proxy-": "valu
requestForbiddenHeaders("Proxy-Test is a forbidden request header", {"Proxy-Test": "value"});
requestForbiddenHeaders("Sec- is a forbidden request header", {"Sec-": "value"});
requestForbiddenHeaders("Sec-Test is a forbidden request header", {"Sec-Test": "value"});

done();

16 changes: 0 additions & 16 deletions fetch/api/basic/request-forbidden-headers.html
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions fetch/api/basic/request-head-worker.html
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions fetch/api/basic/request-head.js → fetch/api/basic/request-head.any.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
if (this.document === undefined) {
importScripts("/resources/testharness.js");
}

promise_test(function(test) {
var requestInit = {"method": "HEAD", "body": "test"};
return promise_rejects(test, new TypeError(), fetch(".", requestInit));
}, "Fetch with HEAD with body");

done();
12 changes: 0 additions & 12 deletions fetch/api/basic/request-head.html
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions fetch/api/basic/request-headers-worker.html
View file
Open in desktop

This file was deleted.

7 changes: 1 addition & 6 deletions fetch/api/basic/request-headers.js → fetch/api/basic/request-headers.any.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
if (this.document === undefined) {
importScripts("/resources/testharness.js");
importScripts("../resources/utils.js");
}
// META: script=../resources/utils.js

function checkContentType(contentType, body)
{
Expand Down Expand Up @@ -82,5 +79,3 @@ requestOriginHeader("POST", "no-cors", true);
requestOriginHeader("PUT", "same-origin", true);
requestOriginHeader("TacO", "same-origin", true);
requestOriginHeader("TacO", "cors", true);

done();
15 changes: 0 additions & 15 deletions fetch/api/basic/request-headers.html
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion fetch/api/basic/request-referrer-redirected-worker.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</head>
<body>
<script>
let finalURL = "/fetch/api/basic/request-referrer.js";
let finalURL = "/fetch/api/basic/request-referrer.any.worker.js";
let url = "/fetch/api/resources/redirect.py?location=" +
encodeURIComponent(finalURL);
fetch_tests_from_worker(new Worker(url));
Expand Down
14 changes: 0 additions & 14 deletions fetch/api/basic/request-referrer-worker.html
View file
Open in desktop

This file was deleted.

7 changes: 1 addition & 6 deletions fetch/api/basic/request-referrer.js → fetch/api/basic/request-referrer.any.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
if (this.document === undefined) {
importScripts("/resources/testharness.js");
importScripts("../resources/utils.js");
}
// META: script=../resources/utils.js

function testReferrer(referrer, expected, desc) {
promise_test(function(test) {
Expand All @@ -24,5 +21,3 @@ testReferrer("about:client", self.location.href, 'about:client referrer');

var fooURL = new URL("./foo", self.location).href;
testReferrer(fooURL, fooURL, 'url referrer');

done();
13 changes: 0 additions & 13 deletions fetch/api/basic/request-referrer.html
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions fetch/api/basic/request-upload-worker.html
View file
Open in desktop

This file was deleted.

7 changes: 1 addition & 6 deletions fetch/api/basic/request-upload.js → fetch/api/basic/request-upload.any.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
if (this.document === undefined) {
importScripts("/resources/testharness.js");
importScripts("../resources/utils.js");
}
// META: script=../resources/utils.js

function testUpload(desc, url, method, createBody, expectedBody) {
var requestInit = {"method": method}
Expand Down Expand Up @@ -123,5 +120,3 @@ testUploadFailure("Fetch with POST with ReadableStream containing Blob", url,
controller.close();
}})
});

done();
13 changes: 0 additions & 13 deletions fetch/api/basic/request-upload.html
View file
Open in desktop

This file was deleted.

Loading