diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-19 09:56:02 +0000 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2017-01-19 11:04:32 +0100 |
commit | d8c7ab15e15768797c5651fb62d00a7f98d3444f (patch) | |
tree | 1b23db5524d13584b2e0d308219cb9a729843078 /spec | |
parent | 1f4665484e9bc6cfa235db1186523f60f6e2c700 (diff) | |
download | gitlab-ce-d8c7ab15e15768797c5651fb62d00a7f98d3444f.tar.gz |
Merge branch 'current-user-filter-top' into 'master'
Shows current user on top of filtered dropdown list
Closes #26765
See merge request !8612
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/issues/filtered_search/dropdown_assignee_spec.rb | 6 | ||||
-rw-r--r-- | spec/features/issues/filtered_search/dropdown_author_spec.rb | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/spec/features/issues/filtered_search/dropdown_assignee_spec.rb b/spec/features/issues/filtered_search/dropdown_assignee_spec.rb index 6f6a2532c04..3ac9b2e0ae0 100644 --- a/spec/features/issues/filtered_search/dropdown_assignee_spec.rb +++ b/spec/features/issues/filtered_search/dropdown_assignee_spec.rb @@ -66,6 +66,12 @@ describe 'Dropdown assignee', js: true, feature: true do expect(dropdown_assignee_size).to eq(3) end + + it 'shows current user at top of dropdown' do + send_keys_to_filtered_search('assignee:') + + expect(first('#js-dropdown-assignee .filter-dropdown li')).to have_content(user.name) + end end describe 'filtering' do diff --git a/spec/features/issues/filtered_search/dropdown_author_spec.rb b/spec/features/issues/filtered_search/dropdown_author_spec.rb index 60a86cc93d4..464749d01e3 100644 --- a/spec/features/issues/filtered_search/dropdown_author_spec.rb +++ b/spec/features/issues/filtered_search/dropdown_author_spec.rb @@ -66,6 +66,12 @@ describe 'Dropdown author', js: true, feature: true do expect(dropdown_author_size).to eq(3) end + + it 'shows current user at top of dropdown' do + send_keys_to_filtered_search('author:') + + expect(first('#js-dropdown-author li')).to have_content(user.name) + end end describe 'filtering' do |