diff options
author | Rémy Coutable <remy@rymai.me> | 2018-07-16 16:02:55 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-07-16 16:02:55 +0000 |
commit | 8048f99c21d0299313dcda172aae22fda8c519d3 (patch) | |
tree | edf02d0adf376ee0cce7caa9c541c687bc25f43f /spec/javascripts/frequent_items/store/actions_spec.js | |
parent | 815947bf6785e1c458bad8d2d891e99279cab602 (diff) | |
parent | 2c5e6b272e7984400ac4d297553b3f4f50a8d5c4 (diff) | |
download | gitlab-ce-8048f99c21d0299313dcda172aae22fda8c519d3.tar.gz |
Merge branch 'master' into 'qa-48464-add-edit-delete-file-scenario'sliaquat/gitlab-ce-qa-48464-add-edit-delete-file-scenario
# Conflicts:
# qa/qa.rb
Diffstat (limited to 'spec/javascripts/frequent_items/store/actions_spec.js')
-rw-r--r-- | spec/javascripts/frequent_items/store/actions_spec.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/frequent_items/store/actions_spec.js b/spec/javascripts/frequent_items/store/actions_spec.js index 0cdd033d38f..0a8525e77d6 100644 --- a/spec/javascripts/frequent_items/store/actions_spec.js +++ b/spec/javascripts/frequent_items/store/actions_spec.js @@ -205,7 +205,7 @@ describe('Frequent Items Dropdown Store Actions', () => { actions.setSearchQuery, { query: 'test' }, mockedState, - [{ type: types.SET_SEARCH_QUERY }], + [{ type: types.SET_SEARCH_QUERY, payload: { query: 'test' } }], [{ type: 'fetchSearchedItems', payload: { query: 'test' } }], done, ); @@ -216,7 +216,7 @@ describe('Frequent Items Dropdown Store Actions', () => { actions.setSearchQuery, null, mockedState, - [{ type: types.SET_SEARCH_QUERY }], + [{ type: types.SET_SEARCH_QUERY, payload: null }], [{ type: 'fetchFrequentItems' }], done, ); |