| Index: remoting/webapp/crd/js/dns_blackhole_checker_unittest.js
|
| diff --git a/remoting/webapp/crd/js/dns_blackhole_checker_unittest.js b/remoting/webapp/crd/js/dns_blackhole_checker_unittest.js
|
| index 6c553458d8bccca3ed07ce71a33716fe7199f056..66c32f8cd2841f94bed95d2528bd1698f901203d 100644
|
| --- a/remoting/webapp/crd/js/dns_blackhole_checker_unittest.js
|
| +++ b/remoting/webapp/crd/js/dns_blackhole_checker_unittest.js
|
| @@ -25,8 +25,8 @@ var checker = null;
|
| var signalStrategy = null;
|
| var fakeXhrs;
|
|
|
| -module('dns_blackhole_checker', {
|
| - setup: function() {
|
| +QUnit.module('dns_blackhole_checker', {
|
| + beforeEach: function() {
|
| fakeXhrs = [];
|
| sinon.useFakeXMLHttpRequest().onCreate = function(xhr) {
|
| fakeXhrs.push(xhr);
|
| @@ -51,7 +51,7 @@ module('dns_blackhole_checker', {
|
| fakeXhrs[0].url, remoting.DnsBlackholeChecker.URL_TO_REQUEST_,
|
| 'the correct URL is requested');
|
| },
|
| - teardown: function() {
|
| + afterEach: function() {
|
| base.dispose(checker);
|
| sinon.assert.calledWith(onStateChange,
|
| remoting.SignalStrategy.State.CLOSED);
|
| @@ -62,7 +62,7 @@ module('dns_blackhole_checker', {
|
| },
|
| });
|
|
|
| -test('success',
|
| +QUnit.test('success',
|
| function() {
|
| fakeXhrs[0].respond(200);
|
| sinon.assert.notCalled(onStateChange);
|
| @@ -74,12 +74,12 @@ test('success',
|
| ].forEach(function(state) {
|
| signalStrategy.setStateForTesting(state);
|
| sinon.assert.calledWith(onStateChange, state);
|
| - equal(checker.getState(), state);
|
| + QUnit.equal(checker.getState(), state);
|
| });
|
| }
|
| );
|
|
|
| -test('http response after connected',
|
| +QUnit.test('http response after connected',
|
| function() {
|
| [
|
| remoting.SignalStrategy.State.CONNECTING,
|
| @@ -87,7 +87,7 @@ test('http response after connected',
|
| ].forEach(function(state) {
|
| signalStrategy.setStateForTesting(state);
|
| sinon.assert.calledWith(onStateChange, state);
|
| - equal(checker.getState(), state);
|
| + QUnit.equal(checker.getState(), state);
|
| });
|
| onStateChange.reset();
|
|
|
| @@ -95,7 +95,7 @@ test('http response after connected',
|
| // signal strategy has connected.
|
| signalStrategy.setStateForTesting(remoting.SignalStrategy.State.CONNECTED);
|
| sinon.assert.notCalled(onStateChange);
|
| - equal(checker.getState(), remoting.SignalStrategy.State.HANDSHAKE);
|
| + QUnit.equal(checker.getState(), remoting.SignalStrategy.State.HANDSHAKE);
|
|
|
| // Verify that DnsBlackholeChecker goes to CONNECTED state after the
|
| // the HTTP request has succeeded.
|
| @@ -105,7 +105,7 @@ test('http response after connected',
|
| }
|
| );
|
|
|
| -test('connect failed',
|
| +QUnit.test('connect failed',
|
| function() {
|
| fakeXhrs[0].respond(200);
|
| sinon.assert.notCalled(onStateChange);
|
| @@ -120,12 +120,12 @@ test('connect failed',
|
| }
|
| );
|
|
|
| -test('blocked',
|
| +QUnit.test('blocked',
|
| function() {
|
| fakeXhrs[0].respond(400);
|
| sinon.assert.calledWith(onStateChange,
|
| remoting.SignalStrategy.State.FAILED);
|
| - equal(checker.getError().getTag(), remoting.Error.Tag.NOT_AUTHORIZED);
|
| + QUnit.equal(checker.getError().getTag(), remoting.Error.Tag.NOT_AUTHORIZED);
|
| onStateChange.reset();
|
|
|
| [
|
| @@ -135,12 +135,12 @@ test('blocked',
|
| ].forEach(function(state) {
|
| signalStrategy.setStateForTesting(state);
|
| sinon.assert.notCalled(onStateChange);
|
| - equal(checker.getState(), remoting.SignalStrategy.State.FAILED);
|
| + QUnit.equal(checker.getState(), remoting.SignalStrategy.State.FAILED);
|
| });
|
| }
|
| );
|
|
|
| -test('blocked after connected',
|
| +QUnit.test('blocked after connected',
|
| function() {
|
| [
|
| remoting.SignalStrategy.State.CONNECTING,
|
| @@ -148,7 +148,7 @@ test('blocked after connected',
|
| ].forEach(function(state) {
|
| signalStrategy.setStateForTesting(state);
|
| sinon.assert.calledWith(onStateChange, state);
|
| - equal(checker.getState(), state);
|
| + QUnit.equal(checker.getState(), state);
|
| });
|
| onStateChange.reset();
|
|
|
| @@ -156,14 +156,14 @@ test('blocked after connected',
|
| // signal strategy has connected.
|
| signalStrategy.setStateForTesting(remoting.SignalStrategy.State.CONNECTED);
|
| sinon.assert.notCalled(onStateChange);
|
| - equal(checker.getState(), remoting.SignalStrategy.State.HANDSHAKE);
|
| + QUnit.equal(checker.getState(), remoting.SignalStrategy.State.HANDSHAKE);
|
|
|
| // Verify that DnsBlackholeChecker goes to FAILED state after it gets the
|
| // blocked HTTP response.
|
| fakeXhrs[0].respond(400);
|
| sinon.assert.calledWith(onStateChange,
|
| remoting.SignalStrategy.State.FAILED);
|
| - ok(checker.getError().hasTag(remoting.Error.Tag.NOT_AUTHORIZED));
|
| + QUnit.ok(checker.getError().hasTag(remoting.Error.Tag.NOT_AUTHORIZED));
|
| }
|
| );
|
|
|
|
|