MD Bookmarks: Restore any previously selected folder when clearing search

chrome/test/data/webui/md_bookmarks/reducers_test.js

 // Copyright 2017 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('selection state', function() {
   var state;
   var action;
 
   function select(items, anchor, add) {
     return {
@@ skipping 359 matching lines @@
 
     action = bookmarks.actions.selectFolder('2');
     state = bookmarks.reduceAction(state, action);
 
     action = bookmarks.actions.setSearchTerm('test');
     state = bookmarks.reduceAction(state, action);
 
     assertEquals('test', state.search.term);
     assertTrue(state.search.inProgress);
 
-    // UI should not have changed yet:
-    assertEquals('2', state.selectedFolder);
+    // UI should not have changed yet.
+    assertFalse(bookmarks.util.isShowingSearch(state));
     assertDeepEquals(['3'], bookmarks.util.getDisplayedList(state));
 
     action = bookmarks.actions.setSearchResults(['2', '3']);
     var searchedState = bookmarks.reduceAction(state, action);
 
     assertFalse(searchedState.search.inProgress);
 
-    // UI changes once search results arrive:
-    assertEquals(null, searchedState.selectedFolder);
+    // UI changes once search results arrive.
+    assertTrue(bookmarks.util.isShowingSearch(searchedState));
     assertDeepEquals(
         ['2', '3'], bookmarks.util.getDisplayedList(searchedState));
 
     // Case 1: Clear search by setting an empty search term.
     action = bookmarks.actions.setSearchTerm('');
     var clearedState = bookmarks.reduceAction(searchedState, action);
 
-    assertEquals('1', clearedState.selectedFolder);
-    assertDeepEquals(['2'], bookmarks.util.getDisplayedList(clearedState));
+    // Should go back to displaying the contents of '2', which was shown before
+    // the search.
+    assertEquals('2', clearedState.selectedFolder);
+    assertFalse(bookmarks.util.isShowingSearch(clearedState));
+    assertDeepEquals(['3'], bookmarks.util.getDisplayedList(clearedState));
     assertEquals('', clearedState.search.term);
     assertDeepEquals([], clearedState.search.results);
 
     // Case 2: Clear search by selecting a new folder.
-    action = bookmarks.actions.selectFolder('2');
+    action = bookmarks.actions.selectFolder('1');
     var selectedState = bookmarks.reduceAction(searchedState, action);
 
-    assertEquals('2', selectedState.selectedFolder);
-    assertDeepEquals(['3'], bookmarks.util.getDisplayedList(selectedState));
+    assertEquals('1', selectedState.selectedFolder);
+    assertFalse(bookmarks.util.isShowingSearch(selectedState));
+    assertDeepEquals(['2'], bookmarks.util.getDisplayedList(selectedState));
     assertEquals('', selectedState.search.term);
     assertDeepEquals([], selectedState.search.results);
   });
 
   test('removes deleted nodes', function() {
     var action;
 
     action = bookmarks.actions.setSearchTerm('test');
     state = bookmarks.reduceAction(state, action);
 
     action = bookmarks.actions.setSearchResults(['1', '3', '2']);
     state = bookmarks.reduceAction(state, action);
 
     action = bookmarks.actions.removeBookmark('2', '1', 0, state.nodes);
     state = bookmarks.reduceAction(state, action);
 
     // 2 and 3 should be removed, since 2 was deleted and 3 was a descendant of
     // 2.
     assertDeepEquals(['1'], state.search.results);
   });
 });