Don't show previous search results without a query

Author: mstriemer

src/search/containers/CurrentSearchPage.js

@@ -5,8 +5,12 @@ import { search } from 'core/api';
 import SearchPage from 'search/components/SearchPage';
 import { searchStart, searchLoad, searchFail } from 'search/actions';
 
-export function mapStateToProps(state) {
-  return state.search;
+export function mapStateToProps(state, ownProps) {
+  const { location } = ownProps;
+  if (location.query.q === state.search.query) {
+    return state.search;
+  }
+  return {};
 }
 
 function performSearch({ dispatch, page, query, api }) {

tests/client/search/containers/TestCurrentSearchPage.js

@@ -13,11 +13,16 @@ describe('CurrentSearchPage.mapStateToProps()', () => {
              cd: { slug: 'cd', name: 'cd-block' } },
     search: { query: 'ad-block', loading: false, results: [{ slug: 'ab', name: 'ad-block' }] },
   };
-  const props = mapStateToProps(state);
 
-  it('passes the search state', () => {
+  it('passes the search state if the URL and state query matches', () => {
+    const props = mapStateToProps(state, { location: { query: { q: 'ad-block' } } });
     assert.strictEqual(props, state.search);
   });
+
+  it('does not pass search state if the URL and state query do not match', () => {
+    const props = mapStateToProps(state, { location: { query: { q: 'more-ads' } } });
+    assert.deepEqual(props, {});
+  });
 });
 
 describe('CurrentSearchPage.isLoaded()', () => {