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 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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.app.getConnectionMode() === remoting.Application.Mode.IT2ME) { | 220 if (remoting.app.getConnectionMode() === remoting.Application.Mode.IT2ME) { |
221 finishedMode = AppMode.CLIENT_SESSION_FINISHED_IT2ME; | 221 finishedMode = AppMode.CLIENT_SESSION_FINISHED_IT2ME; |
222 finishedButton = 'client-finished-it2me-button'; | 222 finishedButton = 'client-finished-it2me-button'; |
223 } | 223 } |
224 | 224 |
225 remoting.app.disconnect(); | 225 var activity = remoting.app.getActivity(); |
| 226 if (!activity) { |
| 227 return Promise.resolve(); |
| 228 } |
| 229 |
| 230 activity.stop(); |
226 | 231 |
227 return browserTest.onUIMode(finishedMode).then(function() { | 232 return browserTest.onUIMode(finishedMode).then(function() { |
228 browserTest.clickOnControl(finishedButton); | 233 browserTest.clickOnControl(finishedButton); |
229 return browserTest.onUIMode(AppMode.HOME); | 234 return browserTest.onUIMode(AppMode.HOME); |
230 }); | 235 }); |
231 }; | 236 }; |
232 | 237 |
233 /** | 238 /** |
234 * @param {string} pin | 239 * @param {string} pin |
235 * @param {?boolean} opt_expectError | 240 * @param {?boolean} opt_expectError |
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
429 */ | 434 */ |
430 browserTest.ensureRemoteConnectionEnabled = function(pin) { | 435 browserTest.ensureRemoteConnectionEnabled = function(pin) { |
431 browserTest.ensureHostStartedWithPIN(pin).then(function() { | 436 browserTest.ensureHostStartedWithPIN(pin).then(function() { |
432 browserTest.pass(); | 437 browserTest.pass(); |
433 }, function(reason) { | 438 }, function(reason) { |
434 browserTest.fail(reason); | 439 browserTest.fail(reason); |
435 }); | 440 }); |
436 }; | 441 }; |
437 | 442 |
438 browserTest.init(); | 443 browserTest.init(); |
OLD | NEW |