MD Settings: Implementing modal popup/action menus.

chrome/test/data/webui/settings/languages_page_browsertest.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.
 
 /** @fileoverview Suite of tests for settings-languages-page. */
 
 /** @const {string} Path to root from chrome/test/data/webui/settings/. */
 var ROOT_PATH = '../../../../../';
 
 // Polymer BrowserTest fixture.
@@ skipping 35 matching lines @@
   suite('languages page', function() {
     testing.Test.disableAnimationsAndTransitions();
 
     this.toggleAdvanced();
     var advanced = this.getPage('advanced');
 
     var languagesSection;
     var languagesPage;
     var languagesCollapse;
     var languageHelper;
+    var actionMenu;
 
     /**
      * @param {numExpected} Expected number of languages to eventually be
      *     enabled.
      * @return {!Promise} Resolved when the number of enabled languages changes
      *     to match expectations.
      */
     function whenNumEnabledLanguagesBecomes(numExpected) {
       assert(!!languagesPage);
       return new Promise(function(resolve, reject) {
@@ skipping 15 matching lines @@
 
     suiteSetup(function() {
       advanced.set('pageVisibility.languages', true);
       Polymer.dom.flush();
 
       languagesSection = assert(this.getSection(advanced, 'languages'));
       languagesPage = assert(
           languagesSection.querySelector('settings-languages-page'));
       languagesCollapse = languagesPage.$.languagesCollapse;
       languagesCollapse.opened = true;
+      actionMenu = languagesPage.$.menu.get();
 
       languageHelper = languagesPage.languageHelper;
       return languageHelper.whenReady();
     }.bind(this));
 
     teardown(function(done) {
+      if (actionMenu.open)
+        actionMenu.close();
+
       // Close the section if we're in a sub-page.
       if (settings.getCurrentRoute().isSubpage()) {
         settings.navigateTo(settings.Route.BASIC);
         setTimeout(done);
       } else {
         done();
       }
     });
 
     suite('add languages dialog', function() {
@@ skipping 95 matching lines @@
         origTranslateEnabled = languageHelper.prefs.translate.enabled.value;
       });
 
       suiteTeardown(function() {
         var cur = languageHelper.prefs.translate.enabled.value;
         // Restore the value of Translate.
         languageHelper.setPrefValue('translate.enabled', origTranslateEnabled);
         cur = languageHelper.prefs.translate.enabled.value;
       });
 
-      test('structure', function(done) {
+      test('structure', function() {
         var languageOptionsDropdownTrigger = languagesCollapse.querySelector(
             'paper-icon-button');
         assertTrue(!!languageOptionsDropdownTrigger);
         MockInteractions.tap(languageOptionsDropdownTrigger);
-        var languageMenu = assert(languagesPage.$$('cr-shared-menu'));
+        assertTrue(actionMenu.open);
 
-        listenOnce(languageMenu, 'iron-overlay-opened', function() {
-          assertTrue(languageMenu.menuOpen);
+        // Enable Translate so the menu always shows the Translate checkbox.
+        languageHelper.setPrefValue('translate.enabled', true);
 
-          // Enable Translate so the menu always shows the Translate checkbox.
-          languageHelper.setPrefValue('translate.enabled', true);
+        var separator = actionMenu.querySelector('hr');
+        assertEquals(1, separator.offsetHeight);
 
-          var separator = languageMenu.querySelector('hr');
-          assertEquals(1, separator.offsetHeight);
-
-          // Disable Translate. On platforms that can't change the UI language,
-          // this hides all the checkboxes, so the separator isn't needed.
-          // Chrome OS and Windows still show a checkbox and thus the separator.
-          languageHelper.setPrefValue('translate.enabled', false);
-          if (cr.isChromeOS || cr.isWindows)
-            assertEquals(1, separator.offsetHeight);
-          else
-            assertEquals(0, separator.offsetHeight);
-
-          MockInteractions.tap(languageOptionsDropdownTrigger);
-          assertFalse(languageMenu.menuOpen);
-          done();
-        });
+        // Disable Translate. On platforms that can't change the UI language,
+        // this hides all the checkboxes, so the separator isn't needed.
+        // Chrome OS and Windows still show a checkbox and thus the separator.
+        languageHelper.setPrefValue('translate.enabled', false);
+        assertEquals(
+            cr.isChromeOS || cr.isWindows ? 1 : 0, separator.offsetHeight);
       });
 
       test('remove language', function() {
         var numEnabled = languagesPage.languages.enabled.length;
 
         // Enabled a language which we can then disable.
         var newLanguage = getAvailableLanguage();
         languageHelper.enableLanguage(newLanguage.code);
 
         // Wait for the language to be enabled.
         return whenNumEnabledLanguagesBecomes(numEnabled + 1).then(function() {
           // Populate the dom-repeat.
           Polymer.dom.flush();
 
           // Find the new language item.
           var items = languagesCollapse.querySelectorAll('.list-item');
           var domRepeat = assert(
               languagesCollapse.querySelector('template[is="dom-repeat"]'));
           var item = Array.from(items).find(function(el) {
             return domRepeat.itemForElement(el) &&
                 domRepeat.itemForElement(el).language == newLanguage;
           });
 
           // Open the menu and select Remove.
           MockInteractions.tap(item.querySelector('paper-icon-button'));
 
-          var languageMenu = assert(languagesPage.$$('cr-shared-menu'));
-          assertTrue(languageMenu.menuOpen);
-          var removeMenuItem = assert(languageMenu.querySelector(
+          assertTrue(actionMenu.open);
+          var removeMenuItem = assert(actionMenu.querySelector(
               '.dropdown-item:last-child'));
           assertFalse(removeMenuItem.disabled);
           MockInteractions.tap(removeMenuItem);
-          assertFalse(languageMenu.menuOpen);
+          assertFalse(actionMenu.open);
 
           // We should go back down to the original number of enabled languages.
-          return whenNumEnabledLanguagesBecomes(numEnabled).then(function() {
-            assertFalse(languageHelper.isLanguageEnabled(newLanguage.code));
-          });
+          return whenNumEnabledLanguagesBecomes(numEnabled);
+        }).then(function() {
+          assertFalse(languageHelper.isLanguageEnabled(newLanguage.code));
         });
       });
     });
 
     test('manage input methods', function() {
       var inputMethodsCollapse = languagesPage.$.inputMethodsCollapse;
       var inputMethodSettingsExist = !!inputMethodsCollapse;
       if (cr.isChromeOS) {
         assertTrue(inputMethodSettingsExist);
         var manageInputMethodsButton =
@@ skipping 17 matching lines @@
         assertTrue(!!languagesPage.$$('settings-edit-dictionary-page'));
       }
     });
   }.bind(this));
 
   // TODO(michaelpg): Test more aspects of the languages UI.
 
   // Run all registered tests.
   mocha.run();
 });