diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-02-24 03:08:52 +0300 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-02-24 03:08:52 +0300 |
| commit | c4b4792e2fd862b47bb7e8aa876da66aad06c579 (patch) | |
| tree | 9ac5eb49f63baa426756bb0afe2ffe8b05196d5a /spec | |
| parent | 6047a99ecc6815fa37cfa33aeba1d0dce8f6c6e1 (diff) | |
| parent | 7fc090b7512067e043f9d20f6806117f59bccbbd (diff) | |
Merge branch 'refactor/move-filtered-search-vue-component' into 'master'
Move RecentSearchesDropdownContent vue component
See merge request gitlab-org/gitlab-ce!16951
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/features/issues/filtered_search/recent_searches_spec.rb | 4 | ||||
| -rw-r--r-- | spec/javascripts/filtered_search/components/recent_searches_dropdown_content_spec.js | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/spec/features/issues/filtered_search/recent_searches_spec.rb b/spec/features/issues/filtered_search/recent_searches_spec.rb index f355cec3ba9..41b9ada988a 100644 --- a/spec/features/issues/filtered_search/recent_searches_spec.rb +++ b/spec/features/issues/filtered_search/recent_searches_spec.rb @@ -39,8 +39,8 @@ describe 'Recent searches', :js do items = all('.filtered-search-history-dropdown-item', visible: false, count: 2) - expect(items[0].text).to eq('label:~qux garply') - expect(items[1].text).to eq('label:~foo bar') + expect(items[0].text).to eq('label: ~qux garply') + expect(items[1].text).to eq('label: ~foo bar') end it 'saved recent searches are restored last on the list' do diff --git a/spec/javascripts/filtered_search/components/recent_searches_dropdown_content_spec.js b/spec/javascripts/filtered_search/components/recent_searches_dropdown_content_spec.js index 4a516c517ef..59bd2650081 100644 --- a/spec/javascripts/filtered_search/components/recent_searches_dropdown_content_spec.js +++ b/spec/javascripts/filtered_search/components/recent_searches_dropdown_content_spec.js @@ -1,7 +1,6 @@ import Vue from 'vue'; import eventHub from '~/filtered_search/event_hub'; -import RecentSearchesDropdownContent from '~/filtered_search/components/recent_searches_dropdown_content'; - +import RecentSearchesDropdownContent from '~/filtered_search/components/recent_searches_dropdown_content.vue'; import FilteredSearchTokenKeys from '~/filtered_search/filtered_search_token_keys'; const createComponent = (propsData) => { |