Use one instance of language settings detail menu for all languages

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 33 matching lines @@
 // Runs languages page tests.
 TEST_F('SettingsLanguagesPageBrowserTest', 'MAYBE_LanguagesPage', function() {
   suite('languages page', function() {
     testing.Test.disableAnimationsAndTransitions();
 
     this.toggleAdvanced();
     var advanced = this.getPage('advanced');
 
     var languagesSection;
     var languagesPage;
+    var languagesCollapse;
     var languageHelper;
 
     /**
      * @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);
@@ skipping 11 matching lines @@
     function getAvailableLanguage() {
       return languagesPage.languages.supported.find(function(language) {
         return !languageHelper.isLanguageEnabled(language.code);
       });
     }
 
     suiteSetup(function() {
       advanced.set('pageVisibility.languages', true);
       Polymer.dom.flush();
 
-      languagesSection = this.getSection(advanced, 'languages');
-      assertTrue(!!languagesSection);
-      languagesPage = languagesSection.querySelector('settings-languages-page');
-      assertTrue(!!languagesPage);
+      languagesSection = assert(this.getSection(advanced, 'languages'));
+      languagesPage = assert(
+          languagesSection.querySelector('settings-languages-page'));
+      languagesCollapse = languagesPage.$.languagesCollapse;
 
       languageHelper = languagesPage.languageHelper;
       return languageHelper.whenReady();
     }.bind(this));
 
     teardown(function(done) {
       // 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() {
       var dialog;
       var dialogItems;
       var cancelButton;
       var actionButton;
 
       setup(function(done) {
-        var addLanguagesButton = languagesPage.$.languagesCollapse
-            .querySelector('.list-button:last-of-type');
+        var addLanguagesButton =
+            languagesCollapse.querySelector('.list-button:last-of-type');
         MockInteractions.tap(addLanguagesButton);
 
         // The page stamps the dialog and registers listeners asynchronously.
         Polymer.Base.async(function() {
           dialog = languagesPage.$$('settings-add-languages-dialog');
           assertTrue(!!dialog);
 
           actionButton = assert(dialog.$$('.action-button'));
           cancelButton = assert(dialog.$$('.cancel-button'));
 
@@ skipping 61 matching lines @@
 
         // The action button should close and remove the dialog, enabling the
         // checked languages.
         MockInteractions.tap(actionButton);
 
         // Wait for the languages to be enabled by the browser.
         return whenNumEnabledLanguagesBecomes(numEnabled + 2);
       });
     });
 
-    test('Should not set UI language', function() {
-      var languagesCollapse = languagesPage.$.languagesCollapse;
+    test('should not set UI language', function() {
       var languageOptionsDropdownTrigger = languagesCollapse.querySelector(
           'paper-icon-button');
       assertTrue(!!languageOptionsDropdownTrigger);
 
       // This shouldn't get called.
       languageHelper.setUILanguage = assertNotReached;
 
+      // Tap the menu trigger twice to open and close the menu.
       MockInteractions.tap(languageOptionsDropdownTrigger);
+      MockInteractions.tap(languageOptionsDropdownTrigger);
+
+      languageHelper.setUILanguage = languageHelper.__proto__.setUILanguage;
     });
 
     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 languagesCollapse = languagesPage.$.languagesCollapse;
         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 removeMenuItem = assert(item.querySelector(
-            '.dropdown-content .dropdown-item:last-of-type'));
+
+        var languageMenu = assert(languagesPage.$$('cr-shared-menu'));
+        assertTrue(languageMenu.menuOpen);
+        var removeMenuItem = assert(languageMenu.querySelector(
+            '.dropdown-item:last-of-type'));
         assertFalse(removeMenuItem.disabled);
         MockInteractions.tap(removeMenuItem);
+        assertFalse(languageMenu.menuOpen);
 
         // We should go back down to the original number of enabled languages.
         return whenNumEnabledLanguagesBecomes(numEnabled).then(function() {
           assertFalse(languageHelper.isLanguageEnabled(newLanguage.code));
         });
       });
     });
 
     test('language detail', function() {
-      var languagesCollapse = languagesPage.$.languagesCollapse;
-      var languageDetailMenuItem = languagesCollapse.querySelectorAll(
-          '.dropdown-content .dropdown-item')[2];
-      assertTrue(!!languageDetailMenuItem);
+      var languageOptionsDropdownTrigger = languagesCollapse.querySelector(
+          'paper-icon-button');
+      MockInteractions.tap(languageOptionsDropdownTrigger);
+      var languageDetailMenuItem = languagesPage.root.querySelectorAll(
+          'cr-shared-menu .dropdown-item')[2];
       MockInteractions.tap(languageDetailMenuItem);
 
       var languageDetailPage =
           languagesPage.$$('settings-language-detail-page');
       assertTrue(!!languageDetailPage);
       assertEquals('en-US', languageDetailPage.detail.language.code);
     });
 
     test('manage input methods', function() {
       var inputMethodsCollapse = languagesPage.$.inputMethodsCollapse;
@@ skipping 21 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();
 });