Skip to content
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

Aborting fetch #6484

Merged
merged 13 commits into from
Aug 2, 2017
Merged

Aborting fetch #6484

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f6426f7
Some initial tests
jakearchibald Jul 6, 2017
dafbd68
More tests
jakearchibald Jul 7, 2017
b076f77
Stream & no-cors tests
jakearchibald Jul 7, 2017
fdf63fc
Don't need a promise here
jakearchibald Jul 7, 2017
568ae5d
Intercepted by service worker tests
jakearchibald Jul 7, 2017
c1000fc
Whitespace fixing
jakearchibald Jul 10, 2017
ee16ec3
Asserting unreached rather than logging events
jakearchibald Jul 10, 2017
3c232fc
Removing custom abort error checks. Adding reader.closed test.
jakearchibald Jul 28, 2017
c2741a5
Streaming body test
jakearchibald Jul 28, 2017
e9f1003
Remove forbidden header
jakearchibald Jul 28, 2017
3e36e5e
Making test names unique
jakearchibald Jul 28, 2017
2951a23
Addressing nits
jakearchibald Jul 31, 2017
b7e0b64
Better comment
jakearchibald Jul 31, 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
57 changes: 57 additions & 0 deletions fetch/api/abort/cache.https.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Request signals &amp; the cache API</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
</head>
<body>
<script>
promise_test(async () => {
await caches.delete('test');
const controller = new AbortController();
const signal = controller.signal;
const request = new Request('../resources/data.json', { signal });

const cache = await caches.open('test');
await cache.put(request, new Response(''));

const requests = await cache.keys();

assert_equals(requests.length, 1, 'Ensuring cleanup worked');

const [cachedRequest] = requests;

controller.abort();

assert_false(cachedRequest.signal.aborted, "Request from cache shouldn't be aborted");

const data = await fetch(cachedRequest).then(r => r.json());
assert_equals(data.key, 'value', 'Fetch fully completes');
}, "Signals are not stored in the cache API");

promise_test(async () => {
await caches.delete('test');
const controller = new AbortController();
const signal = controller.signal;
const request = new Request('../resources/data.json', { signal });
controller.abort();

const cache = await caches.open('test');
await cache.put(request, new Response(''));

const requests = await cache.keys();

assert_equals(requests.length, 1, 'Ensuring cleanup worked');

const [cachedRequest] = requests;

assert_false(cachedRequest.signal.aborted, "Request from cache shouldn't be aborted");

const data = await fetch(cachedRequest).then(r => r.json());
assert_equals(data.key, 'value', 'Fetch fully completes');
}, "Signals are not stored in the cache API, even if they're already aborted");
</script>
</body>
</html>
Copy link
Member

Choose a reason for hiding this comment

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

Add newline.

23 changes: 23 additions & 0 deletions fetch/api/abort/general-serviceworker.https.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>General fetch abort tests in a service worker</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
</head>
<body>
<script>
(async function() {
const scope = 'does/not/exist';

let reg = await navigator.serviceWorker.getRegistration(scope);
if (reg) await reg.unregister();

reg = await navigator.serviceWorker.register('general.js', {scope});

fetch_tests_from_worker(reg.installing);
})();
</script>
</body>
</html>
Copy link
Member

Choose a reason for hiding this comment

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

Add newline.

19 changes: 19 additions & 0 deletions fetch/api/abort/general.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>General fetch abort tests</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/common/utils.js"></script>
<script src="general.js"></script>
</head>
<body>
<script>
fetch_tests_from_worker(new Worker("general.js"));
if (window.SharedWorker) {
fetch_tests_from_worker(new SharedWorker("general.js"));
}
Copy link
Member

Choose a reason for hiding this comment

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

FWIW I found generating multiple tests with a wrapper simpler than contextualTestName: see https://github.com/w3c/web-platform-tests/tree/master/streams readme and https://github.com/w3c/web-platform-tests/blob/master/streams/generate-test-wrappers.js

</script>
</body>
</html>
Copy link
Member

Choose a reason for hiding this comment

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

Add newline.

Loading