diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-04 09:08:20 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-04 09:08:20 +0000 |
commit | d80f3cd75e700b6e62910865bfd36734644ffa89 (patch) | |
tree | aa2fa2f2b4385854c13591bef8e74924ef661657 /spec/features/issues | |
parent | be81c1578d65f25edfde8aa550f190b8d3e6d976 (diff) | |
download | gitlab-ce-d80f3cd75e700b6e62910865bfd36734644ffa89.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/issues')
9 files changed, 60 insertions, 60 deletions
diff --git a/spec/features/issues/filtered_search/dropdown_assignee_spec.rb b/spec/features/issues/filtered_search/dropdown_assignee_spec.rb index 8aa29cddd5f..c207e91f02e 100644 --- a/spec/features/issues/filtered_search/dropdown_assignee_spec.rb +++ b/spec/features/issues/filtered_search/dropdown_assignee_spec.rb @@ -20,13 +20,13 @@ describe 'Dropdown assignee', :js do describe 'behavior' do it 'loads all the assignees when opened' do - input_filtered_search('assignee=', submit: false, extra_space: false) + input_filtered_search('assignee:=', submit: false, extra_space: false) expect_filtered_search_dropdown_results(filter_dropdown, 2) end it 'shows current user at top of dropdown' do - input_filtered_search('assignee=', submit: false, extra_space: false) + input_filtered_search('assignee:=', submit: false, extra_space: false) expect(filter_dropdown.first('.filter-dropdown-item')).to have_content(user.name) end @@ -35,7 +35,7 @@ describe 'Dropdown assignee', :js do describe 'selecting from dropdown without Ajax call' do before do Gitlab::Testing::RequestBlockerMiddleware.block_requests! - input_filtered_search('assignee=', submit: false, extra_space: false) + input_filtered_search('assignee:=', submit: false, extra_space: false) end after do diff --git a/spec/features/issues/filtered_search/dropdown_author_spec.rb b/spec/features/issues/filtered_search/dropdown_author_spec.rb index c95bd7071b3..8ded11b3b08 100644 --- a/spec/features/issues/filtered_search/dropdown_author_spec.rb +++ b/spec/features/issues/filtered_search/dropdown_author_spec.rb @@ -20,13 +20,13 @@ describe 'Dropdown author', :js do describe 'behavior' do it 'loads all the authors when opened' do - input_filtered_search('author=', submit: false, extra_space: false) + input_filtered_search('author:=', submit: false, extra_space: false) expect_filtered_search_dropdown_results(filter_dropdown, 2) end it 'shows current user at top of dropdown' do - input_filtered_search('author=', submit: false, extra_space: false) + input_filtered_search('author:=', submit: false, extra_space: false) expect(filter_dropdown.first('.filter-dropdown-item')).to have_content(user.name) end @@ -35,7 +35,7 @@ describe 'Dropdown author', :js do describe 'selecting from dropdown without Ajax call' do before do Gitlab::Testing::RequestBlockerMiddleware.block_requests! - input_filtered_search('author=', submit: false, extra_space: false) + input_filtered_search('author:=', submit: false, extra_space: false) end after do diff --git a/spec/features/issues/filtered_search/dropdown_base_spec.rb b/spec/features/issues/filtered_search/dropdown_base_spec.rb index 2a800f054a0..14d3f48b8fc 100644 --- a/spec/features/issues/filtered_search/dropdown_base_spec.rb +++ b/spec/features/issues/filtered_search/dropdown_base_spec.rb @@ -27,14 +27,14 @@ describe 'Dropdown base', :js do it 'shows loading indicator when opened' do slow_requests do # We aren't using `input_filtered_search` because we want to see the loading indicator - filtered_search.set('assignee=') + filtered_search.set('assignee:=') expect(page).to have_css("#{js_dropdown_assignee} .filter-dropdown-loading", visible: true) end end it 'hides loading indicator when loaded' do - input_filtered_search('assignee=', submit: false, extra_space: false) + input_filtered_search('assignee:=', submit: false, extra_space: false) expect(find(js_dropdown_assignee)).not_to have_css('.filter-dropdown-loading') end @@ -42,7 +42,7 @@ describe 'Dropdown base', :js do describe 'caching requests' do it 'caches requests after the first load' do - input_filtered_search('assignee=', submit: false, extra_space: false) + input_filtered_search('assignee:=', submit: false, extra_space: false) initial_size = dropdown_assignee_size expect(initial_size).to be > 0 @@ -50,7 +50,7 @@ describe 'Dropdown base', :js do new_user = create(:user) project.add_maintainer(new_user) find('.filtered-search-box .clear-search').click - input_filtered_search('assignee=', submit: false, extra_space: false) + input_filtered_search('assignee:=', submit: false, extra_space: false) expect(dropdown_assignee_size).to eq(initial_size) end diff --git a/spec/features/issues/filtered_search/dropdown_emoji_spec.rb b/spec/features/issues/filtered_search/dropdown_emoji_spec.rb index 4c11f83318b..9ab0f49cd15 100644 --- a/spec/features/issues/filtered_search/dropdown_emoji_spec.rb +++ b/spec/features/issues/filtered_search/dropdown_emoji_spec.rb @@ -43,19 +43,19 @@ describe 'Dropdown emoji', :js do describe 'behavior' do it 'opens when the search bar has my-reaction=' do - filtered_search.set('my-reaction=') + filtered_search.set('my-reaction:=') expect(page).to have_css(js_dropdown_emoji, visible: true) end it 'loads all the emojis when opened' do - input_filtered_search('my-reaction=', submit: false, extra_space: false) + input_filtered_search('my-reaction:=', submit: false, extra_space: false) expect_filtered_search_dropdown_results(filter_dropdown, 3) end it 'shows the most populated emoji at top of dropdown' do - input_filtered_search('my-reaction=', submit: false, extra_space: false) + input_filtered_search('my-reaction:=', submit: false, extra_space: false) expect(first("#{js_dropdown_emoji} .filter-dropdown li")).to have_content(award_emoji_star.name) end diff --git a/spec/features/issues/filtered_search/dropdown_label_spec.rb b/spec/features/issues/filtered_search/dropdown_label_spec.rb index 1e90efc8d56..a982053dbcb 100644 --- a/spec/features/issues/filtered_search/dropdown_label_spec.rb +++ b/spec/features/issues/filtered_search/dropdown_label_spec.rb @@ -21,7 +21,7 @@ describe 'Dropdown label', :js do describe 'behavior' do it 'loads all the labels when opened' do create(:label, project: project, title: 'bug-label') - filtered_search.set('label=') + filtered_search.set('label:=') expect_filtered_search_dropdown_results(filter_dropdown, 1) end diff --git a/spec/features/issues/filtered_search/dropdown_milestone_spec.rb b/spec/features/issues/filtered_search/dropdown_milestone_spec.rb index 1f62a8e0c8d..56beb35a1c5 100644 --- a/spec/features/issues/filtered_search/dropdown_milestone_spec.rb +++ b/spec/features/issues/filtered_search/dropdown_milestone_spec.rb @@ -23,7 +23,7 @@ describe 'Dropdown milestone', :js do describe 'behavior' do before do - filtered_search.set('milestone=') + filtered_search.set('milestone:=') end it 'loads all the milestones when opened' do diff --git a/spec/features/issues/filtered_search/dropdown_release_spec.rb b/spec/features/issues/filtered_search/dropdown_release_spec.rb index fd0a98f9ddc..ae1c84d71b4 100644 --- a/spec/features/issues/filtered_search/dropdown_release_spec.rb +++ b/spec/features/issues/filtered_search/dropdown_release_spec.rb @@ -23,7 +23,7 @@ describe 'Dropdown release', :js do describe 'behavior' do before do - filtered_search.set('release=') + filtered_search.set('release:=') end it 'loads all the releases when opened' do diff --git a/spec/features/issues/filtered_search/filter_issues_spec.rb b/spec/features/issues/filtered_search/filter_issues_spec.rb index a518831ea2b..756699fb854 100644 --- a/spec/features/issues/filtered_search/filter_issues_spec.rb +++ b/spec/features/issues/filtered_search/filter_issues_spec.rb @@ -67,7 +67,7 @@ describe 'Filter issues', :js do 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}") + input_filtered_search("assignee:=@#{user.username} author:=@#{user.username} label:=~#{caps_sensitive_label.title} milestone:=%#{milestone.title} #{search_term}") wait_for_requests @@ -84,7 +84,7 @@ describe 'Filter issues', :js do describe 'filter issues by author' do context 'only author' do it 'filters issues by searched author' do - input_filtered_search("author=@#{user.username}") + input_filtered_search("author:=@#{user.username}") wait_for_requests @@ -98,7 +98,7 @@ describe 'Filter issues', :js do describe 'filter issues by assignee' do context 'only assignee' do it 'filters issues by searched assignee' do - input_filtered_search("assignee=@#{user.username}") + input_filtered_search("assignee:=@#{user.username}") wait_for_requests @@ -108,7 +108,7 @@ describe 'Filter issues', :js do end it 'filters issues by no assignee' do - input_filtered_search('assignee=none') + input_filtered_search('assignee:=none') expect_tokens([assignee_token('None')]) expect_issues_list_count(3) @@ -122,7 +122,7 @@ describe 'Filter issues', :js do it 'filters issues by multiple assignees' do create(:issue, project: project, author: user, assignees: [user2, user]) - input_filtered_search("assignee=@#{user.username} assignee=@#{user2.username}") + input_filtered_search("assignee:=@#{user.username} assignee:=@#{user2.username}") expect_tokens([ assignee_token(user.name), @@ -138,7 +138,7 @@ describe 'Filter issues', :js do describe 'filter issues by label' do context 'only label' do it 'filters issues by searched label' do - input_filtered_search("label=~#{bug_label.title}") + input_filtered_search("label:=~#{bug_label.title}") expect_tokens([label_token(bug_label.title)]) expect_issues_list_count(2) @@ -146,7 +146,7 @@ describe 'Filter issues', :js do end it 'filters issues not containing searched label' do - input_filtered_search("label!=~#{bug_label.title}") + input_filtered_search("label:!=~#{bug_label.title}") expect_tokens([label_token(bug_label.title)]) expect_issues_list_count(6) @@ -154,7 +154,7 @@ describe 'Filter issues', :js do end it 'filters issues by no label' do - input_filtered_search('label=none') + input_filtered_search('label:=none') expect_tokens([label_token('None', false)]) expect_issues_list_count(4) @@ -162,7 +162,7 @@ describe 'Filter issues', :js do end it 'filters issues by no label' do - input_filtered_search('label!=none') + input_filtered_search('label:!=none') expect_tokens([label_token('None', false)]) expect_issues_list_count(4) @@ -170,7 +170,7 @@ describe 'Filter issues', :js do end it 'filters issues by multiple labels' do - input_filtered_search("label=~#{bug_label.title} label=~#{caps_sensitive_label.title}") + input_filtered_search("label:=~#{bug_label.title} label:=~#{caps_sensitive_label.title}") expect_tokens([ label_token(bug_label.title), @@ -181,7 +181,7 @@ describe 'Filter issues', :js do end it 'filters issues by multiple labels with not operator' do - input_filtered_search("label!=~#{bug_label.title} label=~#{caps_sensitive_label.title}") + input_filtered_search("label:!=~#{bug_label.title} label:=~#{caps_sensitive_label.title}") expect_tokens([ label_token(bug_label.title), @@ -196,7 +196,7 @@ describe 'Filter issues', :js do special_issue = create(:issue, title: "Issue with special character label", project: project) special_issue.labels << special_label - input_filtered_search("label=~#{special_label.title}") + input_filtered_search("label:=~#{special_label.title}") expect_tokens([label_token(special_label.title)]) expect_issues_list_count(1) @@ -208,7 +208,7 @@ describe 'Filter issues', :js do special_issue = create(:issue, title: "Issue with special character label", project: project) special_issue.labels << special_label - input_filtered_search("label!=~#{special_label.title}") + input_filtered_search("label:!=~#{special_label.title}") expect_tokens([label_token(special_label.title)]) expect_issues_list_count(8) @@ -218,7 +218,7 @@ describe 'Filter issues', :js do it 'does not show issues for unused labels' do new_label = create(:label, project: project, title: 'new_label') - input_filtered_search("label=~#{new_label.title}") + input_filtered_search("label:=~#{new_label.title}") expect_tokens([label_token(new_label.title)]) expect_no_issues_list @@ -226,7 +226,7 @@ describe 'Filter issues', :js do end it 'does show issues for bug label' do - input_filtered_search("label!=~#{bug_label.title}") + input_filtered_search("label:!=~#{bug_label.title}") expect_tokens([label_token(bug_label.title)]) expect_issues_list_count(6) @@ -240,7 +240,7 @@ describe 'Filter issues', :js do special_multiple_issue = create(:issue, title: "Issue with special character multiple words label", project: project) special_multiple_issue.labels << special_multiple_label - input_filtered_search("label=~'#{special_multiple_label.title}'") + input_filtered_search("label:=~'#{special_multiple_label.title}'") # Check for search results (which makes sure that the page has changed) expect_issues_list_count(1) @@ -252,7 +252,7 @@ describe 'Filter issues', :js do end it 'single quotes' do - input_filtered_search("label=~'#{multiple_words_label.title}'") + input_filtered_search("label:=~'#{multiple_words_label.title}'") expect_issues_list_count(1) expect_tokens([label_token("\"#{multiple_words_label.title}\"")]) @@ -260,7 +260,7 @@ describe 'Filter issues', :js do end it 'double quotes' do - input_filtered_search("label=~\"#{multiple_words_label.title}\"") + input_filtered_search("label:=~\"#{multiple_words_label.title}\"") expect_tokens([label_token("\"#{multiple_words_label.title}\"")]) expect_issues_list_count(1) @@ -272,7 +272,7 @@ describe 'Filter issues', :js do double_quotes_label_issue = create(:issue, title: "Issue with double quotes label", project: project) double_quotes_label_issue.labels << double_quotes_label - input_filtered_search("label=~'#{double_quotes_label.title}'") + input_filtered_search("label:=~'#{double_quotes_label.title}'") expect_tokens([label_token("'#{double_quotes_label.title}'")]) expect_issues_list_count(1) @@ -284,7 +284,7 @@ describe 'Filter issues', :js do single_quotes_label_issue = create(:issue, title: "Issue with single quotes label", project: project) single_quotes_label_issue.labels << single_quotes_label - input_filtered_search("label=~\"#{single_quotes_label.title}\"") + input_filtered_search("label:=~\"#{single_quotes_label.title}\"") expect_tokens([label_token("\"#{single_quotes_label.title}\"")]) expect_issues_list_count(1) @@ -296,7 +296,7 @@ describe 'Filter issues', :js do it 'filters issues by searched label, label2, author, assignee, milestone and text' do search_term = 'bug' - input_filtered_search("label=~#{bug_label.title} label=~#{caps_sensitive_label.title} author=@#{user.username} assignee=@#{user.username} milestone=%#{milestone.title} #{search_term}") + input_filtered_search("label:=~#{bug_label.title} label:=~#{caps_sensitive_label.title} author:=@#{user.username} assignee:=@#{user.username} milestone:=%#{milestone.title} #{search_term}") wait_for_requests @@ -314,7 +314,7 @@ describe 'Filter issues', :js do it 'filters issues by searched label, label2, author, assignee, not included in a milestone' do search_term = 'bug' - input_filtered_search("label=~#{bug_label.title} label=~#{caps_sensitive_label.title} author=@#{user.username} assignee=@#{user.username} milestone!=%#{milestone.title} #{search_term}") + input_filtered_search("label:=~#{bug_label.title} label:=~#{caps_sensitive_label.title} author:=@#{user.username} assignee:=@#{user.username} milestone:!=%#{milestone.title} #{search_term}") wait_for_requests @@ -344,7 +344,7 @@ describe 'Filter issues', :js do describe 'filter issues by milestone' do context 'only milestone' do it 'filters issues by searched milestone' do - input_filtered_search("milestone=%#{milestone.title}") + input_filtered_search("milestone:=%#{milestone.title}") expect_tokens([milestone_token(milestone.title)]) expect_issues_list_count(5) @@ -352,7 +352,7 @@ describe 'Filter issues', :js do end it 'filters issues by no milestone' do - input_filtered_search("milestone=none") + input_filtered_search("milestone:=none") expect_tokens([milestone_token('None', false)]) expect_issues_list_count(3) @@ -360,7 +360,7 @@ describe 'Filter issues', :js do end it 'filters issues by negation of no milestone' do - input_filtered_search("milestone!=none ") + input_filtered_search("milestone:!=none ") expect_tokens([milestone_token('None', false, '!=')]) expect_issues_list_count(5) @@ -372,7 +372,7 @@ describe 'Filter issues', :js do create(:issue, project: project, milestone: future_milestone, author: user) end - input_filtered_search("milestone=upcoming") + input_filtered_search("milestone:=upcoming") expect_tokens([milestone_token('Upcoming', false)]) expect_issues_list_count(1) @@ -384,7 +384,7 @@ describe 'Filter issues', :js do create(:issue, project: project, milestone: future_milestone, author: user) end - input_filtered_search("milestone!=upcoming") + input_filtered_search("milestone:!=upcoming") expect_tokens([milestone_token('Upcoming', false, '!=')]) expect_issues_list_count(8) @@ -392,7 +392,7 @@ describe 'Filter issues', :js do end it 'filters issues by started milestones' do - input_filtered_search("milestone=started") + input_filtered_search("milestone:=started") expect_tokens([milestone_token('Started', false)]) expect_issues_list_count(5) @@ -400,7 +400,7 @@ describe 'Filter issues', :js do end it 'filters issues by negation of started milestones' do - input_filtered_search("milestone!=started") + input_filtered_search("milestone:!=started") expect_tokens([milestone_token('Started', false, '!=')]) expect_issues_list_count(3) @@ -411,7 +411,7 @@ describe 'Filter issues', :js do special_milestone = create(:milestone, title: '!@\#{$%^&*()}', project: project) create(:issue, project: project, milestone: special_milestone) - input_filtered_search("milestone=%#{special_milestone.title}") + input_filtered_search("milestone:=%#{special_milestone.title}") expect_tokens([milestone_token(special_milestone.title)]) expect_issues_list_count(1) @@ -422,7 +422,7 @@ describe 'Filter issues', :js do special_milestone = create(:milestone, title: '!@\#{$%^&*()}', project: project) create(:issue, project: project, milestone: special_milestone) - input_filtered_search("milestone!=%#{special_milestone.title}") + input_filtered_search("milestone:!=%#{special_milestone.title}") expect_tokens([milestone_token(special_milestone.title, false, '!=')]) expect_issues_list_count(8) @@ -432,7 +432,7 @@ describe 'Filter issues', :js do it 'does not show issues for unused milestones' do new_milestone = create(:milestone, title: 'new', project: project) - input_filtered_search("milestone=%#{new_milestone.title}") + input_filtered_search("milestone:=%#{new_milestone.title}") expect_tokens([milestone_token(new_milestone.title)]) expect_no_issues_list @@ -442,7 +442,7 @@ describe 'Filter issues', :js do it 'show issues for unused milestones' do new_milestone = create(:milestone, title: 'new', project: project) - input_filtered_search("milestone!=%#{new_milestone.title}") + input_filtered_search("milestone:!=%#{new_milestone.title}") expect_tokens([milestone_token(new_milestone.title, false, '!=')]) expect_issues_list_count(8) @@ -521,7 +521,7 @@ describe 'Filter issues', :js do context 'searched text with other filters' do it 'filters issues by searched text, author, text, assignee, text, label1, text, label2, text, milestone and text' do - input_filtered_search("bug author=@#{user.username} report label=~#{bug_label.title} label=~#{caps_sensitive_label.title} milestone=%#{milestone.title} foo") + input_filtered_search("bug author:=@#{user.username} report label:=~#{bug_label.title} label:=~#{caps_sensitive_label.title} milestone:=%#{milestone.title} foo") expect_issues_list_count(1) expect_filtered_search_input('bug report foo') @@ -595,7 +595,7 @@ describe 'Filter issues', :js do end it 'milestone dropdown loads milestones' do - input_filtered_search("milestone=", submit: false) + input_filtered_search("milestone:=", submit: false) within('#js-dropdown-milestone') do expect(page).to have_selector('.filter-dropdown .filter-dropdown-item', count: 1) @@ -603,7 +603,7 @@ describe 'Filter issues', :js do end it 'label dropdown load labels' do - input_filtered_search("label=", submit: false) + input_filtered_search("label:=", submit: false) within('#js-dropdown-label') do expect(page).to have_selector('.filter-dropdown .filter-dropdown-item', count: 3) diff --git a/spec/features/issues/filtered_search/visual_tokens_spec.rb b/spec/features/issues/filtered_search/visual_tokens_spec.rb index 2af2e096bcc..29111bff344 100644 --- a/spec/features/issues/filtered_search/visual_tokens_spec.rb +++ b/spec/features/issues/filtered_search/visual_tokens_spec.rb @@ -36,7 +36,7 @@ describe 'Visual tokens', :js do describe 'editing a single token' do before do - input_filtered_search('author=@root assignee=none', submit: false) + input_filtered_search('author:=@root assignee:=none', submit: false) first('.tokens-container .filtered-search-token').click wait_for_requests end @@ -77,7 +77,7 @@ describe 'Visual tokens', :js do describe 'editing multiple tokens' do before do - input_filtered_search('author=@root assignee=none', submit: false) + input_filtered_search('author:=@root assignee:=none', submit: false) first('.tokens-container .filtered-search-token').click end @@ -93,7 +93,7 @@ describe 'Visual tokens', :js do describe 'editing a search term while editing another filter token' do before do - input_filtered_search('foo assignee=', submit: false) + input_filtered_search('foo assignee:=', submit: false) first('.tokens-container .filtered-search-term').click end @@ -112,7 +112,7 @@ describe 'Visual tokens', :js do describe 'add new token after editing existing token' do before do - input_filtered_search('author=@root assignee=none', submit: false) + input_filtered_search('author:=@root assignee:=none', submit: false) first('.tokens-container .filtered-search-token').double_click filtered_search.send_keys(' ') end @@ -123,7 +123,7 @@ describe 'Visual tokens', :js do end it 'opens token dropdown' do - filtered_search.send_keys('author=') + filtered_search.send_keys('author:=') expect(page).to have_css('#js-dropdown-author', visible: true) end @@ -131,7 +131,7 @@ describe 'Visual tokens', :js do describe 'visual tokens' do it 'creates visual token' do - filtered_search.send_keys('author=@thomas ') + filtered_search.send_keys('author:=@thomas ') token = page.all('.tokens-container .filtered-search-token')[1] expect(token.find('.name').text).to eq('Author') @@ -140,7 +140,7 @@ describe 'Visual tokens', :js do end it 'does not tokenize incomplete token' do - filtered_search.send_keys('author=') + filtered_search.send_keys('author:=') find('body').click token = page.all('.tokens-container .js-visual-token')[1] @@ -152,7 +152,7 @@ describe 'Visual tokens', :js do describe 'search using incomplete visual tokens' do before do - input_filtered_search('author=@root assignee=none', extra_space: false) + input_filtered_search('author:=@root assignee:=none', extra_space: false) end it 'tokenizes the search term to complete visual token' do |