diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-09-23 06:18:23 +0300 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-09-23 06:18:23 +0300 |
commit | 2a423e0325b644bbb855b090c682c9b11c707616 (patch) | |
tree | 7c2dcdb02621d5c67252e3a96468217b5a58d30e /spec | |
parent | 8078f8796a4e575f8cec806815251139ab524d39 (diff) | |
parent | 47b49624b1caff3db026c69ac219aa48507eedaa (diff) |
Merge branch 'search-filters-label-fix' into 'master'
Fixed search dropdown labels not displaying
## What does this MR do?
Returns the search controller method after finding the project & group.
## Why was this MR needed?
The search controller was returning early when the search term was empty causing a bug where the dropdown toggles wouldn't show the correct text - instead defaulting to `Any`.
## Screenshots (if relevant)
![Screen_Shot_2016-09-09_at_12.09.57](/uploads/8c6bb36f4e163312314611d2877d5fa4/Screen_Shot_2016-09-09_at_12.09.57.png)
## What are the relevant issue numbers?
Closes #21783
See merge request !6277
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/search_spec.rb | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/spec/features/search_spec.rb b/spec/features/search_spec.rb index dcd3a2f17b0..1806200c82c 100644 --- a/spec/features/search_spec.rb +++ b/spec/features/search_spec.rb @@ -1,6 +1,8 @@ require 'spec_helper' describe "Search", feature: true do + include WaitForAjax + let(:user) { create(:user) } let(:project) { create(:project, namespace: user.namespace) } let!(:issue) { create(:issue, project: project, assignee: user) } @@ -16,6 +18,36 @@ describe "Search", feature: true do expect(page).not_to have_selector('.search') end + context 'search filters', js: true do + let(:group) { create(:group) } + + before do + group.add_owner(user) + end + + it 'shows group name after filtering' do + find('.js-search-group-dropdown').click + wait_for_ajax + + page.within '.search-holder' do + click_link group.name + end + + expect(find('.js-search-group-dropdown')).to have_content(group.name) + end + + it 'shows project name after filtering' do + page.within('.project-filter') do + find('.js-search-project-dropdown').click + wait_for_ajax + + click_link project.name_with_namespace + end + + expect(find('.js-search-project-dropdown')).to have_content(project.name_with_namespace) + end + end + describe 'searching for Projects' do it 'finds a project' do page.within '.search-holder' do |