Site Settings Desktop: Switch out paper-menu for iron-dropdown.

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

 // Copyright 2015 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 site-list. */
 cr.define('site_list', function() {
   function registerTests() {
     suite('SiteList', function() {
       /**
        * A site list element created before each test.
@@ skipping 309 matching lines @@
       });
 
       /**
        * Fetch the non-hidden menu items from the list.
        * @param {!HTMLElement} parentElement
        * @param {number} index The index of the child element (which site) to
        *     fetch.
        */
       function getMenuItems(listContainer, index) {
         return listContainer.children[index].querySelectorAll(
-            'paper-menu-button paper-item:not([hidden])');
+            'iron-dropdown div button:not([hidden])');

[dpapad, 2016/10/04 20:58:44]

Does this selector have to be so specific? How about

'iron-dropdown .dropdown-item:not([hidden])'

[Finnur, 2016/10/05 10:29:43]

Works for me.

       }
 
       /**
+       * Opens the context menu for a particular element in the list.
+       * @param {number} index The index of the child element (which site) to
+       *     open the context menu for.
+       */
+      function openContextMenu(index) {

[dpapad, 2016/10/04 20:58:44]

Nit: We've been trying to establish the term "action" menu, for all the menus
that open when clicking on a dots icon.

[Finnur, 2016/10/05 10:29:43]

Done.

+        var item = testElement.$.listContainer.children[index];
+        var dots = item.querySelector('paper-icon-button');
+        MockInteractions.tap(dots);
+        Polymer.dom.flush();
+      }
+
+      /**
        * Asserts the menu looks as expected.
        * @param {Array<string>} items The items expected to show in the menu.
        * @param {!HTMLElement} parentElement The parent node to start looking
        *     in.
        */
       function assertMenu(items, parentElement) {
         var menuItems = getMenuItems(parentElement.$.listContainer, 0);
         assertEquals(items.length, menuItems.length);
         for (var i = 0; i < items.length; i++)
           assertEquals(items[i], menuItems[i].textContent.trim());
@@ skipping 65 matching lines @@
             function(contentType) {
               assertEquals(
                   settings.ContentSettingsTypes.GEOLOCATION, contentType);
 
               assertEquals(2, testElement.sites.length);
               assertEquals(prefs.exceptions.geolocation[1].origin,
                   testElement.sites[0].origin);
               assertEquals(
                   settings.PermissionValues.ALLOW, testElement.categorySubtype);
               Polymer.dom.flush();  // Populates action menu.
+              openContextMenu(0);
               assertMenu(['Block', 'Remove'], testElement);
               assertEquals('Allow - 2', testElement.$.header.innerText.trim());
 
               // Site list should show, no matter what category default is set
               // to.
               assertFalse(testElement.$.category.hidden);
               browserProxy.resetResolver('getExceptionList');
               testElement.categoryEnabled = false;
               return browserProxy.whenCalled('getExceptionList');
             }).then(function(contentType) {
@@ skipping 11 matching lines @@
               assertEquals(
                   settings.ContentSettingsTypes.GEOLOCATION, contentType);
 
               assertEquals(2, testElement.sites.length);
               assertEquals(prefs.exceptions.geolocation[3].origin,
                   testElement.sites[0].origin);
 
               assertEquals(
                   settings.PermissionValues.BLOCK, testElement.categorySubtype);
               Polymer.dom.flush();  // Populates action menu.
+              openContextMenu(0);
               assertMenu(['Allow', 'Remove'], testElement);
               assertEquals('Block - 2', testElement.$.header.innerText.trim());
 
               // Site list should only show when category default is enabled.
               assertFalse(testElement.$.category.hidden);
               browserProxy.resetResolver('getExceptionList');
               testElement.categoryEnabled = false;
               return browserProxy.whenCalled('getExceptionList');
             }).then(function(contentType) {
               assertTrue(testElement.$.category.hidden);
             });
       });
 
       test('initial SESSION ONLY state is correct', function() {
         setupCategory(settings.ContentSettingsTypes.COOKIES,
             settings.PermissionValues.SESSION_ONLY, prefsSessionOnly);
         return browserProxy.whenCalled('getExceptionList').then(
             function(contentType) {
               assertEquals(
                   settings.ContentSettingsTypes.COOKIES, contentType);
 
               assertEquals(1, testElement.sites.length);
               assertEquals(prefsSessionOnly.exceptions.cookies[2].origin,
                   testElement.sites[0].origin);
 
               assertEquals(settings.PermissionValues.SESSION_ONLY,
                   testElement.categorySubtype);
               Polymer.dom.flush();  // Populates action menu.
+              openContextMenu(0);
               assertMenu(['Allow', 'Block', 'Remove'], testElement);
               assertEquals('Clear on exit - 1',
                   testElement.$.header.innerText.trim());
 
               // Site list should show, no matter what category default is set
               // to.
               assertFalse(testElement.$.category.hidden);
               browserProxy.resetResolver('getExceptionList');
               testElement.categoryEnabled = false;
               return browserProxy.whenCalled('getExceptionList');
@@ skipping 10 matching lines @@
             function(contentType) {
               assertEquals(settings.ContentSettingsTypes.COOKIES, contentType);
 
               assertEquals(1, testElement.sites.length);
               assertEquals(prefsIncognito.exceptions.cookies[0].origin,
                   testElement.sites[0].origin);
 
               assertEquals(settings.PermissionValues.BLOCK,
                   testElement.categorySubtype);
               Polymer.dom.flush();  // Populates action menu.
+              openContextMenu(0);
               // 'Clear on exit' is visible as this is not an incognito item.
               assertMenu(['Allow', 'Clear on exit', 'Remove'], testElement);
               assertEquals('Block - 1',
                   testElement.$.header.innerText.trim());
 
               // Select 'Remove from menu'.
               var menuItems = getMenuItems(testElement.$.listContainer, 0);
               assertTrue(!!menuItems);
               MockInteractions.tap(menuItems[2]);
               return browserProxy.whenCalled(
@@ skipping 16 matching lines @@
 
               assertEquals(2, testElement.sites.length);
               assertEquals(prefsIncognito.exceptions.cookies[2].origin,
                   testElement.sites[0].origin);
               assertEquals(prefsIncognito.exceptions.cookies[1].origin,
                   testElement.sites[1].origin);
 
               assertEquals(settings.PermissionValues.ALLOW,
                   testElement.categorySubtype);
               Polymer.dom.flush();  // Populates action menu.
+              openContextMenu(0);
               // 'Clear on exit' is hidden for incognito items.
               assertMenu(['Block', 'Remove'], testElement);
               assertEquals('Allow - 2',
                   testElement.$.header.innerText.trim());
 
               // Select 'Remove' from menu on 'foo.com'.
+              openContextMenu(1);
               var menuItems = getMenuItems(testElement.$.listContainer, 1);
               assertTrue(!!menuItems);
               MockInteractions.tap(menuItems[1]);
               return browserProxy.whenCalled(
                   'resetCategoryPermissionForOrigin');
             }).then(function(args) {
               assertEquals('http://foo.com', args[0]);
               assertEquals('http://foo.com', args[1]);
               assertEquals(settings.ContentSettingsTypes.COOKIES, args[2]);
               assertTrue(args[3]);  // Incognito.
@@ skipping 212 matching lines @@
             });
       });
 
       test('Select menu item', function() {
         // Test for error: "Cannot read property 'origin' of undefined".
         setupCategory(settings.ContentSettingsTypes.GEOLOCATION,
             settings.PermissionValues.ALLOW, prefs);
         return browserProxy.whenCalled('getExceptionList').then(function(
             contentType) {
           Polymer.dom.flush();
+          openContextMenu(0);
           var menuItems = getMenuItems(testElement.$.listContainer, 0);
           assertTrue(!!menuItems);
           MockInteractions.tap(menuItems[0]);
           return browserProxy.whenCalled('setCategoryPermissionForOrigin');
         });
       });
 
       test('Chrome Extension scheme', function() {
         setupCategory(settings.ContentSettingsTypes.JAVASCRIPT,
             settings.PermissionValues.BLOCK, prefsChromeExtension);
@@ skipping 13 matching lines @@
           assertEquals(settings.ContentSettingsTypes.JAVASCRIPT, args[2]);
           assertEquals('allow', args[3]);
         });
       });
     });
   }
   return {
     registerTests: registerTests,
   };
 });