MD Settings: Fix <select> search highlighting.

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

Index: chrome/test/data/webui/settings/search_settings_test.js
diff --git a/chrome/test/data/webui/settings/search_settings_test.js b/chrome/test/data/webui/settings/search_settings_test.js
new file mode 100644
index 0000000000000000000000000000000000000000..7dde2509f661d32950af896040c9aa52ab08e65d
--- /dev/null
+++ b/chrome/test/data/webui/settings/search_settings_test.js
@@ -0,0 +1,95 @@
+// 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_test', function() {
+  var searchManager = settings.getSearchManager();
+
+  suite('SearchSettingsTest', function() {
+    setup(function() {
+      PolymerTest.clearBody();
+    });
+
+    /*

[Dan Beam, 2016/10/27 21:24:53]

/**

[dpapad, 2016/10/27 21:35:37]

Done. Technically this is only needed if you have @ annotations, AFAIU.

+     * Test that the DOM of a node is modified as expected when a search hit
+     * occurs within that node.
+     */
+    test('normal highlighting', function() {
+      var textBefore = 'FooSettingsFoo';
+      var htmlBefore = document.body.innerHTML =

[Dan Beam, 2016/10/27 21:24:53]

why are you changing document.body's innerHTML rather than making a new element
and changing its innerHTML?

[dpapad, 2016/10/27 21:35:37]

Removed. It was an accidental leftover of a previous version of the code.

+          `<settings-section hidden-by-search>

[Dan Beam, 2016/10/27 21:24:53]

why are you adding hidden-by-search and checking it rather than just checking
assertFalse(section.hiddenbySearch) after searching?

[dpapad, 2016/10/27 21:35:37]

Well, for two reasons.
a) If I don't add it, then how can I be sure that it was added and removed VS
never added? Pre-emptively adding it ensures that it is in fact removed by the
code being tested.
b) assertTrue(section.hiddenBySearch), ensures that settings_section.html was
actually loaded as a Polymer element. In a previous patch, I accidentally used a
wrong browserPreload path (settings_main/settings_section.html), and the test
still passed (because I was only checking for
assertFalse(section.hiddenBySearch), which passed on an unknown to the browser
<settings-section> element (no shadow DOM).

+             <div id="mydiv">${textBefore}</div>
+          </settings-section>`;
+
+      document.body.innerHTML = htmlBefore;

[Dan Beam, 2016/10/27 21:24:53]

what is all this assignment devilry?

[dpapad, 2016/10/27 21:35:37]

Fixed.

+
+      var section = document.querySelector('settings-section');
+      var div = section.queryEffectiveChildren('#mydiv');
+
+      assertTrue(section.hiddenBySearch);
+      return searchManager.search('settings', section).then(function() {
+        assertFalse(section.hiddenBySearch);
+
+        var highlighWrapper = div.querySelector('.search-highlight-wrapper');
+        assertTrue(!!highlighWrapper);
+
+        var originalContent = highlighWrapper.querySelector(
+            '.search-highlight-original-content');
+        assertTrue(!!originalContent);
+        assertEquals(textBefore, originalContent.textContent);
+
+        var searchHits = highlighWrapper.querySelectorAll(
+            '.search-highlight-hit');
+        assertEquals(1, searchHits.length);
+        assertEquals('Settings', searchHits[0].textContent);
+
+        // Check that original DOM structure is restored when search
+        // highlights are cleared.
+        return searchManager.search('', section);
+      }).then(function() {
+        assertEquals(0, div.children.length);
+        assertEquals(textBefore, div.textContent);
+      });
+    });
+
+
+    /*

[Dan Beam, 2016/10/27 21:24:53]

same

[dpapad, 2016/10/27 21:35:37]

Done.

+     * Tests that a search hit within a <select> node causes the parent
+     * settings-section to be shown, but the DOM of the <select> is not
+     * modified.
+     */
+    test('<select> highlighting', function() {
+      PolymerTest.clearBody();

[Dan Beam, 2016/10/27 21:24:53]

why do this if it's already done in setup?

[dpapad, 2016/10/27 21:35:37]

Removed.

+      document.body.innerHTML =
+          `<settings-section hidden-by-search>
+            <select>
+              <option>Foo</option>
+              <option>Settings</option>
+              <option>Baz</option>
+            </select>
+          </settings-section>`;
+
+      var section = document.querySelector('settings-section');
+      var select = section.querySelector('select');
+
+      assertTrue(section.hiddenBySearch);
+      return searchManager.search('settings', section).then(function() {
+        assertFalse(section.hiddenBySearch);
+
+        var highlighWrapper = select.querySelector(

[Dan Beam, 2016/10/27 21:24:53]

highlightWrapper

+            '.search-highlight-wrapper');
+        assertFalse(!!highlighWrapper);
+
+        // Check that original DOM structure is present even after search
+        // highlights are cleared.
+        return searchManager.search('', section);
+      }).then(function() {
+        var options = select.querySelectorAll('option');
+        assertEquals(3, options.length);
+        assertEquals('Foo', options[0].textContent);
+        assertEquals('Settings', options[1].textContent);
+        assertEquals('Baz', options[2].textContent);
+      });
+    });
+  });
+});