From 29bca891d5ca243774a7355fc3a6a68903f0d596 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Thu, 11 Jun 2020 12:43:17 +0000 Subject: Issue #1587 - Part 6: Move FetchController/Signal to its own dir Since it is specced separately from fetch. --- dom/abort/tests/file_fetch_controller.html | 161 +++++++++++++++++++++++++++++ dom/abort/tests/mochitest.ini | 6 ++ dom/abort/tests/moz.build | 8 ++ dom/abort/tests/test_fetch_controller.html | 40 +++++++ dom/abort/tests/worker_fetch_controller.js | 27 +++++ 5 files changed, 242 insertions(+) create mode 100644 dom/abort/tests/file_fetch_controller.html create mode 100644 dom/abort/tests/mochitest.ini create mode 100644 dom/abort/tests/moz.build create mode 100644 dom/abort/tests/test_fetch_controller.html create mode 100644 dom/abort/tests/worker_fetch_controller.js (limited to 'dom/abort/tests') diff --git a/dom/abort/tests/file_fetch_controller.html b/dom/abort/tests/file_fetch_controller.html new file mode 100644 index 000000000..e4137aac9 --- /dev/null +++ b/dom/abort/tests/file_fetch_controller.html @@ -0,0 +1,161 @@ + diff --git a/dom/abort/tests/mochitest.ini b/dom/abort/tests/mochitest.ini new file mode 100644 index 000000000..5ecc7048e --- /dev/null +++ b/dom/abort/tests/mochitest.ini @@ -0,0 +1,6 @@ +[DEFAULT] +support-files = + file_fetch_controller.html + worker_fetch_controller.js + +[test_fetch_controller.html] diff --git a/dom/abort/tests/moz.build b/dom/abort/tests/moz.build new file mode 100644 index 000000000..8e5cb5d71 --- /dev/null +++ b/dom/abort/tests/moz.build @@ -0,0 +1,8 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +MOCHITEST_MANIFESTS += ['mochitest.ini'] + diff --git a/dom/abort/tests/test_fetch_controller.html b/dom/abort/tests/test_fetch_controller.html new file mode 100644 index 000000000..812fb9161 --- /dev/null +++ b/dom/abort/tests/test_fetch_controller.html @@ -0,0 +1,40 @@ + + + + + Test FetchController + + + + + + + + diff --git a/dom/abort/tests/worker_fetch_controller.js b/dom/abort/tests/worker_fetch_controller.js new file mode 100644 index 000000000..6b008fea8 --- /dev/null +++ b/dom/abort/tests/worker_fetch_controller.js @@ -0,0 +1,27 @@ +function testWorkerAbortedFetch() { + var fc = new FetchController(); + fc.abort(); + + fetch('slow.sjs', { signal: fc.signal }).then(() => { + postMessage(false); + }, e => { + postMessage(e.name == "AbortError"); + }); +} + +function testWorkerFetchAndAbort() { + var fc = new FetchController(); + + var p = fetch('slow.sjs', { signal: fc.signal }); + fc.abort(); + + p.then(() => { + postMessage(false); + }, e => { + postMessage(e.name == "AbortError"); + }); +} + +onmessage = function(e) { + self[e.data](); +} -- cgit v1.2.3 From 21403c31e0288ad3c1921019f6f6185a0019a9a4 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Thu, 11 Jun 2020 23:20:52 +0000 Subject: Issue #1587 - Part 7: Rename FetchController to AbortController Also renames FetchSignal to AbortSignal. Includes renaming the various controlling prefs to enable. --- dom/abort/tests/file_abort_controller.html | 161 +++++++++++++++++++++++++++++ dom/abort/tests/file_fetch_controller.html | 161 ----------------------------- dom/abort/tests/mochitest.ini | 4 +- dom/abort/tests/test_abort_controller.html | 40 +++++++ dom/abort/tests/test_fetch_controller.html | 40 ------- dom/abort/tests/worker_abort_controller.js | 27 +++++ dom/abort/tests/worker_fetch_controller.js | 27 ----- 7 files changed, 230 insertions(+), 230 deletions(-) create mode 100644 dom/abort/tests/file_abort_controller.html delete mode 100644 dom/abort/tests/file_fetch_controller.html create mode 100644 dom/abort/tests/test_abort_controller.html delete mode 100644 dom/abort/tests/test_fetch_controller.html create mode 100644 dom/abort/tests/worker_abort_controller.js delete mode 100644 dom/abort/tests/worker_fetch_controller.js (limited to 'dom/abort/tests') diff --git a/dom/abort/tests/file_abort_controller.html b/dom/abort/tests/file_abort_controller.html new file mode 100644 index 000000000..e4137aac9 --- /dev/null +++ b/dom/abort/tests/file_abort_controller.html @@ -0,0 +1,161 @@ + diff --git a/dom/abort/tests/file_fetch_controller.html b/dom/abort/tests/file_fetch_controller.html deleted file mode 100644 index e4137aac9..000000000 --- a/dom/abort/tests/file_fetch_controller.html +++ /dev/null @@ -1,161 +0,0 @@ - diff --git a/dom/abort/tests/mochitest.ini b/dom/abort/tests/mochitest.ini index 5ecc7048e..c8cc95fda 100644 --- a/dom/abort/tests/mochitest.ini +++ b/dom/abort/tests/mochitest.ini @@ -1,6 +1,6 @@ [DEFAULT] support-files = - file_fetch_controller.html + file_abort_controller.html worker_fetch_controller.js -[test_fetch_controller.html] +[test_abort_controller.html] diff --git a/dom/abort/tests/test_abort_controller.html b/dom/abort/tests/test_abort_controller.html new file mode 100644 index 000000000..812fb9161 --- /dev/null +++ b/dom/abort/tests/test_abort_controller.html @@ -0,0 +1,40 @@ + + + + + Test FetchController + + + + + + + + diff --git a/dom/abort/tests/test_fetch_controller.html b/dom/abort/tests/test_fetch_controller.html deleted file mode 100644 index 812fb9161..000000000 --- a/dom/abort/tests/test_fetch_controller.html +++ /dev/null @@ -1,40 +0,0 @@ - - - - - Test FetchController - - - - - - - - diff --git a/dom/abort/tests/worker_abort_controller.js b/dom/abort/tests/worker_abort_controller.js new file mode 100644 index 000000000..6fd1c7888 --- /dev/null +++ b/dom/abort/tests/worker_abort_controller.js @@ -0,0 +1,27 @@ +function testWorkerAbortedFetch() { + var fc = new AbortController(); + fc.abort(); + + fetch('slow.sjs', { signal: fc.signal }).then(() => { + postMessage(false); + }, e => { + postMessage(e.name == "AbortError"); + }); +} + +function testWorkerFetchAndAbort() { + var fc = new AbortController(); + + var p = fetch('slow.sjs', { signal: fc.signal }); + fc.abort(); + + p.then(() => { + postMessage(false); + }, e => { + postMessage(e.name == "AbortError"); + }); +} + +onmessage = function(e) { + self[e.data](); +} diff --git a/dom/abort/tests/worker_fetch_controller.js b/dom/abort/tests/worker_fetch_controller.js deleted file mode 100644 index 6b008fea8..000000000 --- a/dom/abort/tests/worker_fetch_controller.js +++ /dev/null @@ -1,27 +0,0 @@ -function testWorkerAbortedFetch() { - var fc = new FetchController(); - fc.abort(); - - fetch('slow.sjs', { signal: fc.signal }).then(() => { - postMessage(false); - }, e => { - postMessage(e.name == "AbortError"); - }); -} - -function testWorkerFetchAndAbort() { - var fc = new FetchController(); - - var p = fetch('slow.sjs', { signal: fc.signal }); - fc.abort(); - - p.then(() => { - postMessage(false); - }, e => { - postMessage(e.name == "AbortError"); - }); -} - -onmessage = function(e) { - self[e.data](); -} -- cgit v1.2.3 From 301ae8c2df5dcec2c8d736e0397db563b621b9fd Mon Sep 17 00:00:00 2001 From: Moonchild Date: Fri, 12 Jun 2020 01:08:26 +0000 Subject: Issue #1587 - Part 8: Remove controller follow/unfollow Since it didn't end up being in the final spec after all. --- dom/abort/tests/file_abort_controller.html | 48 ------------------------------ 1 file changed, 48 deletions(-) (limited to 'dom/abort/tests') diff --git a/dom/abort/tests/file_abort_controller.html b/dom/abort/tests/file_abort_controller.html index e4137aac9..3a15fa346 100644 --- a/dom/abort/tests/file_abort_controller.html +++ b/dom/abort/tests/file_abort_controller.html @@ -32,49 +32,6 @@ function testUpdateData() { next(); } -function testFollowingOurself() { - // Let's follow ourself - var fc = new FetchController(); - fc.follow(fc.signal); - - fc.abort(); - is(fc.signal.aborted, true, "Signal is aborted"); - - next(); -} - -function testFollowingOther() { - // Let's follow another one - var fc1 = new FetchController(); - var fc2 = new FetchController(); - fc1.follow(fc2.signal); - - fc2.abort(); - - is(fc1.signal.aborted, true, "Signal is aborted"); - is(fc2.signal.aborted, true, "Signal is aborted"); - - next(); -} - -function testFollowingLoop() { - // fc1 -> fc2 -> fc3 -> fc1 - var fc1 = new FetchController(); - var fc2 = new FetchController(); - var fc3 = new FetchController(); - fc1.follow(fc2.signal); - fc2.follow(fc3.signal); - fc3.follow(fc1.signal); - - fc3.abort(); - - is(fc1.signal.aborted, true, "Signal is aborted"); - is(fc2.signal.aborted, true, "Signal is aborted"); - is(fc3.signal.aborted, true, "Signal is aborted"); - - next(); -} - function testAbortEvent() { var fc = new FetchController(); fc.signal.onabort = function(e) { @@ -131,11 +88,6 @@ var steps = [ testWebIDL, testUpdateData, - // Following algorithm - testFollowingOurself, - testFollowingOther, - testFollowingLoop, - // Event propagation testAbortEvent, -- cgit v1.2.3