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 1 commit
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
2 changes: 1 addition & 1 deletion fetch/api/abort/cache.https.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@
}, "Signals are not stored in the cache API, even if they're already aborted");
</script>
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion fetch/api/abort/general-serviceworker.https.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
})();
</script>
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion fetch/api/abort/general.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
}
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>
</html>
4 changes: 2 additions & 2 deletions fetch/api/abort/general.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,6 @@ test(t => {
});

assert_true(!!cancelReason, 'Cancel called sync');
Copy link
Member

Choose a reason for hiding this comment

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

This test makes sense. Can we not assert anything more specific about cancelReason than that it's truthy?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Doh, that's supposed to be the next two lines. Copy & paste error.

assert_equals(err.constructor, DOMException);
assert_equals(err.name, 'AbortError');
assert_equals(cancelReason.constructor, DOMException);
assert_equals(cancelReason.name, 'AbortError');
}, contextualTestName("Readable stream synchronously cancels with AbortError if aborted before reading"));
2 changes: 1 addition & 1 deletion fetch/api/abort/serviceworker-intercepted.https.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,4 @@
}, "Stream errors once aborted.");
</script>
</body>
</html>
</html>
6 changes: 5 additions & 1 deletion fetch/api/resources/basic.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
<!DOCTYPE html>
<!DOCTYPE html>
<!--
Duplicating this resource to make service worker scoping simpler in
Copy link
Member

Choose a reason for hiding this comment

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

"Duplicating /common/blank.html..."

serviceworker-intercepted.https.html
-->
2 changes: 1 addition & 1 deletion fetch/api/resources/sw-intercept.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ async function broadcast(msg) {
addEventListener('fetch', event => {
event.waitUntil(broadcast(event.request.url));
event.respondWith(fetch(event.request));
});
});