Implement browser test for It2Me

remoting/webapp/browser_test/browser_test.js

Index: remoting/webapp/browser_test/browser_test.js
diff --git a/remoting/webapp/browser_test/browser_test.js b/remoting/webapp/browser_test/browser_test.js
index a35e57d24ce014b7c4f5a648407ddccebf3f8abb..cb7908c8154c8a31b53b4e2fc3e625eba93e076d 100644
--- a/remoting/webapp/browser_test/browser_test.js
+++ b/remoting/webapp/browser_test/browser_test.js
@@ -55,7 +55,8 @@ browserTest.init = function() {
     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);
@@ -97,11 +98,15 @@ browserTest.fail = function(error) {
   }));
 };
 
-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
   }));
 };
 
@@ -173,12 +178,17 @@ browserTest.connectMe2Me = function() {
 
 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) {
@@ -194,7 +204,7 @@ browserTest.enterPIN = function(pin, opt_expectError) {
     if (opt_expectError) {
       return browserTest.expectMe2MeError(remoting.Error.INVALID_ACCESS_CODE);
     } else {
-      return browserTest.expectMe2MeConnected();
+      return browserTest.expectConnected();
     }
   });
 };
@@ -227,7 +237,7 @@ browserTest.expectMe2MeError = function(errorTag) {
   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;