Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1918)

Unified Diff: remoting/webapp/base/js/fallback_signal_strategy_unittest.js

Issue 1285213006: Send connection setup results using XHRs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/webapp/base/js/fallback_signal_strategy_unittest.js
diff --git a/remoting/webapp/base/js/fallback_signal_strategy_unittest.js b/remoting/webapp/base/js/fallback_signal_strategy_unittest.js
index 670aa8f11ec17e78749470f1a2820426745b6576..3d02263cc800925b132d0f3a391e80b7c7bd7319 100644
--- a/remoting/webapp/base/js/fallback_signal_strategy_unittest.js
+++ b/remoting/webapp/base/js/fallback_signal_strategy_unittest.js
@@ -84,6 +84,7 @@ QUnit.module('fallback_signal_strategy', {
secondary = strategy.secondary_;
addSpies(secondary);
logToServer = new MockLogToServer(assert);
+ strategy.logger_ = logToServer;
Jamie 2015/08/14 20:48:00 This is ugly (and wouldn't compile if we ever want
kelvinp 2015/08/14 21:59:54 I think that's ok for test.
},
afterEach: function() {
onStateChange = null;
@@ -119,7 +120,6 @@ QUnit.test('primary succeeds; send & receive routed to it',
setState(assert, primary, remoting.SignalStrategy.State.CONNECTED, true);
assert.equal(strategy.getJid(), 'primary-jid');
- strategy.sendConnectionSetupResults(logToServer);
logToServer.assertProgress(
remoting.SignalStrategy.Type.XMPP,
remoting.FallbackSignalStrategy.Progress.SUCCEEDED);
@@ -168,7 +168,6 @@ QUnit.test('primary fails; secondary succeeds; send & receive routed to it',
setState(assert, secondary, remoting.SignalStrategy.State.CONNECTED, true);
assert.equal(strategy.getJid(), 'secondary-jid');
- strategy.sendConnectionSetupResults(logToServer);
logToServer.assertProgress(
remoting.SignalStrategy.Type.XMPP,
remoting.FallbackSignalStrategy.Progress.FAILED,
@@ -229,7 +228,6 @@ QUnit.test('primary times out; secondary succeeds',
false);
setState(assert, secondary, remoting.SignalStrategy.State.HANDSHAKE, true);
setState(assert, secondary, remoting.SignalStrategy.State.CONNECTED, true);
- strategy.sendConnectionSetupResults(logToServer);
setState(assert, secondary, remoting.SignalStrategy.State.CLOSED, true);
setState(assert, primary, remoting.SignalStrategy.State.FAILED, false);
@@ -284,7 +282,6 @@ QUnit.test('primary times out; secondary succeeds; primary succeeds late',
false);
setState(assert, secondary, remoting.SignalStrategy.State.HANDSHAKE, true);
setState(assert, secondary, remoting.SignalStrategy.State.CONNECTED, true);
- strategy.sendConnectionSetupResults(logToServer);
setState(assert, primary, remoting.SignalStrategy.State.HANDSHAKE, false);
setState(assert, primary, remoting.SignalStrategy.State.CONNECTED, false);

Powered by Google App Engine
This is Rietveld 408576698