[MD Extensions]: Fix sidebar icons

sidebar.html relied on iron-icons but didn't include them. Add the missing import and a general regression test. BUG=529395 BUG=609424 CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:closure_compilation Review-Url: https://codereview.chromium.org/1951323002 Cr-Commit-Position: refs/heads/master@{#391905}
mirror · May 5, 2016 · 9ad53bd · 9ad53bd
1 parent ffd6d84
commit 9ad53bd
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 0 deletions.
diff --git a/chrome/browser/resources/md_extensions/detail_view.html b/chrome/browser/resources/md_extensions/detail_view.html
@@ -1,6 +1,7 @@
 <link rel="import" href="chrome://resources/html/cr.html">
 <link rel="import" href="chrome://resources/html/polymer.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classes/iron-flex-layout.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-checkbox.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">

diff --git a/chrome/browser/resources/md_extensions/sidebar.html b/chrome/browser/resources/md_extensions/sidebar.html
@@ -1,6 +1,7 @@
 <link rel="import" href="chrome://resources/html/cr.html">
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-checkbox.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.html">

diff --git a/chrome/test/data/webui/extensions/extension_detail_view_test.js b/chrome/test/data/webui/extensions/extension_detail_view_test.js
@@ -49,6 +49,9 @@ cr.define('extension_detail_view_tests', function() {
 
       test(assert(TestNames.Layout), function() {
         Polymer.dom.flush();
+
+        extension_test_util.testIronIcons(item);
+
         var testIsVisible = extension_test_util.isVisible.bind(null, item);
         expectTrue(testIsVisible('#close-button'));
         expectTrue(testIsVisible('#open-in-webstore'));

diff --git a/chrome/test/data/webui/extensions/extension_sidebar_test.js b/chrome/test/data/webui/extensions/extension_sidebar_test.js
@@ -59,6 +59,8 @@ cr.define('extension_sidebar_tests', function() {
       });
 
       test(assert(TestNames.Layout), function() {
+        extension_test_util.testIronIcons(sidebar);
+
         var testVisible = extension_test_util.testVisible.bind(null, sidebar);
         testVisible('#load-unpacked', false);
         testVisible('#pack-extensions', false);

diff --git a/chrome/test/data/webui/extensions/extension_test_util.js b/chrome/test/data/webui/extensions/extension_test_util.js
@@ -124,11 +124,25 @@ cr.define('extension_test_util', function() {
     }, opt_properties);
   }
 
+  /**
+   * Tests that any iron-icon child of an HTML element has a corresponding
+   * non-empty svg element.
+   * @param {HTMLElement} e The element to check the iron icons in.
+   */
+  function testIronIcons(e) {
+    e.querySelectorAll('* /deep/ iron-icon').forEach(function(icon) {
+      var svg = icon.$$('svg');
+      expectTrue(!!svg && svg.innerHTML != '',
+                 'icon "' + icon.icon + '" is not present');
+    });
+  }
+
   return {
     ClickMock: ClickMock,
     MockItemDelegate: MockItemDelegate,
     isVisible: isVisible,
     testVisible: testVisible,
     createExtensionInfo: createExtensionInfo,
+    testIronIcons: testIronIcons,
   };
 });