diff options
author | Robert Speicher <rspeicher@gmail.com> | 2017-08-31 18:05:23 -0400 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2017-09-01 10:46:41 -0400 |
commit | 18dd86b617070ff1e08b8c9c557e80e6e3ba6f2c (patch) | |
tree | 1a48303a5eb26d5c5aa8401bcfd9f506a358d4e1 /spec/features/issues | |
parent | f70a56f09f39a86c3b03d865c6158c9adc7dd35b (diff) | |
download | gitlab-ce-18dd86b617070ff1e08b8c9c557e80e6e3ba6f2c.tar.gz |
Remove more redundant specs in filter_issues_spec
We were essentially testing "all of the filters" four times, so now we
just do it once at the top level.
Diffstat (limited to 'spec/features/issues')
-rw-r--r-- | spec/features/issues/filtered_search/filter_issues_spec.rb | 89 |
1 files changed, 17 insertions, 72 deletions
diff --git a/spec/features/issues/filtered_search/filter_issues_spec.rb b/spec/features/issues/filtered_search/filter_issues_spec.rb index 6dbcf8140a1..606c55b6fb2 100644 --- a/spec/features/issues/filtered_search/filter_issues_spec.rb +++ b/spec/features/issues/filtered_search/filter_issues_spec.rb @@ -67,6 +67,23 @@ describe 'Filter issues', js: true do visit project_issues_path(project) end + it 'filters by all available tokens' do + search_term = 'issue' + + input_filtered_search("assignee:@#{user.username} author:@#{user.username} label:~#{caps_sensitive_label.title} milestone:%#{milestone.title} #{search_term}") + + wait_for_requests + + expect_tokens([ + assignee_token(user.name), + author_token(user.name), + label_token(caps_sensitive_label.title), + milestone_token(milestone.title) + ]) + expect_issues_list_count(1) + expect_filtered_search_input(search_term) + end + describe 'filter issues by author' do context 'only author' do it 'filters issues by searched author' do @@ -79,25 +96,6 @@ describe 'Filter issues', js: true do expect_filtered_search_input_empty end end - - context 'author with other filters' do - it 'filters issues by searched author, assignee, label, milestone and text' do - search_term = 'issue' - - input_filtered_search("author:@#{user.username} assignee:@#{user.username} label:~#{caps_sensitive_label.title} milestone:%#{milestone.title} #{search_term}") - - wait_for_requests - - expect_tokens([ - author_token(user.name), - assignee_token(user.name), - label_token(caps_sensitive_label.title), - milestone_token(milestone.title) - ]) - expect_issues_list_count(1) - expect_filtered_search_input(search_term) - end - end end describe 'filter issues by assignee' do @@ -120,23 +118,6 @@ describe 'Filter issues', js: true do expect_filtered_search_input_empty end end - - context 'assignee with other filters' do - it 'filters issues by searched assignee, author, label, milestone and text' do - search_term = 'searchTerm' - - input_filtered_search("assignee:@#{user.username} author:@#{user.username} label:~#{caps_sensitive_label.title} milestone:%#{milestone.title} #{search_term}") - - expect_tokens([ - assignee_token(user.name), - author_token(user.name), - label_token(caps_sensitive_label.title), - milestone_token(milestone.title) - ]) - expect_issues_list_count(1) - expect_filtered_search_input(search_term) - end - end end describe 'filter issues by label' do @@ -249,23 +230,6 @@ describe 'Filter issues', js: true do end end - context 'label with other filters' do - it 'filters issues by searched label, author, assignee, milestone and text' do - search_term = 'bug' - - input_filtered_search("label:~#{caps_sensitive_label.title} author:@#{user.username} assignee:@#{user.username} milestone:%#{milestone.title} #{search_term}") - - expect_tokens([ - label_token(caps_sensitive_label.title), - author_token(user.name), - assignee_token(user.name), - milestone_token(milestone.title) - ]) - expect_issues_list_count(1) - expect_filtered_search_input(search_term) - end - end - context 'multiple labels with other filters' do it 'filters issues by searched label, label2, author, assignee, milestone and text' do search_term = 'bug' @@ -361,25 +325,6 @@ describe 'Filter issues', js: true do expect_filtered_search_input_empty end end - - context 'milestone with other filters' do - it 'filters issues by searched milestone, author, assignee, label and text' do - search_term = 'bug' - - input_filtered_search("milestone:%#{milestone.title} author:@#{user.username} assignee:@#{user.username} label:~#{bug_label.title} #{search_term}") - - wait_for_requests - - expect_tokens([ - milestone_token(milestone.title), - author_token(user.name), - assignee_token(user.name), - label_token(bug_label.title) - ]) - expect_issues_list_count(2) - expect_filtered_search_input(search_term) - end - end end describe 'filter issues by text' do |