diff options
Diffstat (limited to 'toolkit/components/captivedetect')
14 files changed, 1 insertions, 718 deletions
diff --git a/toolkit/components/captivedetect/moz.build b/toolkit/components/captivedetect/moz.build index 3bb9cf573..ee6a49aa5 100644 --- a/toolkit/components/captivedetect/moz.build +++ b/toolkit/components/captivedetect/moz.build @@ -4,12 +4,7 @@ # 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/. -XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini'] - -XPIDL_SOURCES += [ - 'nsICaptivePortalDetector.idl', -] - +XPIDL_SOURCES += ['nsICaptivePortalDetector.idl'] XPIDL_MODULE = 'captivedetect' EXTRA_COMPONENTS += [ diff --git a/toolkit/components/captivedetect/test/unit/.eslintrc.js b/toolkit/components/captivedetect/test/unit/.eslintrc.js deleted file mode 100644 index d35787cd2..000000000 --- a/toolkit/components/captivedetect/test/unit/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -"use strict"; - -module.exports = { - "extends": [ - "../../../../../testing/xpcshell/xpcshell.eslintrc.js" - ] -}; diff --git a/toolkit/components/captivedetect/test/unit/head_setprefs.js b/toolkit/components/captivedetect/test/unit/head_setprefs.js deleted file mode 100644 index bf621e31e..000000000 --- a/toolkit/components/captivedetect/test/unit/head_setprefs.js +++ /dev/null @@ -1,49 +0,0 @@ -/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ -/* 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/. */ -'use strict'; - -var {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components; - -Cu.import('resource://gre/modules/XPCOMUtils.jsm'); -Cu.import('resource://gre/modules/Services.jsm'); -Cu.import('resource://testing-common/httpd.js'); - -XPCOMUtils.defineLazyServiceGetter(this, 'gCaptivePortalDetector', - '@mozilla.org/toolkit/captive-detector;1', - 'nsICaptivePortalDetector'); - -const kCanonicalSitePath = '/canonicalSite.html'; -const kCanonicalSiteContent = 'true'; -const kPrefsCanonicalURL = 'captivedetect.canonicalURL'; -const kPrefsCanonicalContent = 'captivedetect.canonicalContent'; -const kPrefsMaxWaitingTime = 'captivedetect.maxWaitingTime'; -const kPrefsPollingTime = 'captivedetect.pollingTime'; - -var gServer; -var gServerURL; - -function setupPrefs() { - let prefs = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService) - .QueryInterface(Components.interfaces.nsIPrefBranch); - prefs.setCharPref(kPrefsCanonicalURL, gServerURL + kCanonicalSitePath); - prefs.setCharPref(kPrefsCanonicalContent, kCanonicalSiteContent); - prefs.setIntPref(kPrefsMaxWaitingTime, 0); - prefs.setIntPref(kPrefsPollingTime, 1); -} - -function run_captivedetect_test(xhr_handler, fakeUIResponse, testfun) -{ - gServer = new HttpServer(); - gServer.registerPathHandler(kCanonicalSitePath, xhr_handler); - gServer.start(-1); - gServerURL = 'http://localhost:' + gServer.identity.primaryPort; - - setupPrefs(); - - fakeUIResponse(); - - testfun(); -} diff --git a/toolkit/components/captivedetect/test/unit/test_abort.js b/toolkit/components/captivedetect/test/unit/test_abort.js deleted file mode 100644 index f99805dfb..000000000 --- a/toolkit/components/captivedetect/test/unit/test_abort.js +++ /dev/null @@ -1,53 +0,0 @@ -/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ -/* 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/. */ -'use strict'; - -const kInterfaceName = 'wifi'; - -var server; -var step = 0; -var loginFinished = false; - -function xhr_handler(metadata, response) { - response.setStatusLine(metadata.httpVersion, 200, 'OK'); - response.setHeader('Cache-Control', 'no-cache', false); - response.setHeader('Content-Type', 'text/plain', false); - if (loginFinished) { - response.write('true'); - } else { - response.write('false'); - } -} - -function fakeUIResponse() { - Services.obs.addObserver(function observe(subject, topic, data) { - if (topic === 'captive-portal-login') { - do_throw('should not receive captive-portal-login event'); - } - }, 'captive-portal-login', false); -} - -function test_abort() { - do_test_pending(); - - let callback = { - QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]), - prepare: function prepare() { - do_check_eq(++step, 1); - gCaptivePortalDetector.finishPreparation(kInterfaceName); - }, - complete: function complete(success) { - do_throw('should not execute |complete| callback'); - }, - }; - - gCaptivePortalDetector.checkCaptivePortal(kInterfaceName, callback); - gCaptivePortalDetector.abort(kInterfaceName); - gServer.stop(do_test_finished); -} - -function run_test() { - run_captivedetect_test(xhr_handler, fakeUIResponse, test_abort); -} diff --git a/toolkit/components/captivedetect/test/unit/test_abort_during_user_login.js b/toolkit/components/captivedetect/test/unit/test_abort_during_user_login.js deleted file mode 100644 index ef98ac5ea..000000000 --- a/toolkit/components/captivedetect/test/unit/test_abort_during_user_login.js +++ /dev/null @@ -1,66 +0,0 @@ -/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ -/* 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/. */ -'use strict'; - -const kInterfaceName = 'wifi'; - -var server; -var step = 0; -var loginFinished = false; - -function xhr_handler(metadata, response) { - response.setStatusLine(metadata.httpVersion, 200, 'OK'); - response.setHeader('Cache-Control', 'no-cache', false); - response.setHeader('Content-Type', 'text/plain', false); - if (loginFinished) { - response.write('true'); - } else { - response.write('false'); - } -} - -function fakeUIResponse() { - let requestId; - Services.obs.addObserver(function observe(subject, topic, data) { - if (topic === 'captive-portal-login') { - let xhr = Cc['@mozilla.org/xmlextras/xmlhttprequest;1'] - .createInstance(Ci.nsIXMLHttpRequest); - xhr.open('GET', gServerURL + kCanonicalSitePath, true); - xhr.send(); - loginFinished = true; - do_check_eq(++step, 2); - requestId = JSON.parse(data).id; - gCaptivePortalDetector.abort(kInterfaceName); - } - }, 'captive-portal-login', false); - Services.obs.addObserver(function observe(subject, topic, data) { - if (topic === 'captive-portal-login-abort') { - do_check_eq(++step, 3); - do_check_eq(JSON.parse(data).id, requestId); - gServer.stop(do_test_finished); - } - }, 'captive-portal-login-abort', false); -} - -function test_abort() { - do_test_pending(); - - let callback = { - QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]), - prepare: function prepare() { - do_check_eq(++step, 1); - gCaptivePortalDetector.finishPreparation(kInterfaceName); - }, - complete: function complete(success) { - do_throw('should not execute |complete| callback'); - }, - }; - - gCaptivePortalDetector.checkCaptivePortal(kInterfaceName, callback); -} - -function run_test() { - run_captivedetect_test(xhr_handler, fakeUIResponse, test_abort); -} diff --git a/toolkit/components/captivedetect/test/unit/test_abort_ongoing_request.js b/toolkit/components/captivedetect/test/unit/test_abort_ongoing_request.js deleted file mode 100644 index ad99903df..000000000 --- a/toolkit/components/captivedetect/test/unit/test_abort_ongoing_request.js +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ -/* 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/. */ -'use strict'; - -const kInterfaceName = 'wifi'; -const kOtherInterfaceName = 'ril'; - -var server; -var step = 0; -var loginFinished = false; - -function xhr_handler(metadata, response) { - response.setStatusLine(metadata.httpVersion, 200, 'OK'); - response.setHeader('Cache-Control', 'no-cache', false); - response.setHeader('Content-Type', 'text/plain', false); - if (loginFinished) { - response.write('true'); - } else { - response.write('false'); - } -} - -function fakeUIResponse() { - Services.obs.addObserver(function observe(subject, topic, data) { - if (topic === 'captive-portal-login') { - let xhr = Cc['@mozilla.org/xmlextras/xmlhttprequest;1'] - .createInstance(Ci.nsIXMLHttpRequest); - xhr.open('GET', gServerURL + kCanonicalSitePath, true); - xhr.send(); - loginFinished = true; - do_check_eq(++step, 3); - } - }, 'captive-portal-login', false); -} - -function test_multiple_requests_abort() { - do_test_pending(); - - let callback = { - QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]), - prepare: function prepare() { - do_check_eq(++step, 1); - gCaptivePortalDetector.finishPreparation(kInterfaceName); - }, - complete: function complete(success) { - do_throw('should not execute |complete| callback for ' + kInterfaceName); - }, - }; - - let otherCallback = { - QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]), - prepare: function prepare() { - do_check_eq(++step, 2); - gCaptivePortalDetector.finishPreparation(kOtherInterfaceName); - }, - complete: function complete(success) { - do_check_eq(++step, 4); - do_check_true(success); - gServer.stop(do_test_finished); - } - }; - - gCaptivePortalDetector.checkCaptivePortal(kInterfaceName, callback); - gCaptivePortalDetector.checkCaptivePortal(kOtherInterfaceName, otherCallback); - gCaptivePortalDetector.abort(kInterfaceName); -} - -function run_test() { - run_captivedetect_test(xhr_handler, fakeUIResponse, test_multiple_requests_abort); -} diff --git a/toolkit/components/captivedetect/test/unit/test_abort_pending_request.js b/toolkit/components/captivedetect/test/unit/test_abort_pending_request.js deleted file mode 100644 index ce36f1e79..000000000 --- a/toolkit/components/captivedetect/test/unit/test_abort_pending_request.js +++ /dev/null @@ -1,71 +0,0 @@ -/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ -/* 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/. */ -'use strict'; - -const kInterfaceName = 'wifi'; -const kOtherInterfaceName = 'ril'; - -var server; -var step = 0; -var loginFinished = false; - -function xhr_handler(metadata, response) { - response.setStatusLine(metadata.httpVersion, 200, 'OK'); - response.setHeader('Cache-Control', 'no-cache', false); - response.setHeader('Content-Type', 'text/plain', false); - if (loginFinished) { - response.write('true'); - } else { - response.write('false'); - } -} - -function fakeUIResponse() { - Services.obs.addObserver(function observe(subject, topic, data) { - if (topic === 'captive-portal-login') { - let xhr = Cc['@mozilla.org/xmlextras/xmlhttprequest;1'] - .createInstance(Ci.nsIXMLHttpRequest); - xhr.open('GET', gServerURL + kCanonicalSitePath, true); - xhr.send(); - loginFinished = true; - do_check_eq(++step, 2); - } - }, 'captive-portal-login', false); -} - -function test_abort() { - do_test_pending(); - - let callback = { - QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]), - prepare: function prepare() { - do_check_eq(++step, 1); - gCaptivePortalDetector.finishPreparation(kInterfaceName); - }, - complete: function complete(success) { - do_check_eq(++step, 3); - do_check_true(success); - gServer.stop(do_test_finished); - }, - }; - - let otherCallback = { - QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]), - prepare: function prepare() { - do_throw('should not execute |prepare| callback for ' + kOtherInterfaceName); - }, - complete: function complete(success) { - do_throw('should not execute |complete| callback for ' + kInterfaceName); - } - }; - - gCaptivePortalDetector.checkCaptivePortal(kInterfaceName, callback); - gCaptivePortalDetector.checkCaptivePortal(kOtherInterfaceName, otherCallback); - gCaptivePortalDetector.abort(kOtherInterfaceName); -} - -function run_test() { - run_captivedetect_test(xhr_handler, fakeUIResponse, test_abort); -} diff --git a/toolkit/components/captivedetect/test/unit/test_captive_portal_found.js b/toolkit/components/captivedetect/test/unit/test_captive_portal_found.js deleted file mode 100644 index 7fb7ba89e..000000000 --- a/toolkit/components/captivedetect/test/unit/test_captive_portal_found.js +++ /dev/null @@ -1,67 +0,0 @@ -/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ -/* 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/. */ -'use strict'; - -const kInterfaceName = 'wifi'; - -var server; -var step = 0; -var loginFinished = false; - -function xhr_handler(metadata, response) { - response.setStatusLine(metadata.httpVersion, 200, 'OK'); - response.setHeader('Cache-Control', 'no-cache', false); - response.setHeader('Content-Type', 'text/plain', false); - if (loginFinished) { - response.write('true'); - } else { - response.write('false'); - } -} - -function fakeUIResponse() { - Services.obs.addObserver(function observe(subject, topic, data) { - if (topic === 'captive-portal-login') { - let xhr = Cc['@mozilla.org/xmlextras/xmlhttprequest;1'] - .createInstance(Ci.nsIXMLHttpRequest); - xhr.open('GET', gServerURL + kCanonicalSitePath, true); - xhr.send(); - loginFinished = true; - do_check_eq(++step, 2); - } - }, 'captive-portal-login', false); - - Services.obs.addObserver(function observe(subject, topic, data) { - if (topic === 'captive-portal-login-success') { - do_check_eq(++step, 4); - gServer.stop(do_test_finished); - } - }, 'captive-portal-login-success', false); -} - -function test_portal_found() { - do_test_pending(); - - let callback = { - QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]), - prepare: function prepare() { - do_check_eq(++step, 1); - gCaptivePortalDetector.finishPreparation(kInterfaceName); - }, - complete: function complete(success) { - // Since this is a synchronous callback, it must happen before - // 'captive-portal-login-success' is received. - // (Check captivedetect.js::executeCallback - do_check_eq(++step, 3); - do_check_true(success); - }, - }; - - gCaptivePortalDetector.checkCaptivePortal(kInterfaceName, callback); -} - -function run_test() { - run_captivedetect_test(xhr_handler, fakeUIResponse, test_portal_found); -} diff --git a/toolkit/components/captivedetect/test/unit/test_captive_portal_found_303.js b/toolkit/components/captivedetect/test/unit/test_captive_portal_found_303.js deleted file mode 100644 index 7064e12c9..000000000 --- a/toolkit/components/captivedetect/test/unit/test_captive_portal_found_303.js +++ /dev/null @@ -1,74 +0,0 @@ -/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ -/* 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/. */ -'use strict'; - -const kInterfaceName = 'wifi'; - -var step = 0; -var loginFinished = false; - -var gRedirectServer; -var gRedirectServerURL; - -function xhr_handler(metadata, response) { - if (loginFinished) { - response.setStatusLine(metadata.httpVersion, 200, 'OK'); - response.setHeader('Cache-Control', 'no-cache', false); - response.setHeader('Content-Type', 'text/plain', false); - response.write('true'); - } else { - response.setStatusLine(metadata.httpVersion, 303, "See Other"); - response.setHeader("Location", gRedirectServerURL, false); - response.setHeader("Content-Type", "text/html", false); - } -} - -function fakeUIResponse() { - Services.obs.addObserver(function observe(subject, topic, data) { - if (topic === 'captive-portal-login') { - let xhr = Cc['@mozilla.org/xmlextras/xmlhttprequest;1'] - .createInstance(Ci.nsIXMLHttpRequest); - xhr.open('GET', gServerURL + kCanonicalSitePath, true); - xhr.send(); - loginFinished = true; - do_check_eq(++step, 2); - } - }, 'captive-portal-login', false); - - Services.obs.addObserver(function observe(subject, topic, data) { - if (topic === 'captive-portal-login-success') { - do_check_eq(++step, 4); - gServer.stop(function () { - gRedirectServer.stop(do_test_finished); - }); - } - }, 'captive-portal-login-success', false); -} - -function test_portal_found() { - do_test_pending(); - - let callback = { - QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]), - prepare: function prepare() { - do_check_eq(++step, 1); - gCaptivePortalDetector.finishPreparation(kInterfaceName); - }, - complete: function complete(success) { - do_check_eq(++step, 3); - do_check_true(success); - }, - }; - - gCaptivePortalDetector.checkCaptivePortal(kInterfaceName, callback); -} - -function run_test() { - gRedirectServer = new HttpServer(); - gRedirectServer.start(-1); - gRedirectServerURL = 'http://localhost:' + gRedirectServer.identity.primaryPort; - - run_captivedetect_test(xhr_handler, fakeUIResponse, test_portal_found); -} diff --git a/toolkit/components/captivedetect/test/unit/test_captive_portal_not_found.js b/toolkit/components/captivedetect/test/unit/test_captive_portal_not_found.js deleted file mode 100644 index 1dc4fe009..000000000 --- a/toolkit/components/captivedetect/test/unit/test_captive_portal_not_found.js +++ /dev/null @@ -1,52 +0,0 @@ -/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ -/* 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/. */ -'use strict'; - -const kInterfaceName = 'wifi'; - -var server; -var step = 0; -var attempt = 0; - -function xhr_handler(metadata, response) { - dump('HTTP activity\n'); - response.setStatusLine(metadata.httpVersion, 200, 'OK'); - response.setHeader('Cache-Control', 'no-cache', false); - response.setHeader('Content-Type', 'text/plain', false); - response.write('true'); - attempt++; -} - -function fakeUIResponse() { - Services.obs.addObserver(function observe(subject, topic, data) { - if (topic == 'captive-portal-login') { - do_throw('should not receive captive-portal-login event'); - } - }, 'captive-portal-login', false); -} - -function test_portal_not_found() { - do_test_pending(); - - let callback = { - QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]), - prepare: function prepare() { - do_check_eq(++step, 1); - gCaptivePortalDetector.finishPreparation(kInterfaceName); - }, - complete: function complete(success) { - do_check_eq(++step, 2); - do_check_true(success); - do_check_eq(attempt, 1); - gServer.stop(function() { dump('server stop\n'); do_test_finished(); }); - } - }; - - gCaptivePortalDetector.checkCaptivePortal(kInterfaceName, callback); -} - -function run_test() { - run_captivedetect_test(xhr_handler, fakeUIResponse, test_portal_not_found); -} diff --git a/toolkit/components/captivedetect/test/unit/test_captive_portal_not_found_404.js b/toolkit/components/captivedetect/test/unit/test_captive_portal_not_found_404.js deleted file mode 100644 index 66bcdd077..000000000 --- a/toolkit/components/captivedetect/test/unit/test_captive_portal_not_found_404.js +++ /dev/null @@ -1,49 +0,0 @@ -/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ -/* 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/. */ -'use strict'; - -const kInterfaceName = 'wifi'; - -var server; -var step = 0; -var loginFinished = false; -var attempt = 0; - -function xhr_handler(metadata, response) { - response.setStatusLine(metadata.httpVersion, 404, "Page not Found"); - attempt++; -} - -function fakeUIResponse() { - Services.obs.addObserver(function observe(subject, topic, data) { - if (topic === 'captive-portal-login') { - do_throw('should not receive captive-portal-login event'); - } - }, 'captive-portal-login', false); -} - -function test_portal_not_found() { - do_test_pending(); - - let callback = { - QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]), - prepare: function prepare() { - do_check_eq(++step, 1); - gCaptivePortalDetector.finishPreparation(kInterfaceName); - }, - complete: function complete(success) { - do_check_eq(++step, 2); - do_check_false(success); - do_check_eq(attempt, 6); - gServer.stop(do_test_finished); - }, - }; - - gCaptivePortalDetector.checkCaptivePortal(kInterfaceName, callback); -} - -function run_test() { - run_captivedetect_test(xhr_handler, fakeUIResponse, test_portal_not_found); -} diff --git a/toolkit/components/captivedetect/test/unit/test_multiple_requests.js b/toolkit/components/captivedetect/test/unit/test_multiple_requests.js deleted file mode 100644 index 11cf5e4b2..000000000 --- a/toolkit/components/captivedetect/test/unit/test_multiple_requests.js +++ /dev/null @@ -1,83 +0,0 @@ -/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ -/* 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/. */ -'use strict'; - -const kInterfaceName = 'wifi'; -const kOtherInterfaceName = 'ril'; - -var server; -var step = 0; -var loginFinished = false; -var loginSuccessCount = 0; - -function xhr_handler(metadata, response) { - response.setStatusLine(metadata.httpVersion, 200, 'OK'); - response.setHeader('Cache-Control', 'no-cache', false); - response.setHeader('Content-Type', 'text/plain', false); - if (loginFinished) { - response.write('true'); - } else { - response.write('false'); - } -} - -function fakeUIResponse() { - Services.obs.addObserver(function observe(subject, topic, data) { - if (topic === 'captive-portal-login') { - let xhr = Cc['@mozilla.org/xmlextras/xmlhttprequest;1'] - .createInstance(Ci.nsIXMLHttpRequest); - xhr.open('GET', gServerURL + kCanonicalSitePath, true); - xhr.send(); - loginFinished = true; - do_check_eq(++step, 2); - } - }, 'captive-portal-login', false); - - Services.obs.addObserver(function observe(subject, topic, data) { - if (topic === 'captive-portal-login-success') { - loginSuccessCount++; - if (loginSuccessCount > 1) { - throw "We should only receive 'captive-portal-login-success' once"; - } - do_check_eq(++step, 4); - } - }, 'captive-portal-login-success', false); -} - -function test_multiple_requests() { - do_test_pending(); - - let callback = { - QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]), - prepare: function prepare() { - do_check_eq(++step, 1); - gCaptivePortalDetector.finishPreparation(kInterfaceName); - }, - complete: function complete(success) { - do_check_eq(++step, 3); - do_check_true(success); - }, - }; - - let otherCallback = { - QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]), - prepare: function prepare() { - do_check_eq(++step, 5); - gCaptivePortalDetector.finishPreparation(kOtherInterfaceName); - }, - complete: function complete(success) { - do_check_eq(++step, 6); - do_check_true(success); - gServer.stop(do_test_finished); - } - }; - - gCaptivePortalDetector.checkCaptivePortal(kInterfaceName, callback); - gCaptivePortalDetector.checkCaptivePortal(kOtherInterfaceName, otherCallback); -} - -function run_test() { - run_captivedetect_test(xhr_handler, fakeUIResponse, test_multiple_requests); -} diff --git a/toolkit/components/captivedetect/test/unit/test_user_cancel.js b/toolkit/components/captivedetect/test/unit/test_user_cancel.js deleted file mode 100644 index a03876817..000000000 --- a/toolkit/components/captivedetect/test/unit/test_user_cancel.js +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ -/* 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/. */ -'use strict'; - -const kInterfaceName = 'wifi'; - -var server; -var step = 0; - -function xhr_handler(metadata, response) { - response.setStatusLine(metadata.httpVersion, 200, 'OK'); - response.setHeader('Cache-Control', 'no-cache', false); - response.setHeader('Content-Type', 'text/plain', false); - response.write('false'); -} - -function fakeUIResponse() { - Services.obs.addObserver(function observe(subject, topic, data) { - if (topic === 'captive-portal-login') { - let xhr = Cc['@mozilla.org/xmlextras/xmlhttprequest;1'] - .createInstance(Ci.nsIXMLHttpRequest); - xhr.open('GET', gServerURL + kCanonicalSitePath, true); - xhr.send(); - do_check_eq(++step, 2); - let details = JSON.parse(data); - gCaptivePortalDetector.cancelLogin(details.id); - } - }, 'captive-portal-login', false); -} - -function test_cancel() { - do_test_pending(); - - let callback = { - QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]), - prepare: function prepare() { - do_check_eq(++step, 1); - gCaptivePortalDetector.finishPreparation(kInterfaceName); - }, - complete: function complete(success) { - do_check_eq(++step, 3); - do_check_false(success); - gServer.stop(do_test_finished); - }, - }; - - gCaptivePortalDetector.checkCaptivePortal(kInterfaceName, callback); -} - -function run_test() { - run_captivedetect_test(xhr_handler, fakeUIResponse, test_cancel); -} diff --git a/toolkit/components/captivedetect/test/unit/xpcshell.ini b/toolkit/components/captivedetect/test/unit/xpcshell.ini deleted file mode 100644 index 0f440c438..000000000 --- a/toolkit/components/captivedetect/test/unit/xpcshell.ini +++ /dev/null @@ -1,15 +0,0 @@ -[DEFAULT] -head = head_setprefs.js -tail = - -[test_captive_portal_not_found.js] -[test_captive_portal_not_found_404.js] -[test_captive_portal_found.js] -[test_captive_portal_found_303.js] -[test_abort.js] -[test_abort_during_user_login.js] -[test_user_cancel.js] -[test_multiple_requests.js] -[test_abort_ongoing_request.js] -[test_abort_pending_request.js] - |