Clear active search engine info when removed

Auditors: @darkdh Fix #6683
brave · Jan 16, 2017 · 2b0c9df · 2b0c9df · darkdh · Jan 17, 2017
1 parent 415e343
commit 2b0c9df
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/app/renderer/reducers/urlBarSuggestionsReducer.js b/app/renderer/reducers/urlBarSuggestionsReducer.js
@@ -29,13 +29,17 @@ const updateSearchEngineInfoFromInput = (state, frameProps) => {
     if (!isLocationUrl &&
       !(frameSearchDetail && input.startsWith(frameSearchDetail.get('shortcut') + ' '))) {
       let entries = searchProviders.providers
-      entries.forEach((entry) => {
+      const searchDetailPath = frameStatePath(state, frameProps.get('key')).concat(['navbar', 'urlbar', 'searchDetail'])
+      for (let i = 0; i < entries.length; i++) {
+        const entry = entries[i]
         if (input.startsWith(entry.shortcut + ' ')) {
           state = state.setIn(
-            frameStatePath(state, frameProps.get('key')).concat(['navbar', 'urlbar', 'searchDetail']),
+            searchDetailPath,
             Immutable.fromJS(Object.assign({}, entry, { activateSearchEngine: true })))
+          return state
         }
-      })
+      }
+      state = state.setIn(searchDetailPath, Immutable.fromJS({}))
     }
   }
   return state

diff --git a/app/sessionStore.js b/app/sessionStore.js
@@ -203,6 +203,7 @@ module.exports.cleanPerWindowData = (perWindowData, isShutdown) => {
         frame.navbar.urlbar.suggestions.selectedIndex = null
         frame.navbar.urlbar.suggestions.suggestionList = null
       }
+      delete frame.navbar.urlbar.searchDetail
     }
   }
   const clearHistory = isShutdown && getSetting(settings.SHUTDOWN_CLEAR_HISTORY) === true

diff --git a/test/components/urlBarTest.js b/test/components/urlBarTest.js
@@ -356,6 +356,21 @@ describe('urlBar tests', function () {
         })
       })
     })
+    it('Clears last search engine when removed', function * () {
+      const entry = entries[0]
+      yield this.app.client
+        .keys(`${entry.shortcut} hi`)
+        .waitForElementCount(urlbarIcon, 1)
+        .waitUntil(function () {
+          return this
+            .getCssProperty(urlbarIcon, 'background-image')
+            .then((backgroundImage) => backgroundImage.value === `url("${entry.image}")`)
+        })
+        .keys(Brave.keys.BACKSPACE)
+        .keys(Brave.keys.BACKSPACE)
+        .keys(Brave.keys.BACKSPACE)
+        .waitForElementCount(urlbarIcon + '.fa-search', 1)
+    })
   })
 
   const tabLoadingTest = function * () {