[MD Settings][MD User Manager] create/manage profile desktop shortcut (Windows only)

chrome/test/data/webui/md_user_manager/create_profile_tests.js

Index: chrome/test/data/webui/md_user_manager/create_profile_tests.js
diff --git a/chrome/test/data/webui/md_user_manager/create_profile_tests.js b/chrome/test/data/webui/md_user_manager/create_profile_tests.js
index ba29a336369ad3e503dd4751a5497b9969408090..cedbadf62c4910464015888828daedc057adcd37 100644
--- a/chrome/test/data/webui/md_user_manager/create_profile_tests.js
+++ b/chrome/test/data/webui/md_user_manager/create_profile_tests.js
@@ -65,8 +65,8 @@ cr.define('user_manager.create_profile_tests', function() {
           // The dropdown menu becomes visible when the checkbox is checked.
           assertFalse(!!createProfileElement.$$('paper-dropdown-menu'));
 
-          // Simulate checking the checkbox.
-          MockInteractions.tap(createProfileElement.$$('paper-checkbox'));
+          // Simulate checking the supervised user checkbox.
+          MockInteractions.tap(createProfileElement.$.makeSupervisedCheckbox);
           Polymer.dom.flush();
 
           // The dropdown menu is visible and is populated with signed in users.
@@ -95,12 +95,18 @@ cr.define('user_manager.create_profile_tests', function() {
       });
 
       test('Create a profile', function() {
+        // Create shortcut checkbox is invisible.
+        var createShortcutCheckbox =
+            createProfileElement.$.createShortcutCheckbox;
+        assertTrue(createShortcutCheckbox.clientHeight == 0);
+
         // Simulate clicking 'Create'.
         MockInteractions.tap(createProfileElement.$.save);
 
         return browserProxy.whenCalled('createProfile').then(function(args) {
           assertEquals('profile name', args.profileName);
           assertEquals('icon1.png', args.profileIconUrl);
+          assertFalse(args.createShortcut);
           assertFalse(args.isSupervised);
           assertEquals('', args.supervisedUserId);
           assertEquals('', args.custodianProfilePath);
@@ -108,8 +114,8 @@ cr.define('user_manager.create_profile_tests', function() {
       });
 
       test('Has to select a custodian for the supervised profile', function() {
-        // Simulate checking the checkbox.
-        MockInteractions.tap(createProfileElement.$$('paper-checkbox'));
+        // Simulate checking the supervised user checkbox.
+        MockInteractions.tap(createProfileElement.$.makeSupervisedCheckbox);
         Polymer.dom.flush();
 
         // Simulate clicking 'Create'.
@@ -128,8 +134,8 @@ cr.define('user_manager.create_profile_tests', function() {
       });
 
       test('Supervised profile name is duplicate (on the device)', function() {
-        // Simulate checking the checkbox.
-        MockInteractions.tap(createProfileElement.$$('paper-checkbox'));
+        // Simulate checking the supervised user checkbox.
+        MockInteractions.tap(createProfileElement.$.makeSupervisedCheckbox);
         Polymer.dom.flush();
 
         // There is an existing supervised user with this name on the device.
@@ -159,8 +165,8 @@ cr.define('user_manager.create_profile_tests', function() {
       });
 
       test('Supervised profile name is duplicate (remote)', function() {
-        // Simulate checking the checkbox.
-        MockInteractions.tap(createProfileElement.$$('paper-checkbox'));
+        // Simulate checking the supervised user checkbox.
+        MockInteractions.tap(createProfileElement.$.makeSupervisedCheckbox);
         Polymer.dom.flush();
 
         // There is an existing supervised user with this name on the device.
@@ -192,8 +198,8 @@ cr.define('user_manager.create_profile_tests', function() {
       test('Displays error if custodian has no supervised users', function() {
         browserProxy.setExistingSupervisedUsers([]);
 
-        // Simulate checking the checkbox.
-        MockInteractions.tap(createProfileElement.$$('paper-checkbox'));
+        // Simulate checking the supervised user checkbox.
+        MockInteractions.tap(createProfileElement.$.makeSupervisedCheckbox);
         Polymer.dom.flush();
 
         // Select the first signed in user.
@@ -220,8 +226,8 @@ cr.define('user_manager.create_profile_tests', function() {
       });
 
       test('Create supervised profile', function() {
-        // Simulate checking the checkbox.
-        MockInteractions.tap(createProfileElement.$$('paper-checkbox'));
+        // Simulate checking the supervised user checkbox.
+        MockInteractions.tap(createProfileElement.$.makeSupervisedCheckbox);
         Polymer.dom.flush();
 
         // Select the first signed in user.
@@ -235,6 +241,7 @@ cr.define('user_manager.create_profile_tests', function() {
         return browserProxy.whenCalled('createProfile').then(function(args) {
           assertEquals('profile name', args.profileName);
           assertEquals('icon1.png', args.profileIconUrl);
+          assertFalse(args.createShortcut);
           assertTrue(args.isSupervised);
           assertEquals('', args.supervisedUserId);
           assertEquals('path/to/profile', args.custodianProfilePath);
@@ -410,8 +417,8 @@ cr.define('user_manager.create_profile_tests', function() {
         return browserProxy.whenCalled('getSignedInUsers').then(function() {
           assertEquals(0, createProfileElement.signedInUsers_.length);
 
-          // Simulate checking the checkbox.
-          MockInteractions.tap(createProfileElement.$$('paper-checkbox'));
+          // Simulate checking the supervised user checkbox.
+          MockInteractions.tap(createProfileElement.$.makeSupervisedCheckbox);
           Polymer.dom.flush();
 
           // The dropdown menu is not visible when there are no signed in users.
@@ -427,6 +434,79 @@ cr.define('user_manager.create_profile_tests', function() {
         assertTrue(createProfileElement.$.save.disabled);
       });
     });
+
+    suite('CreateProfileTestsProfileShortcutsEnabled', function() {
+      setup(function() {
+        browserProxy = new TestProfileBrowserProxy();
+        // Replace real proxy with mock proxy.
+        signin.ProfileBrowserProxyImpl.instance_ = browserProxy;
+        browserProxy.setDefaultProfileInfo({name: 'profile name'});
+        browserProxy.setIcons([{url: 'icon1.png', label: 'icon1'}]);
+
+        // Enable profile shortcuts feature.
+        loadTimeData.overrideValues({
+          profileShortcutsEnabled: true,
+        });
+
+        createProfileElement = createElement();
+
+        // Make sure DOM is up to date.
+        Polymer.dom.flush();
+      });
+
+      teardown(function(done) {

[tommycli, 2016/11/15 01:59:50]

Somewhat beyond the scope of this patch: But why is it important to remove the
element and wait for async tasks?

In settings tests, the whole body is cleared and the element is appended on
setup:
https://cs.chromium.org/chromium/src/chrome/test/data/webui/settings/people_p...

Not a deal breaker, just curious

[Moe, 2016/11/15 16:03:10]

PolymerTest.clearBody() should eliminate the need to remove the element at the
end of the test. But shouldn't it be done at teardown instead of setup? It's
possible to have a behavior on detach that throws an error.
As for allowing async tasks to finish, it was michaelpg@'s idea to add this to
the user manager tests. I don't fully remember the context, but i think there
was an error in an async task that would appear in the logs as if it was
happening in the next tests. By adding this line, we were able to see where the
error was actually happening.

[tommycli, 2016/11/15 16:18:37]

Ah okay! That is a very good explanation. Thanks for the education!

+        createProfileElement.remove();
+        // Allow asynchronous tasks to finish.
+        setTimeout(done);
+      });
+
+      test('Create profile without shortcut', function() {
+        // Create shortcut checkbox is visible.
+        var createShortcutCheckbox =
+            createProfileElement.$.createShortcutCheckbox;
+        assertTrue(createShortcutCheckbox.clientHeight > 0);
+
+        // Create shortcut checkbox is unchecked.
+        assertFalse(createShortcutCheckbox.checked);

[tommycli, 2016/11/15 01:59:50]

I am surprised it's unchecked by default, as stated in prev. comment

[Moe, 2016/11/15 16:03:10]

Done.

+
+        // Simulate clicking 'Create'.
+        MockInteractions.tap(createProfileElement.$.save);
+
+        return browserProxy.whenCalled('createProfile').then(function(args) {
+          assertEquals('profile name', args.profileName);
+          assertEquals('icon1.png', args.profileIconUrl);
+          assertFalse(args.createShortcut);
+          assertFalse(args.isSupervised);
+          assertEquals('', args.supervisedUserId);
+          assertEquals('', args.custodianProfilePath);
+        });
+      });
+
+      test('Create profile with shortcut', function() {
+        // Create shortcut checkbox is visible.
+        var createShortcutCheckbox =
+            createProfileElement.$.createShortcutCheckbox;
+        assertTrue(createShortcutCheckbox.clientHeight > 0);
+
+        // Create shortcut checkbox is unchecked.
+        assertFalse(createShortcutCheckbox.checked);
+
+        // Simulate checking the create shortcut checkbox.
+        MockInteractions.tap(createShortcutCheckbox);
+
+        // Simulate clicking 'Create'.
+        MockInteractions.tap(createProfileElement.$.save);
+
+        return browserProxy.whenCalled('createProfile').then(function(args) {
+          assertEquals('profile name', args.profileName);
+          assertEquals('icon1.png', args.profileIconUrl);
+          assertTrue(args.createShortcut);
+          assertFalse(args.isSupervised);
+          assertEquals('', args.supervisedUserId);
+          assertEquals('', args.custodianProfilePath);
+        });
+      });
+    });

[tommycli, 2016/11/15 01:59:50]

Nice test!

   }
 
   return {