MD Settings: Fix and re-enable settings-main tests.

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

 // Copyright 2016 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.
 
 cr.define('settings_main_page', function() {
   /**
    * Extending TestBrowserProxy even though SearchManager is not a browser proxy
    * itself. Essentially TestBrowserProxy can act as a "proxy" for any external
    * dependency, not just "browser proxies" (and maybe should be renamed to
    * TestProxy).
@@ skipping 151 matching lines @@
           Polymer.dom.flush();
           assertTrue(noSearchResults.hidden);
           assertToggleContainerVisible(true);
         });
       });
 
       /**
        * Asserts the visibility of the basic and advanced pages.
        * @param {string} Expected 'display' value for the basic page.
        * @param {string} Expected 'display' value for the advanced page.
+       * @return {!Promise}
        */
       function assertPageVisibility(expectedBasic, expectedAdvanced) {
         Polymer.dom.flush();
         var page = settingsMain.$$('settings-basic-page');
         assertEquals(
-            expectedBasic, page.$$('#basicPage').style.display);
-        assertEquals(
-            expectedAdvanced,
-            page.$$('#advancedPageTemplate').get().style.display);
+            expectedBasic, getComputedStyle(page.$$('#basicPage')).display);
+
+        return page.$$('#advancedPageTemplate').get().then(
+            function(advancedPage) {
+              assertEquals(
+                  expectedAdvanced,
+                  getComputedStyle(advancedPage).display);
+        });
       }
 
       // TODO(michaelpg): It would be better not to drill into
       // settings-basic-page. If search should indeed only work in Settings
       // (as opposed to Advanced), perhaps some of this logic should be
       // delegated to settings-basic-page now instead of settings-main.
 
       /**
        * Asserts the visibility of the basic and advanced pages after exiting
        * search mode.
        * @param {string} Expected 'display' value for the basic page.
        * @param {string} Expected 'display' value for the advanced page.
        * @return {!Promise}
        */
       function assertPageVisibilityAfterSearch(
           expectedBasic, expectedAdvanced) {
         searchManager.setMatchesFound(true);
         return settingsMain.searchContents('Query1').then(function() {
           searchManager.setMatchesFound(false);
           return settingsMain.searchContents('');
         }).then(function() {
-          assertPageVisibility(expectedBasic, expectedAdvanced);
+          return assertPageVisibility(expectedBasic, expectedAdvanced);
         });
       }
 
       test('exiting search mode, advanced collapsed', function() {
         // Simulating searching while the advanced page is collapsed.
         settingsMain.currentRouteChanged(settings.Route.BASIC);
         Polymer.dom.flush();
-        return assertPageVisibilityAfterSearch('', 'none');
+        return assertPageVisibilityAfterSearch('block', 'none');
       });
 
       // Ensure that clearing the search results restores both "basic" and
       // "advanced" page, when the search has been initiated from a subpage
       // whose parent is the "advanced" page.
       test('exiting search mode, advanced expanded', function() {
         settings.navigateTo(settings.Route.SITE_SETTINGS);
         Polymer.dom.flush();
-        return assertPageVisibilityAfterSearch('', '');
+        return assertPageVisibilityAfterSearch('block', 'block');
       });
 
       // Ensure that searching, then entering a subpage, then going back
       // lands the user in a page where both basic and advanced sections are
       // visible, because the page is still in search mode.
       test('returning from subpage to search results', function() {
         settings.navigateTo(settings.Route.BASIC);
         Polymer.dom.flush();
 
         searchManager.setMatchesFound(true);
         return settingsMain.searchContents('Query1').then(function() {
           // Simulate navigating into a subpage.
           settings.navigateTo(settings.Route.SEARCH_ENGINES);
           settingsMain.$$('settings-basic-page').fire('subpage-expand');
           Polymer.dom.flush();
 
           // Simulate clicking the left arrow to go back to the search results.
           settings.navigateTo(settings.Route.BASIC);
-          assertPageVisibility('', '');
+          return assertPageVisibility('block', 'block');
         });
       });
 
       // TODO(michaelpg): Move these to a new test for settings-basic-page.
       test('can collapse advanced on advanced section route', function() {
         settings.navigateTo(settings.Route.PRIVACY);
         Polymer.dom.flush();
 
-        var advancedToggle =
-            getToggleContainer().querySelector('#advancedToggle');
-        assertTrue(!!advancedToggle);
+        var basicPage = settingsMain.$$('settings-basic-page');
+        var advancedPage = null;
+        return basicPage.$$('#advancedPageTemplate').get().then(
+            function(advanced) {
+              advancedPage = advanced;
+              return assertPageVisibility('block', 'block');
+            }).then(function() {
+              var whenHidden = test_util.whenAttributeIs(
+                  advancedPage, 'hidden', true);
 
-        MockInteractions.tap(advancedToggle);
-        Polymer.dom.flush();
+              var advancedToggle =
+                  getToggleContainer().querySelector('#advancedToggle');
+              assertTrue(!!advancedToggle);
+              MockInteractions.tap(advancedToggle);
 
-        assertPageVisibility('', 'none');
+              return whenHidden;
+            }).then(function() {
+              return assertPageVisibility('block', 'none');
+            });
       });
 
       test('navigating to a basic page does not collapse advanced', function() {
         settings.navigateTo(settings.Route.PRIVACY);
         Polymer.dom.flush();
 
         assertToggleContainerVisible(true);
 
         settings.navigateTo(settings.Route.PEOPLE);
         Polymer.dom.flush();
 
-        assertPageVisibility('', '');
+        return assertPageVisibility('block', 'block');
       });
     });
   }
 
   return {
     registerTests: registerTests,
   };
 });