[MD Bookmarks] Modify search to retain the previously selected folder.

chrome/test/data/webui/md_bookmarks/store_test.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.
 
 suite('<bookmarks-store>', function() {
   var store;
   var TEST_TREE;
 
   function replaceStore() {
     store = document.createElement('bookmarks-store');
@@ skipping 215 matching lines @@
   //////////////////////////////////////////////////////////////////////////////
   // search tests:
 
   test('displayedList updates after searchTerm changes', function() {
     var SEARCH_RESULTS = [
       'cat',
       'apple',
       'Paris',
     ];
     overrideBookmarksSearch(SEARCH_RESULTS);
+    var prevFolder = store.idToNodeMap_[store.selectedId];
 
     // Search for a non-empty string.
     store.searchTerm = 'a';
-    assertFalse(store.rootNode.children[0].isSelected);
-    assertEquals(null, store.selectedId);
+    assertFalse(prevFolder.isSelected);
+    assertEquals(prevFolder.id, store.selectedId);
     assertEquals(SEARCH_RESULTS, store.displayedList);
 
-    // Clear the searchTerm.
+    // Clearing search sets the displayed list to the previous folder.
     store.searchTerm = '';
-    var defaultFolder = store.rootNode.children[0];
-    assertTrue(defaultFolder.isSelected);
-    assertEquals(defaultFolder.id, store.selectedId);
-    assertEquals(defaultFolder.children, store.displayedList);
+    assertTrue(prevFolder.isSelected);
+    assertEquals(prevFolder.id, store.selectedId);
+    assertEquals(prevFolder.children, store.displayedList);
 
     // Search with no bookmarks returned.
     var EMPTY_RESULT = [];
     overrideBookmarksSearch(EMPTY_RESULT);
     store.searchTerm = 'asdf';
     assertEquals(EMPTY_RESULT, store.displayedList);
   });
 
   //////////////////////////////////////////////////////////////////////////////
   // router tests:
 
   test('search updates from route', function() {
     overrideBookmarksSearch([]);
+
+    // Route with basic search.
     searchTerm = 'Pond';
     navigateTo('/?q=' + searchTerm);
     assertEquals(searchTerm, store.searchTerm);
+    assertEquals(store.rootNode.children[0].id, store.selectedId);
+
+    // Route with selected folder and search.
+    var selectedId = '3';
+    searchTerm = 'Fish';
+    navigateTo('/?id=' + selectedId + '&q=' + searchTerm);
+    assertEquals(searchTerm, store.searchTerm);
+    assertEquals(selectedId, store.selectedId);
+
+    // Route with invalid selected folder and search.
+    selectedId = 'bar';
+    searchTerm = 'foo';
+    navigateTo('/?q=' + searchTerm + '&id=' + selectedId);
+    assertEquals(searchTerm, store.searchTerm);
+    assertEquals(store.rootNode.children[0].id, store.selectedId);
   });
 
   test('search updates from route on setup', function() {
     overrideBookmarksSearch([]);
     var searchTerm = 'Boat24';
     navigateTo('/?q=' + searchTerm);
     replaceStore();
     assertEquals(searchTerm, store.searchTerm);
   });
 
   test('route updates from search', function() {
     overrideBookmarksSearch([]);
+    var prevFolderId = '3';
+    store.fire('selected-folder-changed', prevFolderId);
+
+    // Searching sets the previous folder and searchTerm as the URL parameters.
     var searchTerm = 'Boat24';
     store.searchTerm = searchTerm;
-    assertEquals('chrome://bookmarks/?q=' + searchTerm, window.location.href);
+    assertEquals(
+        'chrome://bookmarks/?id=' + prevFolderId + '&q=' + searchTerm,
+        window.location.href);
+
+    // Search parameter is removed from the URL when search is cleared.
+    searchTerm = '';
+    store.searchTerm = searchTerm;
+    assertEquals(
+        'chrome://bookmarks/?id=' + prevFolderId, window.location.href);
   });
 
   test('selectedId updates from route', function() {
     // Folder id routes to the corresponding folder.
     var selectedId = '3';
     navigateTo('/?id=' + selectedId);
     assertEquals(selectedId, store.selectedId);
 
     // Bookmark id routes to the default Bookmarks Bar.
     var selectedId = '2';
@@ skipping 12 matching lines @@
     replaceStore();
     assertEquals(selectedId, store.selectedId);
   });
 
   test('route updates from selectedId', function() {
     var selectedId = '2';
     store.selectedId = selectedId;
     assertEquals('chrome://bookmarks/?id=' + selectedId, window.location.href);
   });
 });