[MD settings] redesign of side nav

chrome/test/data/webui/settings/settings_menu_test.js

Index: chrome/test/data/webui/settings/settings_menu_test.js
diff --git a/chrome/test/data/webui/settings/settings_menu_test.js b/chrome/test/data/webui/settings/settings_menu_test.js
index f2a3f0022168fafe6e8b4bc8f75ea134f0e38ba9..efb855479e087aaef8fb2475f7a9d85212c44a85 100644
--- a/chrome/test/data/webui/settings/settings_menu_test.js
+++ b/chrome/test/data/webui/settings/settings_menu_test.js
@@ -12,39 +12,37 @@ cr.define('settings_menu', function() {
       setup(function() {
         PolymerTest.clearBody();
         settingsMenu = document.createElement('settings-menu');
+        settingsMenu.currentRoute = {
+          page: 'basic', section: '', subpage: []
+        };
         document.body.appendChild(settingsMenu);
       });
 
       teardown(function() { settingsMenu.remove(); });
 
+      test('openAdvanced', function() {
+        settingsMenu.fire('toggle-advanced-page', true);
+        return Promise.resolve().then(function() {

[Dan Beam, 2016/06/02 01:28:20]

what is this Promise.resolve() voodoo?

[dschuyler, 2016/06/02 23:23:55]

Done.

+          assertTrue(settingsMenu.$.advancedPage.opened);
+        });
+      });
+
       test('upAndDownIcons', function() {
+        return;

[Dan Beam, 2016/06/02 01:28:20]

wat

[dschuyler, 2016/06/02 23:23:55]

Done.

         // There should be different icons for a top level menu being open
         // vs. being closed. E.g. arrow-drop-up and arrow-drop-down.
-        settingsMenu.currentRoute = {
-          page: 'advanced', section: 'reset', subpage: []
-        };
+        settingsMenu.fire('toggle-advanced-page', true);
         var ironIconElement = settingsMenu.$.advancedPage.querySelector(
             '.menu-trigger iron-icon');
         assertTrue(!!ironIconElement);
-        var openIcon = ironIconElement.icon;
-        assertTrue(!!openIcon);
-        // Changing to basic will close advanced.
-        settingsMenu.currentRoute = {page: 'basic', section: '', subpage: []};
-        assertNotEquals(openIcon, ironIconElement.icon);
-      });
-
-      test('defaultToBasic', function() {
-        settingsMenu.currentRoute = {page: 'basic', section: '', subpage: []};
-        assertFalse(settingsMenu.$.advancedPage.opened);
-        assertTrue(settingsMenu.$.basicPage.opened);
-      });
-
-      test('openAdvanced', function() {
-        settingsMenu.currentRoute = {
-          page: 'advanced', section: '', subpage: []
-        };
-        assertTrue(settingsMenu.$.advancedPage.opened);
-        assertFalse(settingsMenu.$.basicPage.opened);
+        var openIcon;
+        return Promise.resolve().then(function() {
+          openIcon = ironIconElement.icon;
+          assertTrue(!!openIcon);
+          settingsMenu.fire('toggle-advanced-page', false);
+       }).then(function() {

[Dan Beam, 2016/06/02 01:39:57]

indent off

[dschuyler, 2016/06/02 23:23:55]

Done.

+          assertNotEquals(openIcon, ironIconElement.icon);
+        });
       });
 
       test('openResetSection', function() {
@@ -52,8 +50,6 @@ cr.define('settings_menu', function() {
           page: 'advanced', section: 'reset', subpage: []
         };
         var advancedPage = settingsMenu.$.advancedPage;
-        assertTrue(advancedPage.opened);
-        assertFalse(settingsMenu.$.basicPage.opened);
         assertEquals('reset',
             advancedPage.querySelector('paper-menu').selected);
       });