Improve apps v2 upgrade UX

remoting/webapp/unittests/apps_v2_migration_unittest.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.
+
+(function() {
+
+'use strict';
+
+var mockIsAppsV2 = null;
+var mockChromeStorage = {};
+
+function pass() {
+  ok(true);
+  QUnit.start();
+}
+
+function fail() {
+  ok(false);
+  QUnit.start();
+}
+
+/**
+ * @param {string} v1UserName
+ * @param {string} v1UserEmail
+ * @param {string} currentEmail
+ * @param {boolean} v1HasHost
+ */
+function setMigrationData_(v1UserName, v1UserEmail, currentEmail,
+                           v1HasHosts) {
+  remoting.identity.getUserInfo = function(onDone, onError) {

[Jamie, 2015/01/21 22:02:20]

You're overriding this without restoring it at the end of the test.

[kelvinp, 2015/01/22 02:10:55]

remoting.identity is null to begin with, and we are restoring it back to null

+    if (base.isAppsV2()) {
+      return onDone(currentEmail);

[Jamie, 2015/01/21 22:02:20]

No need for "return", and you should specify a dummy fullName as well, since the
function expects one.

[kelvinp, 2015/01/22 02:10:55]

Done.

+    } else {
+      return onDone(v1UserEmail, v1UserName);
+    }
+  };
+
+  mockIsAppsV2.returns(false);
+  if (v1HasHosts) {
+    remoting.AppsV2Migration.savePreferences();
+  }
+}
+
+module('AppsV2Migration', {
+  setup: function() {
+    chromeMocks.activate(['storage']);
+    mockIsAppsV2 = sinon.stub(base, 'isAppsV2');
+    remoting.identity = {};
+  },
+  teardown: function() {
+    chromeMocks.restore();
+    mockIsAppsV2.restore();
+    remoting.identity = null;
+  }
+});
+
+QUnit.asyncTest(
+  'hasHostsInV1App() should reject the promise if v1 user has same identity',
+  function() {
+    setMigrationData_('v1userName', 'v2user@gmail.com', 'v2user@gmail.com',
+                      true);
+    mockIsAppsV2.returns(true);
+    remoting.AppsV2Migration.hasHostsInV1App().then(fail, pass);
+});
+
+QUnit.asyncTest(
+  'hasHostsInV1App() should reject the promise if v1 user has no hosts',
+  function() {
+    setMigrationData_('v1userName', 'v1user@gmail.com', 'v2user@gmail.com',
+                      false);
+    mockIsAppsV2.returns(true);
+    remoting.AppsV2Migration.hasHostsInV1App().then(fail, pass);
+});
+
+QUnit.asyncTest(
+  'hasHostsInV1App() should reject the promise in v1', function() {
+    setMigrationData_('v1userName', 'v1user@gmail.com', 'v2user@gmail.com',
+                      true);
+    mockIsAppsV2.returns(false);
+    remoting.AppsV2Migration.hasHostsInV1App().then(fail, pass);
+});
+
+QUnit.asyncTest(
+  'hasHostsInV1App() should return v1 identity if v1 user has hosts',
+  function() {
+    setMigrationData_('v1userName', 'v1user@gmail.com', 'v2user@gmail.com',
+                      true);
+    mockIsAppsV2.returns(true);
+    remoting.AppsV2Migration.hasHostsInV1App().then(
+      function(result) {
+        QUnit.equal(result.email, 'v1user@gmail.com');
+        QUnit.equal(result.fullName, 'v1userName');
+        pass();
+      }, fail
+    );
+});
+
+QUnit.asyncTest(
+  'savePreferences() should clear the preferences on v2',
+  function() {
+    setMigrationData_('v1userName', 'v1user@gmail.com', 'v2user@gmail.com',
+                      true);
+    mockIsAppsV2.returns(true);
+    remoting.AppsV2Migration.savePreferences(true);
+    remoting.AppsV2Migration.hasHostsInV1App().then(fail, pass);
+});
+
+})();