OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 /** | 5 /** |
6 * @fileoverview | 6 * @fileoverview |
7 * | 7 * |
8 * Provides basic functionality for JavaScript based browser test. | 8 * Provides basic functionality for JavaScript based browser test. |
9 * | 9 * |
10 * To define a browser test, create a class under the browserTest namespace. | 10 * To define a browser test, create a class under the browserTest namespace. |
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
210 }); | 210 }); |
211 }; | 211 }; |
212 | 212 |
213 /** | 213 /** |
214 * @return {Promise} | 214 * @return {Promise} |
215 */ | 215 */ |
216 browserTest.disconnect = function() { | 216 browserTest.disconnect = function() { |
217 var AppMode = remoting.AppMode; | 217 var AppMode = remoting.AppMode; |
218 var finishedMode = AppMode.CLIENT_SESSION_FINISHED_ME2ME; | 218 var finishedMode = AppMode.CLIENT_SESSION_FINISHED_ME2ME; |
219 var finishedButton = 'client-finished-me2me-button'; | 219 var finishedButton = 'client-finished-me2me-button'; |
220 if (remoting.desktopConnectedView.getMode() == | 220 if (remoting.app.getSessionConnector().getConnectionMode() === |
221 remoting.DesktopConnectedView.Mode.IT2ME) { | 221 remoting.DesktopConnectedView.Mode.IT2ME) { |
222 finishedMode = AppMode.CLIENT_SESSION_FINISHED_IT2ME; | 222 finishedMode = AppMode.CLIENT_SESSION_FINISHED_IT2ME; |
223 finishedButton = 'client-finished-it2me-button'; | 223 finishedButton = 'client-finished-it2me-button'; |
224 } | 224 } |
225 | 225 |
226 remoting.app.disconnect(); | 226 remoting.app.disconnect(); |
227 | 227 |
228 return browserTest.onUIMode(finishedMode).then(function() { | 228 return browserTest.onUIMode(finishedMode).then(function() { |
229 browserTest.clickOnControl(finishedButton); | 229 browserTest.clickOnControl(finishedButton); |
230 return browserTest.onUIMode(AppMode.HOME); | 230 return browserTest.onUIMode(AppMode.HOME); |
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
430 */ | 430 */ |
431 browserTest.ensureRemoteConnectionEnabled = function(pin) { | 431 browserTest.ensureRemoteConnectionEnabled = function(pin) { |
432 browserTest.ensureHostStartedWithPIN(pin).then(function() { | 432 browserTest.ensureHostStartedWithPIN(pin).then(function() { |
433 browserTest.pass(); | 433 browserTest.pass(); |
434 }, function(reason) { | 434 }, function(reason) { |
435 browserTest.fail(reason); | 435 browserTest.fail(reason); |
436 }); | 436 }); |
437 }; | 437 }; |
438 | 438 |
439 browserTest.init(); | 439 browserTest.init(); |
OLD | NEW |