Implement browser test for It2Me

remoting/webapp/browser_test/browser_test.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview
  * @suppress {checkTypes}  By default, JSCompile is not run on test files.
  *    However, you can modify |remoting_webapp_files.gypi| locally to include
  *    the test in the package to expedite local development.  This suppress
  *    is here so that JSCompile won't complain.
@@ skipping 37 matching lines @@
 
 browserTest.init = function() {
   // The domAutomationController is used to communicate progress back to the
   // C++ calling code.  It will only exist if chrome is run with the flag
   // --dom-automation.  It is stubbed out here so that browser test can be run
   // under the regular app.
   browserTest.automationController_ = window.domAutomationController || {
     send: function(json) {
       var result = JSON.parse(json);
       if (result.succeeded) {
-        console.log('Test Passed.');
+        console.log('Test Passed.' +
+            ((result.value !== undefined)? ' Value: ' + result.value :  ''));

[Jamie, 2015/01/06 22:18:52]

Nit: Space before '?'

[kelvinp, 2015/01/09 22:21:30]

Done.

       } else {
         console.error('Test Failed.\n' +
             result.error_message + '\n' + result.stack_trace);
       }
     }
   };
 };
 
 browserTest.expect = function(expr, message) {
   if (!expr) {
@@ skipping 21 matching lines @@
   //    failure.
   debugger;
 
   browserTest.automationController_.send(JSON.stringify({
     succeeded: false,
     error_message: error_message,
     stack_trace: stack_trace
   }));
 };
 
-browserTest.pass = function() {
-  browserTest.automationController_.send(JSON.stringify({
+/**
+ * @param {?} opt_value An optional value to return when the test succeeds.

[Jamie, 2015/01/06 22:18:52]

I think this should be ?=

[kelvinp, 2015/01/09 22:21:30]

Done.

+ */
+browserTest.pass = function(opt_value) {
+   browserTest.automationController_.send(JSON.stringify({
     succeeded: true,
     error_message: '',
-    stack_trace: ''
+    stack_trace: '',
+    value: opt_value
   }));
 };
 
 browserTest.clickOnControl = function(id) {
   var element = document.getElementById(id);
   browserTest.expect(element);
   element.click();
 };
 
 /** @enum {number} */
@@ skipping 51 matching lines @@
     }, function() {
       // On time out.
       return Promise.resolve();
     }).then(function() {
       return browserTest.onUIMode(AppMode.CLIENT_PIN_PROMPT, 10000);
     });
 };
 
 browserTest.disconnect = function() {
   var AppMode = remoting.AppMode;
+  var finished_mode = AppMode.CLIENT_SESSION_FINISHED_ME2ME;
+  var finished_button = 'client-finished-me2me-button';
+  if (remoting.clientSession.getMode() == remoting.ClientSession.Mode.IT2ME) {
+    finished_mode = AppMode.CLIENT_SESSION_FINISHED_IT2ME;
+    finished_button = 'client-finished-it2me-button';
+  }
   remoting.disconnect();
-  return browserTest.onUIMode(AppMode.CLIENT_SESSION_FINISHED_ME2ME).then(
-    function() {
-      browserTest.clickOnControl('client-finished-me2me-button');
-      return browserTest.onUIMode(AppMode.HOME);
-    });
+  return browserTest.onUIMode(finished_mode).then(function() {
+    browserTest.clickOnControl(finished_button);
+    return browserTest.onUIMode(AppMode.HOME);
+  });
 };
 
 browserTest.enterPIN = function(pin, opt_expectError) {
   // Wait for 500ms before hitting the PIN button. From experiment, sometimes
   // the PIN prompt does not dismiss without the timeout.
   var CONNECT_PIN_WAIT = 500;
 
   document.getElementById('pin-entry').value = pin;
 
   return base.Promise.sleep(CONNECT_PIN_WAIT).then(function() {
     browserTest.clickOnControl('pin-connect-button');
   }).then(function() {
     if (opt_expectError) {
       return browserTest.expectMe2MeError(remoting.Error.INVALID_ACCESS_CODE);
     } else {
-      return browserTest.expectMe2MeConnected();
+      return browserTest.expectConnected();
     }
   });
 };
 
 browserTest.expectMe2MeError = function(errorTag) {
   var AppMode = remoting.AppMode;
   var Timeout = browserTest.Timeout;
 
   var onConnected = browserTest.onUIMode(AppMode.IN_SESSION, Timeout.None);
   var onFailure = browserTest.onUIMode(AppMode.CLIENT_CONNECT_FAILED_ME2ME);
@@ skipping 12 matching lines @@
 
     if (actual != expected) {
       return Promise.reject('Unexpected failure. actual:' + actual +
                      ' expected:' + expected);
     }
   });
 
   return Promise.race([onConnected, onFailure]);
 };
 
-browserTest.expectMe2MeConnected = function() {
+browserTest.expectConnected = function() {
   var AppMode = remoting.AppMode;
   // Timeout if the session is not connected within 30 seconds.
   var SESSION_CONNECTION_TIMEOUT = 30000;
   var onConnected = browserTest.onUIMode(AppMode.IN_SESSION,
                                          SESSION_CONNECTION_TIMEOUT);
   var onFailure = browserTest.onUIMode(AppMode.CLIENT_CONNECT_FAILED_ME2ME,
                                        browserTest.Timeout.NONE);
   onFailure = onFailure.then(function() {
     var errorDiv = document.getElementById('connect-error-message');
     var errorMsg = errorDiv.innerText;
@@ skipping 83 matching lines @@
 browserTest.ensureRemoteConnectionEnabled = function(pin) {
   browserTest.ensureHostStartedWithPIN(pin).then(function(){
     browserTest.automationController_.send(true);
   }, function(errorMessage){
     console.error(errorMessage);
     browserTest.automationController_.send(false);
   });
 };
 
 browserTest.init();