Thu, 22 Jan 2015 13:21:57 +0100
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
michael@0 | 1 | /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
michael@0 | 2 | /* This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 3 | * License, v. 2.0. If a copy of the MPL was not distributed with this file, |
michael@0 | 4 | * You can obtain one at http://mozilla.org/MPL/2.0/. */ |
michael@0 | 5 | 'use strict'; |
michael@0 | 6 | |
michael@0 | 7 | const kInterfaceName = 'wifi'; |
michael@0 | 8 | |
michael@0 | 9 | var server; |
michael@0 | 10 | var step = 0; |
michael@0 | 11 | var loginFinished = false; |
michael@0 | 12 | |
michael@0 | 13 | function xhr_handler(metadata, response) { |
michael@0 | 14 | response.setStatusLine(metadata.httpVersion, 200, 'OK'); |
michael@0 | 15 | response.setHeader('Cache-Control', 'no-cache', false); |
michael@0 | 16 | response.setHeader('Content-Type', 'text/plain', false); |
michael@0 | 17 | if (loginFinished) { |
michael@0 | 18 | response.write('true'); |
michael@0 | 19 | } else { |
michael@0 | 20 | response.write('false'); |
michael@0 | 21 | } |
michael@0 | 22 | } |
michael@0 | 23 | |
michael@0 | 24 | function fakeUIResponse() { |
michael@0 | 25 | Services.obs.addObserver(function observe(subject, topic, data) { |
michael@0 | 26 | if (topic === 'captive-portal-login') { |
michael@0 | 27 | do_throw('should not receive captive-portal-login event'); |
michael@0 | 28 | } |
michael@0 | 29 | }, 'captive-portal-login', false); |
michael@0 | 30 | } |
michael@0 | 31 | |
michael@0 | 32 | function test_abort() { |
michael@0 | 33 | do_test_pending(); |
michael@0 | 34 | |
michael@0 | 35 | let callback = { |
michael@0 | 36 | QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]), |
michael@0 | 37 | prepare: function prepare() { |
michael@0 | 38 | do_check_eq(++step, 1); |
michael@0 | 39 | gCaptivePortalDetector.finishPreparation(kInterfaceName); |
michael@0 | 40 | }, |
michael@0 | 41 | complete: function complete(success) { |
michael@0 | 42 | do_throw('should not execute |complete| callback'); |
michael@0 | 43 | }, |
michael@0 | 44 | }; |
michael@0 | 45 | |
michael@0 | 46 | gCaptivePortalDetector.checkCaptivePortal(kInterfaceName, callback); |
michael@0 | 47 | gCaptivePortalDetector.abort(kInterfaceName); |
michael@0 | 48 | gServer.stop(do_test_finished); |
michael@0 | 49 | } |
michael@0 | 50 | |
michael@0 | 51 | function run_test() { |
michael@0 | 52 | run_captivedetect_test(xhr_handler, fakeUIResponse, test_abort); |
michael@0 | 53 | } |