diff options
Diffstat (limited to 'spec/features/merge_requests')
3 files changed, 212 insertions, 0 deletions
diff --git a/spec/features/merge_requests/user_filters_by_approvals_spec.rb b/spec/features/merge_requests/user_filters_by_approvals_spec.rb new file mode 100644 index 00000000000..6dda9ca7952 --- /dev/null +++ b/spec/features/merge_requests/user_filters_by_approvals_spec.rb @@ -0,0 +1,82 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe 'Merge Requests > User filters', :js do + include FilteredSearchHelpers + + let_it_be(:project) { create(:project, :public, :repository) } + let_it_be(:user) { project.creator } + let_it_be(:group_user) { create(:user) } + let_it_be(:first_user) { create(:user) } + + before do + sign_in(user) + visit project_merge_requests_path(project) + end + + context 'by "approved by"' do + let_it_be(:merge_request) { create(:merge_request, title: 'Bugfix3', source_project: project, source_branch: 'bugfix3') } + + let_it_be(:merge_request_with_first_user_approval) do + create(:merge_request, source_project: project, title: 'Bugfix5').tap do |mr| + create(:approval, merge_request: mr, user: first_user) + end + end + + let_it_be(:merge_request_with_group_user_approved) do + group = create(:group) + group.add_developer(group_user) + + create(:merge_request, source_project: project, title: 'Bugfix6', source_branch: 'bugfix6').tap do |mr| + create(:approval, merge_request: mr, user: group_user) + end + end + + context 'filtering by approved-by:none' do + it 'applies the filter' do + input_filtered_search('approved-by:=none') + + expect(page).to have_issuable_counts(open: 1, closed: 0, all: 1) + + expect(page).not_to have_content 'Bugfix5' + expect(page).not_to have_content 'Bugfix6' + expect(page).to have_content 'Bugfix3' + end + end + + context 'filtering by approved-by:any' do + it 'applies the filter' do + input_filtered_search('approved-by:=any') + + expect(page).to have_issuable_counts(open: 2, closed: 0, all: 2) + + expect(page).to have_content 'Bugfix5' + expect(page).not_to have_content 'Bugfix3' + end + end + + context 'filtering by approved-by:@username' do + it 'applies the filter' do + input_filtered_search("approved-by:=@#{first_user.username}") + + expect(page).to have_issuable_counts(open: 1, closed: 0, all: 1) + + expect(page).to have_content 'Bugfix5' + expect(page).not_to have_content 'Bugfix3' + end + end + + context 'filtering by an approver from a group' do + it 'applies the filter' do + input_filtered_search("approved-by:=@#{group_user.username}") + + expect(page).to have_issuable_counts(open: 1, closed: 0, all: 1) + + expect(page).to have_content 'Bugfix6' + expect(page).not_to have_content 'Bugfix5' + expect(page).not_to have_content 'Bugfix3' + end + end + end +end diff --git a/spec/features/merge_requests/user_filters_by_deployments_spec.rb b/spec/features/merge_requests/user_filters_by_deployments_spec.rb new file mode 100644 index 00000000000..157454d4e10 --- /dev/null +++ b/spec/features/merge_requests/user_filters_by_deployments_spec.rb @@ -0,0 +1,93 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe 'Merge Requests > User filters by deployments', :js do + include FilteredSearchHelpers + + let!(:project) { create(:project, :public, :repository) } + let!(:user) { project.creator } + let!(:gstg) { create(:environment, project: project, name: 'gstg') } + let!(:gprd) { create(:environment, project: project, name: 'gprd') } + + let(:mr1) do + create( + :merge_request, + :simple, + :merged, + author: user, + source_project: project, + target_project: project + ) + end + + let(:mr2) do + create( + :merge_request, + :simple, + :merged, + author: user, + source_project: project, + target_project: project + ) + end + + let(:deploy1) do + create( + :deployment, + :success, + deployable: nil, + environment: gstg, + project: project, + sha: mr1.diff_head_sha, + finished_at: Time.utc(2020, 10, 1, 0, 0) + ) + end + + let(:deploy2) do + create( + :deployment, + :success, + deployable: nil, + environment: gprd, + project: project, + sha: mr2.diff_head_sha, + finished_at: Time.utc(2020, 10, 2, 0, 0) + ) + end + + before do + deploy1.link_merge_requests(MergeRequest.where(id: mr1.id)) + deploy2.link_merge_requests(MergeRequest.where(id: mr2.id)) + + sign_in(user) + visit(project_merge_requests_path(project, state: :merged)) + end + + describe 'filtering by deployed-before' do + it 'applies the filter' do + input_filtered_search('deployed-before:=2020-10-02') + + expect(page).to have_issuable_counts(open: 0, merged: 1, all: 1) + expect(page).to have_content mr1.title + end + end + + describe 'filtering by deployed-after' do + it 'applies the filter' do + input_filtered_search('deployed-after:=2020-10-01') + + expect(page).to have_issuable_counts(open: 0, merged: 1, all: 1) + expect(page).to have_content mr2.title + end + end + + describe 'filtering by environment' do + it 'applies the filter' do + input_filtered_search('environment:=gstg') + + expect(page).to have_issuable_counts(open: 0, merged: 1, all: 1) + expect(page).to have_content mr1.title + end + end +end diff --git a/spec/features/merge_requests/user_lists_merge_requests_spec.rb b/spec/features/merge_requests/user_lists_merge_requests_spec.rb index 4531ef40901..36d28ae2822 100644 --- a/spec/features/merge_requests/user_lists_merge_requests_spec.rb +++ b/spec/features/merge_requests/user_lists_merge_requests_spec.rb @@ -8,6 +8,10 @@ RSpec.describe 'Merge requests > User lists merge requests' do let(:project) { create(:project, :public, :repository) } let(:user) { create(:user) } + let(:user2) { create(:user) } + let(:user3) { create(:user) } + let(:user4) { create(:user) } + let(:user5) { create(:user) } before do @fix = create(:merge_request, @@ -15,6 +19,7 @@ RSpec.describe 'Merge requests > User lists merge requests' do source_project: project, source_branch: 'fix', assignees: [user], + reviewers: [user, user2, user3, user4, user5], milestone: create(:milestone, project: project, due_date: '2013-12-11'), created_at: 1.minute.ago, updated_at: 1.minute.ago) @@ -23,6 +28,7 @@ RSpec.describe 'Merge requests > User lists merge requests' do source_project: project, source_branch: 'markdown', assignees: [user], + reviewers: [user, user2, user3, user4], milestone: create(:milestone, project: project, due_date: '2013-12-12'), created_at: 2.minutes.ago, updated_at: 2.minutes.ago) @@ -34,6 +40,37 @@ RSpec.describe 'Merge requests > User lists merge requests' do updated_at: 10.seconds.ago) end + context 'when merge_request_reviewers is turned on' do + before do + stub_feature_flags(merge_request_reviewers: true) + visit_merge_requests(project, reviewer_id: user.id) + end + + it 'has reviewers in MR list' do + expect(page).to have_css('.issuable-reviewers') + end + + it 'shows reviewers avatar count badge if more_reviewers_count > 4' do + first_issuable_reviewers = first('.issuable-reviewers') + + expect(first_issuable_reviewers).to have_content('2') + expect(first_issuable_reviewers).to have_css('.avatar-counter') + end + + it 'does not show reviewers avatar count badge if more_reviewers_count <= 4' do + expect(page.all('.issuable-reviewers')[1]).not_to have_css('.avatar-counter') + end + end + + context 'when merge_request_reviewers is turned false' do + it 'has no reviewers in MR list' do + stub_feature_flags(merge_request_reviewers: false) + visit_merge_requests(project, reviewer_id: user.id) + + expect(page).not_to have_css('.issuable-reviewers') + end + end + it 'filters on no assignee' do visit_merge_requests(project, assignee_id: IssuableFinder::Params::FILTER_NONE) |