diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-04 12:08:20 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-04 12:08:20 +0300 |
commit | d80f3cd75e700b6e62910865bfd36734644ffa89 (patch) | |
tree | aa2fa2f2b4385854c13591bef8e74924ef661657 /spec | |
parent | be81c1578d65f25edfde8aa550f190b8d3e6d976 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec')
42 files changed, 717 insertions, 275 deletions
diff --git a/spec/features/admin/admin_runners_spec.rb b/spec/features/admin/admin_runners_spec.rb index 6bcadda6523..ca2fd2f2e9e 100644 --- a/spec/features/admin/admin_runners_spec.rb +++ b/spec/features/admin/admin_runners_spec.rb @@ -57,7 +57,7 @@ describe "Admin Runners" do expect(page).to have_content 'runner-active' expect(page).to have_content 'runner-paused' - input_filtered_search_keys('status=active') + input_filtered_search_keys('status:=active') expect(page).to have_content 'runner-active' expect(page).not_to have_content 'runner-paused' end @@ -68,7 +68,7 @@ describe "Admin Runners" do visit admin_runners_path - input_filtered_search_keys('status=offline') + input_filtered_search_keys('status:=offline') expect(page).not_to have_content 'runner-active' expect(page).not_to have_content 'runner-paused' @@ -83,12 +83,12 @@ describe "Admin Runners" do visit admin_runners_path - input_filtered_search_keys('status=active') + input_filtered_search_keys('status:=active') expect(page).to have_content 'runner-a-1' expect(page).to have_content 'runner-b-1' expect(page).not_to have_content 'runner-a-2' - input_filtered_search_keys('status=active runner-a') + input_filtered_search_keys('status:=active runner-a') expect(page).to have_content 'runner-a-1' expect(page).not_to have_content 'runner-b-1' expect(page).not_to have_content 'runner-a-2' @@ -105,7 +105,7 @@ describe "Admin Runners" do expect(page).to have_content 'runner-project' expect(page).to have_content 'runner-group' - input_filtered_search_keys('type=project_type') + input_filtered_search_keys('type:=project_type') expect(page).to have_content 'runner-project' expect(page).not_to have_content 'runner-group' end @@ -116,7 +116,7 @@ describe "Admin Runners" do visit admin_runners_path - input_filtered_search_keys('type=instance_type') + input_filtered_search_keys('type:=instance_type') expect(page).not_to have_content 'runner-project' expect(page).not_to have_content 'runner-group' @@ -131,12 +131,12 @@ describe "Admin Runners" do visit admin_runners_path - input_filtered_search_keys('type=project_type') + input_filtered_search_keys('type:=project_type') expect(page).to have_content 'runner-a-1' expect(page).to have_content 'runner-b-1' expect(page).not_to have_content 'runner-a-2' - input_filtered_search_keys('type=project_type runner-a') + input_filtered_search_keys('type:=project_type runner-a') expect(page).to have_content 'runner-a-1' expect(page).not_to have_content 'runner-b-1' expect(page).not_to have_content 'runner-a-2' @@ -153,7 +153,7 @@ describe "Admin Runners" do expect(page).to have_content 'runner-blue' expect(page).to have_content 'runner-red' - input_filtered_search_keys('tag=blue') + input_filtered_search_keys('tag:=blue') expect(page).to have_content 'runner-blue' expect(page).not_to have_content 'runner-red' @@ -165,7 +165,7 @@ describe "Admin Runners" do visit admin_runners_path - input_filtered_search_keys('tag=red') + input_filtered_search_keys('tag:=red') expect(page).not_to have_content 'runner-blue' expect(page).not_to have_content 'runner-blue' @@ -179,13 +179,13 @@ describe "Admin Runners" do visit admin_runners_path - input_filtered_search_keys('tag=blue') + input_filtered_search_keys('tag:=blue') expect(page).to have_content 'runner-a-1' expect(page).to have_content 'runner-b-1' expect(page).not_to have_content 'runner-a-2' - input_filtered_search_keys('tag=blue runner-a') + input_filtered_search_keys('tag:=blue runner-a') expect(page).to have_content 'runner-a-1' expect(page).not_to have_content 'runner-b-1' diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb index 8aad598b843..db6bb639e79 100644 --- a/spec/features/boards/boards_spec.rb +++ b/spec/features/boards/boards_spec.rb @@ -624,7 +624,7 @@ describe 'Issue Boards', :js do end def set_filter(type, text) - find('.filtered-search').native.send_keys("#{type}=#{text}") + find('.filtered-search').native.send_keys("#{type}:=#{text}") end def submit_filter diff --git a/spec/features/boards/modal_filter_spec.rb b/spec/features/boards/modal_filter_spec.rb index d14041ecf3f..31f4c502c61 100644 --- a/spec/features/boards/modal_filter_spec.rb +++ b/spec/features/boards/modal_filter_spec.rb @@ -211,7 +211,7 @@ describe 'Issue Boards add issue modal filtering', :js do end def set_filter(type, text = '') - find('.add-issues-modal .filtered-search').native.send_keys("#{type}=#{text}") + find('.add-issues-modal .filtered-search').native.send_keys("#{type}:=#{text}") end def submit_filter diff --git a/spec/features/dashboard/issues_filter_spec.rb b/spec/features/dashboard/issues_filter_spec.rb index 8e7fd1f500f..8e2a3d983b1 100644 --- a/spec/features/dashboard/issues_filter_spec.rb +++ b/spec/features/dashboard/issues_filter_spec.rb @@ -28,14 +28,14 @@ describe 'Dashboard Issues filtering', :js do context 'filtering by milestone' do it 'shows all issues with no milestone' do - input_filtered_search("milestone=none") + input_filtered_search("milestone:=none") expect(page).to have_issuable_counts(open: 1, closed: 0, all: 1) expect(page).to have_selector('.issue', count: 1) end it 'shows all issues with the selected milestone' do - input_filtered_search("milestone=%\"#{milestone.title}\"") + input_filtered_search("milestone:=%\"#{milestone.title}\"") expect(page).to have_issuable_counts(open: 1, closed: 0, all: 1) expect(page).to have_selector('.issue', count: 1) @@ -63,7 +63,7 @@ describe 'Dashboard Issues filtering', :js do let!(:label_link) { create(:label_link, label: label, target: issue) } it 'shows all issues with the selected label' do - input_filtered_search("label=~#{label.title}") + input_filtered_search("label:=~#{label.title}") page.within 'ul.content-list' do expect(page).to have_content issue.title diff --git a/spec/features/dashboard/issues_spec.rb b/spec/features/dashboard/issues_spec.rb index a2ead1b5d33..ff661014fb9 100644 --- a/spec/features/dashboard/issues_spec.rb +++ b/spec/features/dashboard/issues_spec.rb @@ -30,7 +30,7 @@ RSpec.describe 'Dashboard Issues' do it 'shows issues when current user is author', :js do reset_filters - input_filtered_search("author=#{current_user.to_reference}") + input_filtered_search("author:=#{current_user.to_reference}") expect(page).to have_content(authored_issue.title) expect(page).to have_content(authored_issue_on_public_project.title) diff --git a/spec/features/dashboard/merge_requests_spec.rb b/spec/features/dashboard/merge_requests_spec.rb index bb515cfae82..0c728ab22de 100644 --- a/spec/features/dashboard/merge_requests_spec.rb +++ b/spec/features/dashboard/merge_requests_spec.rb @@ -107,7 +107,7 @@ describe 'Dashboard Merge Requests' do it 'shows authored merge requests', :js do reset_filters - input_filtered_search("author=#{current_user.to_reference}") + input_filtered_search("author:=#{current_user.to_reference}") expect(page).to have_content(authored_merge_request.title) expect(page).to have_content(authored_merge_request_from_fork.title) @@ -120,7 +120,7 @@ describe 'Dashboard Merge Requests' do it 'shows labeled merge requests', :js do reset_filters - input_filtered_search("label=#{label.name}") + input_filtered_search("label:=#{label.name}") expect(page).to have_content(labeled_merge_request.title) diff --git a/spec/features/dashboard/projects_spec.rb b/spec/features/dashboard/projects_spec.rb index 9bd2e85e3b8..73f759f8a54 100644 --- a/spec/features/dashboard/projects_spec.rb +++ b/spec/features/dashboard/projects_spec.rb @@ -152,6 +152,61 @@ describe 'Dashboard Projects' do end end + describe 'with a pipeline', :clean_gitlab_redis_shared_state do + let(:pipeline) { create(:ci_pipeline, project: project, sha: project.commit.sha, ref: project.default_branch) } + + before do + # Since the cache isn't updated when a new pipeline is created + # we need the pipeline to advance in the pipeline since the cache was created + # by visiting the login page. + pipeline.succeed + end + + it 'shows that the last pipeline passed' do + visit dashboard_projects_path + + page.within('.controls') do + expect(page).to have_xpath("//a[@href='#{pipelines_project_commit_path(project, project.commit, ref: pipeline.ref)}']") + expect(page).to have_css('.ci-status-link') + expect(page).to have_css('.ci-status-icon-success') + expect(page).to have_link('Pipeline: passed') + end + end + + shared_examples 'hidden pipeline status' do + it 'does not show the pipeline status' do + visit dashboard_projects_path + + page.within('.controls') do + expect(page).not_to have_xpath("//a[@href='#{pipelines_project_commit_path(project, project.commit, ref: pipeline.ref)}']") + expect(page).not_to have_css('.ci-status-link') + expect(page).not_to have_css('.ci-status-icon-success') + expect(page).not_to have_link('Pipeline: passed') + end + end + end + + context 'guest user of project and project has private pipelines' do + let(:guest_user) { create(:user) } + + before do + project.update(public_builds: false) + project.add_guest(guest_user) + sign_in(guest_user) + end + + it_behaves_like 'hidden pipeline status' + end + + context 'when dashboard_pipeline_status is disabled' do + before do + stub_feature_flags(dashboard_pipeline_status: false) + end + + it_behaves_like 'hidden pipeline status' + end + end + context 'last push widget', :use_clean_rails_memory_store_caching do before do event = create(:push_event, project: project, author: user) diff --git a/spec/features/groups/issues_spec.rb b/spec/features/groups/issues_spec.rb index a3fa87e3242..5b2e98804b0 100644 --- a/spec/features/groups/issues_spec.rb +++ b/spec/features/groups/issues_spec.rb @@ -48,7 +48,7 @@ describe 'Group issues page' do let(:user2) { user_outside_group } it 'filters by only group users' do - filtered_search.set('assignee=') + filtered_search.set('assignee:=') expect(find('#js-dropdown-assignee .filter-dropdown')).to have_content(user.name) expect(find('#js-dropdown-assignee .filter-dropdown')).not_to have_content(user2.name) diff --git a/spec/features/groups/merge_requests_spec.rb b/spec/features/groups/merge_requests_spec.rb index 0038a8e4892..f87fa10e2f4 100644 --- a/spec/features/groups/merge_requests_spec.rb +++ b/spec/features/groups/merge_requests_spec.rb @@ -52,7 +52,7 @@ describe 'Group merge requests page' do let(:user2) { user_outside_group } it 'filters by assignee only group users' do - filtered_search.set('assignee=') + filtered_search.set('assignee:=') expect(find('#js-dropdown-assignee .filter-dropdown')).to have_content(user.name) expect(find('#js-dropdown-assignee .filter-dropdown')).not_to have_content(user2.name) 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 diff --git a/spec/features/merge_requests/filters_generic_behavior_spec.rb b/spec/features/merge_requests/filters_generic_behavior_spec.rb index c3400acae4f..2bea819cc33 100644 --- a/spec/features/merge_requests/filters_generic_behavior_spec.rb +++ b/spec/features/merge_requests/filters_generic_behavior_spec.rb @@ -23,7 +23,7 @@ describe 'Merge Requests > Filters generic behavior', :js do context 'when filtered by a label' do before do - input_filtered_search('label=~bug') + input_filtered_search('label:=~bug') end describe 'state tabs' do diff --git a/spec/features/merge_requests/user_filters_by_assignees_spec.rb b/spec/features/merge_requests/user_filters_by_assignees_spec.rb index 3abee3b656a..12d682bbb15 100644 --- a/spec/features/merge_requests/user_filters_by_assignees_spec.rb +++ b/spec/features/merge_requests/user_filters_by_assignees_spec.rb @@ -18,7 +18,7 @@ describe 'Merge Requests > User filters by assignees', :js do context 'filtering by assignee:none' do it 'applies the filter' do - input_filtered_search('assignee=none') + input_filtered_search('assignee:=none') expect(page).to have_issuable_counts(open: 1, closed: 0, all: 1) expect(page).not_to have_content 'Bugfix1' @@ -28,7 +28,7 @@ describe 'Merge Requests > User filters by assignees', :js do context 'filtering by assignee=@username' do it 'applies the filter' do - input_filtered_search("assignee=@#{user.username}") + input_filtered_search("assignee:=@#{user.username}") expect(page).to have_issuable_counts(open: 1, closed: 0, all: 1) expect(page).to have_content 'Bugfix1' diff --git a/spec/features/merge_requests/user_filters_by_labels_spec.rb b/spec/features/merge_requests/user_filters_by_labels_spec.rb index 7a80ebe9be3..6308579d2d9 100644 --- a/spec/features/merge_requests/user_filters_by_labels_spec.rb +++ b/spec/features/merge_requests/user_filters_by_labels_spec.rb @@ -22,7 +22,7 @@ describe 'Merge Requests > User filters by labels', :js do context 'filtering by label:none' do it 'applies the filter' do - input_filtered_search('label=none') + input_filtered_search('label:=none') expect(page).to have_issuable_counts(open: 0, closed: 0, all: 0) expect(page).not_to have_content 'Bugfix1' @@ -32,7 +32,7 @@ describe 'Merge Requests > User filters by labels', :js do context 'filtering by label:~enhancement' do it 'applies the filter' do - input_filtered_search('label=~enhancement') + input_filtered_search('label:=~enhancement') expect(page).to have_issuable_counts(open: 1, closed: 0, all: 1) expect(page).to have_content 'Bugfix2' @@ -42,7 +42,7 @@ describe 'Merge Requests > User filters by labels', :js do context 'filtering by label:~enhancement and label:~bug' do it 'applies the filters' do - input_filtered_search('label=~bug label=~enhancement') + input_filtered_search('label:=~bug label:=~enhancement') expect(page).to have_issuable_counts(open: 1, closed: 0, all: 1) expect(page).to have_content 'Bugfix2' diff --git a/spec/features/merge_requests/user_filters_by_milestones_spec.rb b/spec/features/merge_requests/user_filters_by_milestones_spec.rb index 8cb686e191e..d2a420be996 100644 --- a/spec/features/merge_requests/user_filters_by_milestones_spec.rb +++ b/spec/features/merge_requests/user_filters_by_milestones_spec.rb @@ -18,14 +18,14 @@ describe 'Merge Requests > User filters by milestones', :js do end it 'filters by no milestone' do - input_filtered_search('milestone=none') + input_filtered_search('milestone:=none') expect(page).to have_issuable_counts(open: 1, closed: 0, all: 1) expect(page).to have_css('.merge-request', count: 1) end it 'filters by a specific milestone' do - input_filtered_search("milestone=%'#{milestone.title}'") + input_filtered_search("milestone:=%'#{milestone.title}'") expect(page).to have_issuable_counts(open: 1, closed: 0, all: 1) expect(page).to have_css('.merge-request', count: 1) @@ -33,7 +33,7 @@ describe 'Merge Requests > User filters by milestones', :js do describe 'filters by upcoming milestone' do it 'does not show merge requests with no expiry' do - input_filtered_search('milestone=upcoming') + input_filtered_search('milestone:=upcoming') expect(page).to have_issuable_counts(open: 0, closed: 0, all: 0) expect(page).to have_css('.merge-request', count: 0) @@ -43,7 +43,7 @@ describe 'Merge Requests > User filters by milestones', :js do let(:milestone) { create(:milestone, project: project, due_date: Date.tomorrow) } it 'shows merge requests' do - input_filtered_search('milestone=upcoming') + input_filtered_search('milestone:=upcoming') expect(page).to have_issuable_counts(open: 1, closed: 0, all: 1) expect(page).to have_css('.merge-request', count: 1) @@ -54,7 +54,7 @@ describe 'Merge Requests > User filters by milestones', :js do let(:milestone) { create(:milestone, project: project, due_date: Date.yesterday) } it 'does not show any merge requests' do - input_filtered_search('milestone=upcoming') + input_filtered_search('milestone:=upcoming') expect(page).to have_issuable_counts(open: 0, closed: 0, all: 0) expect(page).to have_css('.merge-request', count: 0) diff --git a/spec/features/merge_requests/user_filters_by_multiple_criteria_spec.rb b/spec/features/merge_requests/user_filters_by_multiple_criteria_spec.rb index 5c9d53778d2..5fac31e58ba 100644 --- a/spec/features/merge_requests/user_filters_by_multiple_criteria_spec.rb +++ b/spec/features/merge_requests/user_filters_by_multiple_criteria_spec.rb @@ -20,7 +20,7 @@ describe 'Merge requests > User filters by multiple criteria', :js do describe 'filtering by label:~"Won\'t fix" and assignee:~bug' do it 'applies the filters' do - input_filtered_search("label=~\"Won't fix\" assignee=@#{user.username}") + input_filtered_search("label:=~\"Won't fix\" assignee:=@#{user.username}") expect(page).to have_issuable_counts(open: 1, closed: 0, all: 1) expect(page).to have_content 'Bugfix2' @@ -30,7 +30,7 @@ describe 'Merge requests > User filters by multiple criteria', :js do describe 'filtering by text, author, assignee, milestone, and label' do it 'filters by text, author, assignee, milestone, and label' do - input_filtered_search_keys("author=@#{user.username} assignee=@#{user.username} milestone=%\"v1.1\" label=~\"Won't fix\" Bug") + input_filtered_search_keys("author:=@#{user.username} assignee:=@#{user.username} milestone:=%\"v1.1\" label:=~\"Won't fix\" Bug") expect(page).to have_issuable_counts(open: 1, closed: 0, all: 1) expect(page).to have_content 'Bugfix2' diff --git a/spec/features/merge_requests/user_filters_by_target_branch_spec.rb b/spec/features/merge_requests/user_filters_by_target_branch_spec.rb index faff7de729d..abe97d4c07e 100644 --- a/spec/features/merge_requests/user_filters_by_target_branch_spec.rb +++ b/spec/features/merge_requests/user_filters_by_target_branch_spec.rb @@ -17,7 +17,7 @@ describe 'Merge Requests > User filters by target branch', :js do context 'filtering by target-branch:master' do it 'applies the filter' do - input_filtered_search('target-branch=master') + input_filtered_search('target-branch:=master') expect(page).to have_issuable_counts(open: 1, closed: 0, all: 1) expect(page).to have_content mr1.title @@ -27,7 +27,7 @@ describe 'Merge Requests > User filters by target branch', :js do context 'filtering by target-branch:merged-target' do it 'applies the filter' do - input_filtered_search('target-branch=merged-target') + input_filtered_search('target-branch:=merged-target') expect(page).to have_issuable_counts(open: 1, closed: 0, all: 1) expect(page).not_to have_content mr1.title @@ -37,7 +37,7 @@ describe 'Merge Requests > User filters by target branch', :js do context 'filtering by target-branch:feature' do it 'applies the filter' do - input_filtered_search('target-branch=feature') + input_filtered_search('target-branch:=feature') expect(page).to have_issuable_counts(open: 0, closed: 0, all: 0) expect(page).not_to have_content mr1.title diff --git a/spec/features/projects/blobs/user_follows_pipeline_suggest_nudge_spec.rb b/spec/features/projects/blobs/user_follows_pipeline_suggest_nudge_spec.rb new file mode 100644 index 00000000000..b23cea65b37 --- /dev/null +++ b/spec/features/projects/blobs/user_follows_pipeline_suggest_nudge_spec.rb @@ -0,0 +1,67 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe 'User follows pipeline suggest nudge spec when feature is enabled', :js do + let(:user) { create(:user, :admin) } + let(:project) { create(:project, :empty_repo) } + + describe 'viewing the new blob page' do + before do + stub_feature_flags(suggest_pipeline: true) + sign_in(user) + end + + context 'when the page is loaded from the link using the suggest_gitlab_ci_yml param' do + before do + visit namespace_project_new_blob_path(namespace_id: project.namespace, project_id: project, id: 'master', suggest_gitlab_ci_yml: 'true') + end + + it 'pre-fills .gitlab-ci.yml for file name' do + file_name = page.find_by_id('file_name') + + expect(file_name.value).to have_content('.gitlab-ci.yml') + end + + it 'chooses the .gitlab-ci.yml Template Type' do + template_type = page.find(:css, '.template-type-selector .dropdown-toggle-text') + + expect(template_type.text).to have_content('.gitlab-ci.yml') + end + + it 'displays suggest_gitlab_ci_yml popover' do + popover_selector = '.suggest-gitlab-ci-yml' + + expect(page).to have_css(popover_selector, visible: true) + + page.within(popover_selector) do + expect(page).to have_content('1/2: Choose a template') + end + end + end + + context 'when the page is visited without the param' do + before do + visit namespace_project_new_blob_path(namespace_id: project.namespace, project_id: project, id: 'master') + end + + it 'does not pre-fill .gitlab-ci.yml for file name' do + file_name = page.find_by_id('file_name') + + expect(file_name.value).not_to have_content('.gitlab-ci.yml') + end + + it 'does not choose the .gitlab-ci.yml Template Type' do + template_type = page.find(:css, '.template-type-selector .dropdown-toggle-text') + + expect(template_type.text).to have_content('Select a template type') + end + + it 'does not display suggest_gitlab_ci_yml popover' do + popover_selector = '.b-popover.suggest-gitlab-ci-yml' + + expect(page).not_to have_css(popover_selector, visible: true) + end + end + end +end diff --git a/spec/features/projects/releases/user_views_edit_release_spec.rb b/spec/features/projects/releases/user_views_edit_release_spec.rb index d4c88065b90..820e8277af3 100644 --- a/spec/features/projects/releases/user_views_edit_release_spec.rb +++ b/spec/features/projects/releases/user_views_edit_release_spec.rb @@ -6,22 +6,27 @@ describe 'User edits Release', :js do let_it_be(:project) { create(:project, :repository) } let_it_be(:release) { create(:release, project: project, name: 'The first release' ) } let_it_be(:user) { create(:user) } + let(:show_feature_flag) { true } before do + stub_feature_flags(release_show_page: show_feature_flag) + project.add_developer(user) gitlab_sign_in(user) visit edit_project_release_path(project, release) + + wait_for_requests end def fill_out_form_and_click(button_to_click) fill_in 'Release title', with: 'Updated Release title' fill_in 'Release notes', with: 'Updated Release notes' - click_button button_to_click + click_link_or_button button_to_click - wait_for_requests + wait_for_all_requests end it 'renders the breadcrumbs' do @@ -42,31 +47,66 @@ describe 'User edits Release', :js do expect(find_field('Release notes').value).to eq(release.description) expect(page).to have_button('Save changes') - expect(page).to have_button('Cancel') + expect(page).to have_link('Cancel') end - it 'redirects to the main Releases page without updating the Release when "Cancel" is clicked' do + it 'does not update the Release when "Cancel" is clicked' do original_name = release.name original_description = release.description fill_out_form_and_click 'Cancel' - expect(current_path).to eq(project_releases_path(project)) - release.reload expect(release.name).to eq(original_name) expect(release.description).to eq(original_description) end - it 'updates the Release and redirects to the main Releases page when "Save changes" is clicked' do + it 'updates the Release when "Save changes" is clicked' do fill_out_form_and_click 'Save changes' - expect(current_path).to eq(project_releases_path(project)) - release.reload expect(release.name).to eq('Updated Release title') expect(release.description).to eq('Updated Release notes') end + + context 'when the release_show_page feature flag is disabled' do + let(:show_feature_flag) { false } + + it 'redirects to the main Releases page when "Cancel" is clicked' do + fill_out_form_and_click 'Cancel' + + expect(page).to have_current_path(project_releases_path(project)) + end + + it 'redirects to the main Releases page when "Save changes" is clicked' do + fill_out_form_and_click 'Save changes' + + expect(page).to have_current_path(project_releases_path(project)) + end + end + + context 'when the release_show_page feature flag is enabled' do + it 'redirects to the previous page when "Cancel" is clicked when the url includes a back_url query parameter' do + back_path = project_releases_path(project, params: { page: 2 }) + visit edit_project_release_path(project, release, params: { back_url: back_path }) + + fill_out_form_and_click 'Cancel' + + expect(page).to have_current_path(back_path) + end + + it 'redirects to the main Releases page when "Cancel" is clicked when the url does not include a back_url query parameter' do + fill_out_form_and_click 'Cancel' + + expect(page).to have_current_path(project_releases_path(project)) + end + + it 'redirects to the dedicated Release page when "Save changes" is clicked' do + fill_out_form_and_click 'Save changes' + + expect(page).to have_current_path(project_release_path(project, release)) + end + end end diff --git a/spec/features/projects/releases/user_views_release_spec.rb b/spec/features/projects/releases/user_views_release_spec.rb new file mode 100644 index 00000000000..6120acb4f1f --- /dev/null +++ b/spec/features/projects/releases/user_views_release_spec.rb @@ -0,0 +1,37 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe 'User views Release', :js do + let(:project) { create(:project, :repository) } + let(:release) { create(:release, project: project, name: 'The first release' ) } + let(:user) { create(:user) } + + before do + project.add_developer(user) + + gitlab_sign_in(user) + + visit project_release_path(project, release) + end + + it 'renders the breadcrumbs' do + within('.breadcrumbs') do + expect(page).to have_content("#{project.creator.name} #{project.name} Releases #{release.name}") + + expect(page).to have_link(project.creator.name, href: user_path(project.creator)) + expect(page).to have_link(project.name, href: project_path(project)) + expect(page).to have_link('Releases', href: project_releases_path(project)) + expect(page).to have_link(release.name, href: project_release_path(project, release)) + end + end + + it 'renders the release details' do + within('.release-block') do + expect(page).to have_content(release.name) + expect(page).to have_content(release.tag) + expect(page).to have_content(release.commit.short_id) + expect(page).to have_content(release.description) + end + end +end diff --git a/spec/frontend/blob/suggest_gitlab_ci_yml/components/popover_spec.js b/spec/frontend/blob/suggest_gitlab_ci_yml/components/popover_spec.js new file mode 100644 index 00000000000..0170ef927cf --- /dev/null +++ b/spec/frontend/blob/suggest_gitlab_ci_yml/components/popover_spec.js @@ -0,0 +1,46 @@ +import { shallowMount } from '@vue/test-utils'; +import Popover from '~/blob/suggest_gitlab_ci_yml/components/popover.vue'; +import Cookies from 'js-cookie'; + +const popoverTarget = 'gitlab-ci-yml-selector'; +const dismissKey = 'suggest_gitlab_ci_yml_99'; + +describe('Suggest gitlab-ci.yml Popover', () => { + let wrapper; + + function createWrapper() { + wrapper = shallowMount(Popover, { + propsData: { + target: popoverTarget, + cssClass: 'js-class', + dismissKey, + }, + }); + } + + afterEach(() => { + wrapper.destroy(); + wrapper = null; + }); + + describe('when no dismiss cookie is set', () => { + beforeEach(() => { + createWrapper(); + }); + + it('sets popoverDismissed to false', () => { + expect(wrapper.vm.popoverDismissed).toEqual(false); + }); + }); + + describe('when the dismiss cookie is set', () => { + beforeEach(() => { + Cookies.set(dismissKey, true); + createWrapper(); + }); + + it('sets popoverDismissed to true', () => { + expect(wrapper.vm.popoverDismissed).toEqual(true); + }); + }); +}); diff --git a/spec/frontend/monitoring/components/charts/column_spec.js b/spec/frontend/monitoring/components/charts/column_spec.js index d6a96ffbd65..f368cb7916c 100644 --- a/spec/frontend/monitoring/components/charts/column_spec.js +++ b/spec/frontend/monitoring/components/charts/column_spec.js @@ -6,56 +6,75 @@ jest.mock('~/lib/utils/icon_utils', () => ({ getSvgIconPathContent: jest.fn().mockResolvedValue('mockSvgPathContent'), })); +const yAxisName = 'Y-axis mock name'; +const yAxisFormat = 'bytes'; +const yAxisPrecistion = 3; +const dataValues = [ + [1495700554.925, '8.0390625'], + [1495700614.925, '8.0390625'], + [1495700674.925, '8.0390625'], +]; + describe('Column component', () => { - let columnChart; + let wrapper; + + const findChart = () => wrapper.find(GlColumnChart); + const chartProps = prop => findChart().props(prop); beforeEach(() => { - columnChart = shallowMount(ColumnChart, { + wrapper = shallowMount(ColumnChart, { propsData: { graphData: { + yAxis: { + name: yAxisName, + format: yAxisFormat, + precision: yAxisPrecistion, + }, metrics: [ { - x_label: 'Time', - y_label: 'Usage', result: [ { metric: {}, - values: [ - [1495700554.925, '8.0390625'], - [1495700614.925, '8.0390625'], - [1495700674.925, '8.0390625'], - ], + values: dataValues, }, ], }, ], }, - containerWidth: 100, }, }); }); afterEach(() => { - columnChart.destroy(); + wrapper.destroy(); }); describe('wrapped components', () => { describe('GitLab UI column chart', () => { - let glColumnChart; + it('is a Vue instance', () => { + expect(findChart().isVueInstance()).toBe(true); + }); - beforeEach(() => { - glColumnChart = columnChart.find(GlColumnChart); + it('receives data properties needed for proper chart render', () => { + expect(chartProps('data').values).toEqual(dataValues); }); - it('is a Vue instance', () => { - expect(glColumnChart.isVueInstance()).toBe(true); + it('passes the y axis name correctly', () => { + expect(chartProps('yAxisTitle')).toBe(yAxisName); }); - it('receives data properties needed for proper chart render', () => { - const props = glColumnChart.props(); + it('passes the y axis configuration correctly', () => { + expect(chartProps('option').yAxis).toMatchObject({ + name: yAxisName, + axisLabel: { + formatter: expect.any(Function), + }, + scale: false, + }); + }); - expect(props.data).toBe(columnChart.vm.chartData); - expect(props.option).toBe(columnChart.vm.chartOptions); + it('passes a dataZoom configuration', () => { + expect(chartProps('option').dataZoom).toBeDefined(); }); }); }); diff --git a/spec/frontend/monitoring/mock_data.js b/spec/frontend/monitoring/mock_data.js index 60b1510973d..47651eca3c8 100644 --- a/spec/frontend/monitoring/mock_data.js +++ b/spec/frontend/monitoring/mock_data.js @@ -544,6 +544,12 @@ export const dashboardGitResponse = [ ...customDashboardsData, ]; +export const mockDashboardsErrorResponse = { + all_dashboards: customDashboardsData, + message: "Each 'panel_group' must define an array :panels", + status: 'error', +}; + export const graphDataPrometheusQuery = { title: 'Super Chart A2', type: 'single-stat', diff --git a/spec/frontend/monitoring/store/actions_spec.js b/spec/frontend/monitoring/store/actions_spec.js index 211950facd7..ba41a75ceec 100644 --- a/spec/frontend/monitoring/store/actions_spec.js +++ b/spec/frontend/monitoring/store/actions_spec.js @@ -30,6 +30,7 @@ import { metricsDashboardResponse, metricsDashboardViewModel, dashboardGitResponse, + mockDashboardsErrorResponse, } from '../mock_data'; jest.mock('~/flash'); @@ -257,9 +258,11 @@ describe('Monitoring store actions', () => { describe('fetchDashboard', () => { let dispatch; let state; + let commit; const response = metricsDashboardResponse; beforeEach(() => { dispatch = jest.fn(); + commit = jest.fn(); state = storeState(); state.dashboardEndpoint = '/dashboard'; }); @@ -270,6 +273,7 @@ describe('Monitoring store actions', () => { fetchDashboard( { state, + commit, dispatch, }, params, @@ -287,19 +291,21 @@ describe('Monitoring store actions', () => { describe('on failure', () => { let result; - let errorResponse; beforeEach(() => { const params = {}; result = () => { - mock.onGet(state.dashboardEndpoint).replyOnce(500, errorResponse); - return fetchDashboard({ state, dispatch }, params); + mock.onGet(state.dashboardEndpoint).replyOnce(500, mockDashboardsErrorResponse); + return fetchDashboard({ state, commit, dispatch }, params); }; }); it('dispatches a failure action', done => { - errorResponse = {}; result() .then(() => { + expect(commit).toHaveBeenCalledWith( + types.SET_ALL_DASHBOARDS, + mockDashboardsErrorResponse.all_dashboards, + ); expect(dispatch).toHaveBeenCalledWith( 'receiveMetricsDashboardFailure', new Error('Request failed with status code 500'), @@ -311,15 +317,15 @@ describe('Monitoring store actions', () => { }); it('dispatches a failure action when a message is returned', done => { - const message = 'Something went wrong with Prometheus!'; - errorResponse = { message }; result() .then(() => { expect(dispatch).toHaveBeenCalledWith( 'receiveMetricsDashboardFailure', new Error('Request failed with status code 500'), ); - expect(createFlash).toHaveBeenCalledWith(expect.stringContaining(message)); + expect(createFlash).toHaveBeenCalledWith( + expect.stringContaining(mockDashboardsErrorResponse.message), + ); done(); }) .catch(done.fail); diff --git a/spec/frontend/releases/components/app_edit_spec.js b/spec/frontend/releases/components/app_edit_spec.js index b2dbb8cc435..ac4b2b9124f 100644 --- a/spec/frontend/releases/components/app_edit_spec.js +++ b/spec/frontend/releases/components/app_edit_spec.js @@ -1,30 +1,27 @@ import Vuex from 'vuex'; import { mount } from '@vue/test-utils'; import ReleaseEditApp from '~/releases/components/app_edit.vue'; -import { release } from '../mock_data'; -import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; +import { release as originalRelease } from '../mock_data'; +import * as commonUtils from '~/lib/utils/common_utils'; +import { BACK_URL_PARAM } from '~/releases/constants'; describe('Release edit component', () => { let wrapper; - let releaseClone; + let release; let actions; let state; - beforeEach(() => { - gon.api_version = 'v4'; - - releaseClone = convertObjectPropsToCamelCase(release, { deep: true }); - + const factory = () => { state = { - release: releaseClone, + release, markdownDocsPath: 'path/to/markdown/docs', updateReleaseApiDocsPath: 'path/to/update/release/api/docs', + releasesPagePath: 'path/to/releases/page', }; actions = { fetchRelease: jest.fn(), updateRelease: jest.fn(), - navigateToReleasesPage: jest.fn(), }; const store = new Vuex.Store({ @@ -40,58 +37,99 @@ describe('Release edit component', () => { wrapper = mount(ReleaseEditApp, { store, }); + }; - return wrapper.vm.$nextTick(); - }); + beforeEach(() => { + gon.api_version = 'v4'; - it('calls fetchRelease when the component is created', () => { - expect(actions.fetchRelease).toHaveBeenCalledTimes(1); + release = commonUtils.convertObjectPropsToCamelCase(originalRelease, { deep: true }); }); - it('renders the description text at the top of the page', () => { - expect(wrapper.find('.js-subtitle-text').text()).toBe( - 'Releases are based on Git tags. We recommend naming tags that fit within semantic versioning, for example v1.0, v2.0-pre.', - ); + afterEach(() => { + wrapper.destroy(); + wrapper = null; }); - it('renders the correct tag name in the "Tag name" field', () => { - expect(wrapper.find('#git-ref').element.value).toBe(releaseClone.tagName); - }); + describe(`basic functionality tests: all tests unrelated to the "${BACK_URL_PARAM}" parameter`, () => { + beforeEach(() => { + factory(); + }); - it('renders the correct help text under the "Tag name" field', () => { - const helperText = wrapper.find('#tag-name-help'); - const helperTextLink = helperText.find('a'); - const helperTextLinkAttrs = helperTextLink.attributes(); - - expect(helperText.text()).toBe( - 'Changing a Release tag is only supported via Releases API. More information', - ); - expect(helperTextLink.text()).toBe('More information'); - expect(helperTextLinkAttrs.href).toBe(state.updateReleaseApiDocsPath); - expect(helperTextLinkAttrs.rel).toContain('noopener'); - expect(helperTextLinkAttrs.rel).toContain('noreferrer'); - expect(helperTextLinkAttrs.target).toBe('_blank'); - }); + it('calls fetchRelease when the component is created', () => { + expect(actions.fetchRelease).toHaveBeenCalledTimes(1); + }); - it('renders the correct release title in the "Release title" field', () => { - expect(wrapper.find('#release-title').element.value).toBe(releaseClone.name); - }); + it('renders the description text at the top of the page', () => { + expect(wrapper.find('.js-subtitle-text').text()).toBe( + 'Releases are based on Git tags. We recommend naming tags that fit within semantic versioning, for example v1.0, v2.0-pre.', + ); + }); - it('renders the release notes in the "Release notes" textarea', () => { - expect(wrapper.find('#release-notes').element.value).toBe(releaseClone.description); - }); + it('renders the correct tag name in the "Tag name" field', () => { + expect(wrapper.find('#git-ref').element.value).toBe(release.tagName); + }); + + it('renders the correct help text under the "Tag name" field', () => { + const helperText = wrapper.find('#tag-name-help'); + const helperTextLink = helperText.find('a'); + const helperTextLinkAttrs = helperTextLink.attributes(); + + expect(helperText.text()).toBe( + 'Changing a Release tag is only supported via Releases API. More information', + ); + expect(helperTextLink.text()).toBe('More information'); + expect(helperTextLinkAttrs).toEqual( + expect.objectContaining({ + href: state.updateReleaseApiDocsPath, + rel: 'noopener noreferrer', + target: '_blank', + }), + ); + }); + + it('renders the correct release title in the "Release title" field', () => { + expect(wrapper.find('#release-title').element.value).toBe(release.name); + }); + + it('renders the release notes in the "Release notes" textarea', () => { + expect(wrapper.find('#release-notes').element.value).toBe(release.description); + }); + + it('renders the "Save changes" button as type="submit"', () => { + expect(wrapper.find('.js-submit-button').attributes('type')).toBe('submit'); + }); - it('renders the "Save changes" button as type="submit"', () => { - expect(wrapper.find('.js-submit-button').attributes('type')).toBe('submit'); + it('calls updateRelease when the form is submitted', () => { + wrapper.find('form').trigger('submit'); + expect(actions.updateRelease).toHaveBeenCalledTimes(1); + }); }); - it('calls updateRelease when the form is submitted', () => { - wrapper.find('form').trigger('submit'); - expect(actions.updateRelease).toHaveBeenCalledTimes(1); + describe(`when the URL does not contain a "${BACK_URL_PARAM}" parameter`, () => { + beforeEach(() => { + factory(); + }); + + it(`renders a "Cancel" button with an href pointing to "${BACK_URL_PARAM}"`, () => { + const cancelButton = wrapper.find('.js-cancel-button'); + expect(cancelButton.attributes().href).toBe(state.releasesPagePath); + }); }); - it('calls navigateToReleasesPage when the "Cancel" button is clicked', () => { - wrapper.find('.js-cancel-button').vm.$emit('click'); - expect(actions.navigateToReleasesPage).toHaveBeenCalledTimes(1); + describe(`when the URL contains a "${BACK_URL_PARAM}" parameter`, () => { + const backUrl = 'https://example.gitlab.com/back/url'; + + beforeEach(() => { + commonUtils.getParameterByName = jest + .fn() + .mockImplementation(paramToGet => ({ [BACK_URL_PARAM]: backUrl }[paramToGet])); + + factory(); + }); + + it('renders a "Cancel" button with an href pointing to the main Releases page', () => { + const cancelButton = wrapper.find('.js-cancel-button'); + expect(cancelButton.attributes().href).toBe(backUrl); + }); }); }); diff --git a/spec/frontend/releases/components/app_show_spec.js b/spec/frontend/releases/components/app_show_spec.js new file mode 100644 index 00000000000..3dc9964c25c --- /dev/null +++ b/spec/frontend/releases/components/app_show_spec.js @@ -0,0 +1,61 @@ +import Vuex from 'vuex'; +import { shallowMount } from '@vue/test-utils'; +import ReleaseShowApp from '~/releases/components/app_show.vue'; +import { release as originalRelease } from '../mock_data'; +import { GlSkeletonLoading } from '@gitlab/ui'; +import ReleaseBlock from '~/releases/components/release_block.vue'; +import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; + +describe('Release show component', () => { + let wrapper; + let release; + let actions; + + beforeEach(() => { + release = convertObjectPropsToCamelCase(originalRelease); + }); + + const factory = state => { + actions = { + fetchRelease: jest.fn(), + }; + + const store = new Vuex.Store({ + modules: { + detail: { + namespaced: true, + actions, + state, + }, + }, + }); + + wrapper = shallowMount(ReleaseShowApp, { store }); + }; + + const findLoadingSkeleton = () => wrapper.find(GlSkeletonLoading); + const findReleaseBlock = () => wrapper.find(ReleaseBlock); + + it('calls fetchRelease when the component is created', () => { + factory({ release }); + expect(actions.fetchRelease).toHaveBeenCalledTimes(1); + }); + + it('shows a loading skeleton and hides the release block while the API call is in progress', () => { + factory({ isFetchingRelease: true }); + expect(findLoadingSkeleton().exists()).toBe(true); + expect(findReleaseBlock().exists()).toBe(false); + }); + + it('hides the loading skeleton and shows the release block when the API call finishes successfully', () => { + factory({ isFetchingRelease: false }); + expect(findLoadingSkeleton().exists()).toBe(false); + expect(findReleaseBlock().exists()).toBe(true); + }); + + it('hides both the loading skeleton and the release block when the API call fails', () => { + factory({ fetchError: new Error('Uh oh') }); + expect(findLoadingSkeleton().exists()).toBe(false); + expect(findReleaseBlock().exists()).toBe(false); + }); +}); diff --git a/spec/frontend/releases/components/release_block_header_spec.js b/spec/frontend/releases/components/release_block_header_spec.js index 44f6f63fa79..9c6cbc86d3c 100644 --- a/spec/frontend/releases/components/release_block_header_spec.js +++ b/spec/frontend/releases/components/release_block_header_spec.js @@ -4,6 +4,7 @@ import { GlLink } from '@gitlab/ui'; import ReleaseBlockHeader from '~/releases/components/release_block_header.vue'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { release as originalRelease } from '../mock_data'; +import { BACK_URL_PARAM } from '~/releases/constants'; describe('Release block header', () => { let wrapper; @@ -27,6 +28,7 @@ describe('Release block header', () => { const findHeader = () => wrapper.find('h2'); const findHeaderLink = () => findHeader().find(GlLink); + const findEditButton = () => wrapper.find('.js-edit-button'); describe('when _links.self is provided', () => { beforeEach(() => { @@ -51,4 +53,39 @@ describe('Release block header', () => { expect(findHeaderLink().exists()).toBe(false); }); }); + + describe('when _links.edit_url is provided', () => { + const currentUrl = 'https://example.gitlab.com/path'; + + beforeEach(() => { + Object.defineProperty(window, 'location', { + writable: true, + value: { + href: currentUrl, + }, + }); + + factory(); + }); + + it('renders an edit button', () => { + expect(findEditButton().exists()).toBe(true); + }); + + it('renders the edit button with the correct href', () => { + const expectedQueryParam = `${BACK_URL_PARAM}=${encodeURIComponent(currentUrl)}`; + const expectedUrl = `${release._links.editUrl}?${expectedQueryParam}`; + expect(findEditButton().attributes().href).toBe(expectedUrl); + }); + }); + + describe('when _links.edit is missing', () => { + beforeEach(() => { + factory({ _links: { editUrl: null } }); + }); + + it('does not render an edit button', () => { + expect(findEditButton().exists()).toBe(false); + }); + }); }); diff --git a/spec/frontend/releases/components/release_block_spec.js b/spec/frontend/releases/components/release_block_spec.js index ff88e3193bc..227998b0271 100644 --- a/spec/frontend/releases/components/release_block_spec.js +++ b/spec/frontend/releases/components/release_block_spec.js @@ -7,20 +7,9 @@ import ReleaseBlockFooter from '~/releases/components/release_block_footer.vue'; import timeagoMixin from '~/vue_shared/mixins/timeago'; import { release as originalRelease } from '../mock_data'; import Icon from '~/vue_shared/components/icon.vue'; -import { scrollToElement } from '~/lib/utils/common_utils'; - -const { convertObjectPropsToCamelCase } = jest.requireActual('~/lib/utils/common_utils'); - -let mockLocationHash; -jest.mock('~/lib/utils/url_utility', () => ({ - __esModule: true, - getLocationHash: jest.fn().mockImplementation(() => mockLocationHash), -})); - -jest.mock('~/lib/utils/common_utils', () => ({ - __esModule: true, - scrollToElement: jest.fn(), -})); +import * as commonUtils from '~/lib/utils/common_utils'; +import { BACK_URL_PARAM } from '~/releases/constants'; +import * as urlUtility from '~/lib/utils/url_utility'; describe('Release block', () => { let wrapper; @@ -47,7 +36,7 @@ describe('Release block', () => { beforeEach(() => { jest.spyOn($.fn, 'renderGFM'); - release = convertObjectPropsToCamelCase(originalRelease, { deep: true }); + release = commonUtils.convertObjectPropsToCamelCase(originalRelease, { deep: true }); }); afterEach(() => { @@ -61,9 +50,11 @@ describe('Release block', () => { expect(wrapper.attributes().id).toBe('v0.3'); }); - it('renders an edit button that links to the "Edit release" page', () => { + it(`renders an edit button that links to the "Edit release" page with a "${BACK_URL_PARAM}" parameter`, () => { expect(editButton().exists()).toBe(true); - expect(editButton().attributes('href')).toBe(release._links.editUrl); + expect(editButton().attributes('href')).toBe( + `${release._links.editUrl}?${BACK_URL_PARAM}=${encodeURIComponent(window.location.href)}`, + ); }); it('renders release name', () => { @@ -150,14 +141,6 @@ describe('Release block', () => { }); }); - it("does not render an edit button if release._links.editUrl isn't a string", () => { - delete release._links; - - return factory(release).then(() => { - expect(editButton().exists()).toBe(false); - }); - }); - it('does not render the milestone list if no milestones are associated to the release', () => { delete release.milestones; @@ -203,37 +186,40 @@ describe('Release block', () => { }); describe('anchor scrolling', () => { + let locationHash; + beforeEach(() => { - scrollToElement.mockClear(); + commonUtils.scrollToElement = jest.fn(); + urlUtility.getLocationHash = jest.fn().mockImplementation(() => locationHash); }); const hasTargetBlueBackground = () => wrapper.classes('bg-line-target-blue'); it('does not attempt to scroll the page if no anchor tag is included in the URL', () => { - mockLocationHash = ''; + locationHash = ''; return factory(release).then(() => { - expect(scrollToElement).not.toHaveBeenCalled(); + expect(commonUtils.scrollToElement).not.toHaveBeenCalled(); }); }); it("does not attempt to scroll the page if the anchor tag doesn't match the release's tag name", () => { - mockLocationHash = 'v0.4'; + locationHash = 'v0.4'; return factory(release).then(() => { - expect(scrollToElement).not.toHaveBeenCalled(); + expect(commonUtils.scrollToElement).not.toHaveBeenCalled(); }); }); it("attempts to scroll itself into view if the anchor tag matches the release's tag name", () => { - mockLocationHash = release.tagName; + locationHash = release.tagName; return factory(release).then(() => { - expect(scrollToElement).toHaveBeenCalledTimes(1); + expect(commonUtils.scrollToElement).toHaveBeenCalledTimes(1); - expect(scrollToElement).toHaveBeenCalledWith(wrapper.element); + expect(commonUtils.scrollToElement).toHaveBeenCalledWith(wrapper.element); }); }); it('renders with a light blue background if it is the target of the anchor', () => { - mockLocationHash = release.tagName; + locationHash = release.tagName; return factory(release).then(() => { expect(hasTargetBlueBackground()).toBe(true); @@ -241,7 +227,7 @@ describe('Release block', () => { }); it('does not render with a light blue background if it is not the target of the anchor', () => { - mockLocationHash = ''; + locationHash = ''; return factory(release).then(() => { expect(hasTargetBlueBackground()).toBe(false); diff --git a/spec/frontend/releases/stores/modules/detail/actions_spec.js b/spec/frontend/releases/stores/modules/detail/actions_spec.js index 0c2763822c9..88346083f5a 100644 --- a/spec/frontend/releases/stores/modules/detail/actions_spec.js +++ b/spec/frontend/releases/stores/modules/detail/actions_spec.js @@ -1,13 +1,14 @@ import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; +import { cloneDeep, merge } from 'lodash'; import * as actions from '~/releases/stores/modules/detail/actions'; import * as types from '~/releases/stores/modules/detail/mutation_types'; -import { release } from '../../../mock_data'; -import state from '~/releases/stores/modules/detail/state'; +import { release as originalRelease } from '../../../mock_data'; +import createState from '~/releases/stores/modules/detail/state'; import createFlash from '~/flash'; -import { redirectTo } from '~/lib/utils/url_utility'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; +import { redirectTo } from '~/lib/utils/url_utility'; jest.mock('~/flash', () => jest.fn()); @@ -17,14 +18,14 @@ jest.mock('~/lib/utils/url_utility', () => ({ })); describe('Release detail actions', () => { - let stateClone; - let releaseClone; + let state; + let release; let mock; let error; beforeEach(() => { - stateClone = state(); - releaseClone = JSON.parse(JSON.stringify(release)); + state = createState(); + release = cloneDeep(originalRelease); mock = new MockAdapter(axios); gon.api_version = 'v4'; error = { message: 'An error occurred' }; @@ -39,7 +40,7 @@ describe('Release detail actions', () => { it(`commits ${types.SET_INITIAL_STATE} with the provided object`, () => { const initialState = {}; - return testAction(actions.setInitialState, initialState, stateClone, [ + return testAction(actions.setInitialState, initialState, state, [ { type: types.SET_INITIAL_STATE, payload: initialState }, ]); }); @@ -47,19 +48,19 @@ describe('Release detail actions', () => { describe('requestRelease', () => { it(`commits ${types.REQUEST_RELEASE}`, () => - testAction(actions.requestRelease, undefined, stateClone, [{ type: types.REQUEST_RELEASE }])); + testAction(actions.requestRelease, undefined, state, [{ type: types.REQUEST_RELEASE }])); }); describe('receiveReleaseSuccess', () => { it(`commits ${types.RECEIVE_RELEASE_SUCCESS}`, () => - testAction(actions.receiveReleaseSuccess, releaseClone, stateClone, [ - { type: types.RECEIVE_RELEASE_SUCCESS, payload: releaseClone }, + testAction(actions.receiveReleaseSuccess, release, state, [ + { type: types.RECEIVE_RELEASE_SUCCESS, payload: release }, ])); }); describe('receiveReleaseError', () => { it(`commits ${types.RECEIVE_RELEASE_ERROR}`, () => - testAction(actions.receiveReleaseError, error, stateClone, [ + testAction(actions.receiveReleaseError, error, state, [ { type: types.RECEIVE_RELEASE_ERROR, payload: error }, ])); @@ -77,24 +78,24 @@ describe('Release detail actions', () => { let getReleaseUrl; beforeEach(() => { - stateClone.projectId = '18'; - stateClone.tagName = 'v1.3'; - getReleaseUrl = `/api/v4/projects/${stateClone.projectId}/releases/${stateClone.tagName}`; + state.projectId = '18'; + state.tagName = 'v1.3'; + getReleaseUrl = `/api/v4/projects/${state.projectId}/releases/${state.tagName}`; }); it(`dispatches requestRelease and receiveReleaseSuccess with the camel-case'd release object`, () => { - mock.onGet(getReleaseUrl).replyOnce(200, releaseClone); + mock.onGet(getReleaseUrl).replyOnce(200, release); return testAction( actions.fetchRelease, undefined, - stateClone, + state, [], [ { type: 'requestRelease' }, { type: 'receiveReleaseSuccess', - payload: convertObjectPropsToCamelCase(releaseClone, { deep: true }), + payload: convertObjectPropsToCamelCase(release, { deep: true }), }, ], ); @@ -106,7 +107,7 @@ describe('Release detail actions', () => { return testAction( actions.fetchRelease, undefined, - stateClone, + state, [], [{ type: 'requestRelease' }, { type: 'receiveReleaseError', payload: expect.anything() }], ); @@ -116,7 +117,7 @@ describe('Release detail actions', () => { describe('updateReleaseTitle', () => { it(`commits ${types.UPDATE_RELEASE_TITLE} with the updated release title`, () => { const newTitle = 'The new release title'; - return testAction(actions.updateReleaseTitle, newTitle, stateClone, [ + return testAction(actions.updateReleaseTitle, newTitle, state, [ { type: types.UPDATE_RELEASE_TITLE, payload: newTitle }, ]); }); @@ -125,7 +126,7 @@ describe('Release detail actions', () => { describe('updateReleaseNotes', () => { it(`commits ${types.UPDATE_RELEASE_NOTES} with the updated release notes`, () => { const newReleaseNotes = 'The new release notes'; - return testAction(actions.updateReleaseNotes, newReleaseNotes, stateClone, [ + return testAction(actions.updateReleaseNotes, newReleaseNotes, state, [ { type: types.UPDATE_RELEASE_NOTES, payload: newReleaseNotes }, ]); }); @@ -133,25 +134,40 @@ describe('Release detail actions', () => { describe('requestUpdateRelease', () => { it(`commits ${types.REQUEST_UPDATE_RELEASE}`, () => - testAction(actions.requestUpdateRelease, undefined, stateClone, [ + testAction(actions.requestUpdateRelease, undefined, state, [ { type: types.REQUEST_UPDATE_RELEASE }, ])); }); describe('receiveUpdateReleaseSuccess', () => { it(`commits ${types.RECEIVE_UPDATE_RELEASE_SUCCESS}`, () => - testAction( - actions.receiveUpdateReleaseSuccess, - undefined, - stateClone, - [{ type: types.RECEIVE_UPDATE_RELEASE_SUCCESS }], - [{ type: 'navigateToReleasesPage' }], - )); + testAction(actions.receiveUpdateReleaseSuccess, undefined, { ...state, featureFlags: {} }, [ + { type: types.RECEIVE_UPDATE_RELEASE_SUCCESS }, + ])); + + describe('when the releaseShowPage feature flag is enabled', () => { + const rootState = { featureFlags: { releaseShowPage: true } }; + const updatedState = merge({}, state, { + releasesPagePath: 'path/to/releases/page', + release: { + _links: { + self: 'path/to/self', + }, + }, + }); + + actions.receiveUpdateReleaseSuccess({ commit: jest.fn(), state: updatedState, rootState }); + + expect(redirectTo).toHaveBeenCalledTimes(1); + expect(redirectTo).toHaveBeenCalledWith(updatedState.release._links.self); + }); + + describe('when the releaseShowPage feature flag is disabled', () => {}); }); describe('receiveUpdateReleaseError', () => { it(`commits ${types.RECEIVE_UPDATE_RELEASE_ERROR}`, () => - testAction(actions.receiveUpdateReleaseError, error, stateClone, [ + testAction(actions.receiveUpdateReleaseError, error, state, [ { type: types.RECEIVE_UPDATE_RELEASE_ERROR, payload: error }, ])); @@ -169,10 +185,10 @@ describe('Release detail actions', () => { let getReleaseUrl; beforeEach(() => { - stateClone.release = releaseClone; - stateClone.projectId = '18'; - stateClone.tagName = 'v1.3'; - getReleaseUrl = `/api/v4/projects/${stateClone.projectId}/releases/${stateClone.tagName}`; + state.release = release; + state.projectId = '18'; + state.tagName = 'v1.3'; + getReleaseUrl = `/api/v4/projects/${state.projectId}/releases/${state.tagName}`; }); it(`dispatches requestUpdateRelease and receiveUpdateReleaseSuccess`, () => { @@ -181,7 +197,7 @@ describe('Release detail actions', () => { return testAction( actions.updateRelease, undefined, - stateClone, + state, [], [{ type: 'requestUpdateRelease' }, { type: 'receiveUpdateReleaseSuccess' }], ); @@ -193,7 +209,7 @@ describe('Release detail actions', () => { return testAction( actions.updateRelease, undefined, - stateClone, + state, [], [ { type: 'requestUpdateRelease' }, @@ -202,16 +218,4 @@ describe('Release detail actions', () => { ); }); }); - - describe('navigateToReleasesPage', () => { - it(`calls redirectTo() with the URL to the releases page`, () => { - const releasesPagePath = 'path/to/releases/page'; - stateClone.releasesPagePath = releasesPagePath; - - actions.navigateToReleasesPage({ state: stateClone }); - - expect(redirectTo).toHaveBeenCalledTimes(1); - expect(redirectTo).toHaveBeenCalledWith(releasesPagePath); - }); - }); }); diff --git a/spec/helpers/markup_helper_spec.rb b/spec/helpers/markup_helper_spec.rb index c22e20f0e73..96c8b557625 100644 --- a/spec/helpers/markup_helper_spec.rb +++ b/spec/helpers/markup_helper_spec.rb @@ -531,8 +531,10 @@ describe MarkupHelper do it 'preserves style attribute for a label that can be accessed by current_user' do project = create(:project, :public) + label = create_and_format_label(project) - expect(create_and_format_label(project)).to match(/span class=.*style=.*/) + expect(label).to match(/span class=.*style=.*/) + expect(label).to include('data-html="true"') end it 'does not style a label that can not be accessed by current_user' do @@ -544,6 +546,15 @@ describe MarkupHelper do end end + it 'keeps whitelisted tags' do + html = '<a><i></i></a> <strong>strong</strong><em>em</em><b>b</b>' + + object = create_object(html) + result = first_line_in_markdown(object, attribute, 100, project: project) + + expect(result).to include(html) + end + it 'truncates Markdown properly' do object = create_object("@#{user.username}, can you look at this?\nHello world\n") actual = first_line_in_markdown(object, attribute, 100, project: project) diff --git a/spec/javascripts/releases/components/app_index_spec.js b/spec/javascripts/releases/components/app_index_spec.js index 962fe9c448d..8809391f135 100644 --- a/spec/javascripts/releases/components/app_index_spec.js +++ b/spec/javascripts/releases/components/app_index_spec.js @@ -27,7 +27,7 @@ describe('Releases App ', () => { }; beforeEach(() => { - store = createStore({ list: listModule }); + store = createStore({ modules: { list: listModule } }); releasesPagination = _.range(21).map(index => ({ ...convertObjectPropsToCamelCase(release, { deep: true }), tagName: `${index}.00`, diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb index dd1588036b6..66b298bb36f 100644 --- a/spec/models/issue_spec.rb +++ b/spec/models/issue_spec.rb @@ -425,16 +425,16 @@ describe Issue do let(:issue) { create(:issue, title: 'testing-issue') } it 'starts with the issue iid' do - expect(issue.to_branch_name).to match /\A#{issue.iid}-[A-Za-z\-]+\z/ + expect(issue.to_branch_name).to match(/\A#{issue.iid}-[A-Za-z\-]+\z/) end it "contains the issue title if not confidential" do - expect(issue.to_branch_name).to match /testing-issue\z/ + expect(issue.to_branch_name).to match(/testing-issue\z/) end it "does not contain the issue title if confidential" do issue = create(:issue, title: 'testing-issue', confidential: true) - expect(issue.to_branch_name).to match /confidential-issue\z/ + expect(issue.to_branch_name).to match(/confidential-issue\z/) end context 'issue title longer than 100 characters' do @@ -932,4 +932,33 @@ describe Issue do end it_behaves_like 'versioned description' + + describe "#previous_updated_at" do + let_it_be(:updated_at) { Time.new(2012, 01, 06) } + let_it_be(:issue) { create(:issue, updated_at: updated_at) } + + it 'returns updated_at value if updated_at did not change at all' do + allow(issue).to receive(:previous_changes).and_return({}) + + expect(issue.previous_updated_at).to eq(updated_at) + end + + it 'returns updated_at value if `previous_changes` has nil value for `updated_at`' do + allow(issue).to receive(:previous_changes).and_return({ 'updated_at' => nil }) + + expect(issue.previous_updated_at).to eq(updated_at) + end + + it 'returns updated_at value if previous updated_at value is not present' do + allow(issue).to receive(:previous_changes).and_return({ 'updated_at' => [nil, Time.new(2013, 02, 06)] }) + + expect(issue.previous_updated_at).to eq(updated_at) + end + + it 'returns previous updated_at when present' do + allow(issue).to receive(:previous_changes).and_return({ 'updated_at' => [Time.new(2013, 02, 06), Time.new(2013, 03, 06)] }) + + expect(issue.previous_updated_at).to eq(Time.new(2013, 02, 06)) + end + end end diff --git a/spec/models/resource_weight_event_spec.rb b/spec/models/resource_weight_event_spec.rb index 11b633e1dcf..8a37883d933 100644 --- a/spec/models/resource_weight_event_spec.rb +++ b/spec/models/resource_weight_event_spec.rb @@ -67,7 +67,7 @@ RSpec.describe ResourceWeightEvent, type: :model do it 'returns the expected id' do allow(Digest::SHA1).to receive(:hexdigest) - .with("ResourceWeightEvent-2019-12-30 00:00:00 UTC-#{user1.id}") + .with("ResourceWeightEvent-#{event.id}-#{user1.id}") .and_return('73d167c478') expect(event.discussion_id).to eq('73d167c478') diff --git a/spec/support/helpers/filtered_search_helpers.rb b/spec/support/helpers/filtered_search_helpers.rb index c8b7a9251a9..99a5e043825 100644 --- a/spec/support/helpers/filtered_search_helpers.rb +++ b/spec/support/helpers/filtered_search_helpers.rb @@ -26,7 +26,7 @@ module FilteredSearchHelpers # Select a label clicking in the search dropdown instead # of entering label names on the input. def select_label_on_dropdown(label_title) - input_filtered_search("label=", submit: false) + input_filtered_search("label:=", submit: false) within('#js-dropdown-label') do wait_for_requests @@ -71,7 +71,7 @@ module FilteredSearchHelpers end def init_label_search - filtered_search.set('label=') + filtered_search.set('label:=') # This ensures the dropdown is shown expect(find('#js-dropdown-label')).not_to have_css('.filter-dropdown-loading') end diff --git a/spec/support/shared_examples/features/issuables_user_dropdown_behaviors_shared_examples.rb b/spec/support/shared_examples/features/issuables_user_dropdown_behaviors_shared_examples.rb index e0d9b828992..1848b4fffd9 100644 --- a/spec/support/shared_examples/features/issuables_user_dropdown_behaviors_shared_examples.rb +++ b/spec/support/shared_examples/features/issuables_user_dropdown_behaviors_shared_examples.rb @@ -13,7 +13,7 @@ RSpec.shared_examples 'issuable user dropdown behaviors' do it 'only includes members of the project/group' do visit issuables_path - filtered_search.set("#{dropdown}=") + filtered_search.set("#{dropdown}:=") expect(find("#js-dropdown-#{dropdown} .filter-dropdown")).to have_content(user_in_dropdown.name) expect(find("#js-dropdown-#{dropdown} .filter-dropdown")).not_to have_content(user_not_in_dropdown.name) |