2019-12-21 20:55:43 +05:30
|
|
|
# frozen_string_literal: true
|
|
|
|
|
2014-09-02 18:07:02 +05:30
|
|
|
require 'spec_helper'
|
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
RSpec.describe MergeRequestsFinder do
|
2019-03-13 22:55:13 +05:30
|
|
|
context "multiple projects with merge requests" do
|
2019-07-07 11:18:12 +05:30
|
|
|
include_context 'MergeRequestsFinder multiple projects with merge requests context'
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
shared_examples 'scalar or array parameter' do
|
|
|
|
let(:values) { merge_requests.pluck(attribute) }
|
|
|
|
let(:params) { {} }
|
|
|
|
let(:key) { attribute }
|
|
|
|
|
|
|
|
it 'takes scalar values' do
|
|
|
|
found = described_class.new(user, params.merge(key => values.first)).execute
|
|
|
|
|
|
|
|
expect(found).to contain_exactly(merge_requests.first)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'takes array values' do
|
|
|
|
found = described_class.new(user, params.merge(key => values)).execute
|
|
|
|
|
|
|
|
expect(found).to match_array(merge_requests)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
describe '#execute' do
|
|
|
|
it 'filters by scope' do
|
|
|
|
params = { scope: 'authored', state: 'opened' }
|
2019-07-07 11:18:12 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
merge_requests = described_class.new(user, params).execute
|
2019-07-07 11:18:12 +05:30
|
|
|
|
|
|
|
expect(merge_requests).to contain_exactly(merge_request1, merge_request4, merge_request5)
|
2019-03-13 22:55:13 +05:30
|
|
|
end
|
|
|
|
|
2019-12-04 20:38:33 +05:30
|
|
|
it 'filters by project_id' do
|
2019-03-13 22:55:13 +05:30
|
|
|
params = { project_id: project1.id, scope: 'authored', state: 'opened' }
|
2019-07-07 11:18:12 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
merge_requests = described_class.new(user, params).execute
|
2019-07-07 11:18:12 +05:30
|
|
|
|
|
|
|
expect(merge_requests).to contain_exactly(merge_request1)
|
2019-03-13 22:55:13 +05:30
|
|
|
end
|
|
|
|
|
2019-12-26 22:10:19 +05:30
|
|
|
it 'filters by nonexistent author ID and MR term using CTE for search' do
|
|
|
|
params = {
|
|
|
|
author_id: 'does-not-exist',
|
|
|
|
search: 'git',
|
|
|
|
attempt_group_search_optimizations: true
|
|
|
|
}
|
|
|
|
|
|
|
|
merge_requests = described_class.new(user, params).execute
|
|
|
|
|
|
|
|
expect(merge_requests).to be_empty
|
|
|
|
end
|
|
|
|
|
2020-07-28 23:09:34 +05:30
|
|
|
context 'filtering by not author ID' do
|
|
|
|
let(:params) { { not: { author_id: user2.id } } }
|
|
|
|
|
|
|
|
before do
|
|
|
|
merge_request2.update!(author: user2)
|
|
|
|
merge_request3.update!(author: user2)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns merge requests not created by that user' do
|
|
|
|
merge_requests = described_class.new(user, params).execute
|
|
|
|
|
|
|
|
expect(merge_requests).to contain_exactly(merge_request1, merge_request4, merge_request5)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2019-12-04 20:38:33 +05:30
|
|
|
it 'filters by projects' do
|
|
|
|
params = { projects: [project2.id, project3.id] }
|
|
|
|
|
|
|
|
merge_requests = described_class.new(user, params).execute
|
|
|
|
|
|
|
|
expect(merge_requests).to contain_exactly(merge_request3, merge_request4)
|
|
|
|
end
|
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
it 'filters by commit sha' do
|
|
|
|
merge_requests = described_class.new(
|
|
|
|
user,
|
|
|
|
commit_sha: merge_request5.merge_request_diff.last_commit_sha
|
|
|
|
).execute
|
|
|
|
|
|
|
|
expect(merge_requests).to contain_exactly(merge_request5)
|
|
|
|
end
|
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
context 'filters by merged_at date' do
|
|
|
|
before do
|
|
|
|
merge_request1.metrics.update!(merged_at: 5.days.ago)
|
|
|
|
merge_request2.metrics.update!(merged_at: 10.days.ago)
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'merged_after' do
|
|
|
|
subject { described_class.new(user, merged_after: 6.days.ago).execute }
|
|
|
|
|
|
|
|
it { is_expected.to eq([merge_request1]) }
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'merged_before' do
|
|
|
|
subject { described_class.new(user, merged_before: 6.days.ago).execute }
|
|
|
|
|
|
|
|
it { is_expected.to eq([merge_request2]) }
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'when both merged_after and merged_before is given' do
|
|
|
|
subject { described_class.new(user, merged_after: 15.days.ago, merged_before: 6.days.ago).execute }
|
|
|
|
|
|
|
|
it { is_expected.to eq([merge_request2]) }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
context 'filtering by group' do
|
2019-07-07 11:18:12 +05:30
|
|
|
it 'includes all merge requests when user has access excluding merge requests from projects the user does not have access to' do
|
|
|
|
private_project = allow_gitaly_n_plus_1 { create(:project, :private, group: group) }
|
|
|
|
private_project.add_guest(user)
|
|
|
|
create(:merge_request, :simple, author: user, source_project: private_project, target_project: private_project)
|
2019-03-13 22:55:13 +05:30
|
|
|
params = { group_id: group.id }
|
2018-03-17 18:26:18 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
merge_requests = described_class.new(user, params).execute
|
|
|
|
|
2019-07-07 11:18:12 +05:30
|
|
|
expect(merge_requests).to contain_exactly(merge_request1, merge_request2)
|
2019-03-13 22:55:13 +05:30
|
|
|
end
|
|
|
|
|
2019-10-12 21:52:04 +05:30
|
|
|
it 'filters by group including subgroups' do
|
2019-03-13 22:55:13 +05:30
|
|
|
params = { group_id: group.id, include_subgroups: true }
|
|
|
|
|
|
|
|
merge_requests = described_class.new(user, params).execute
|
|
|
|
|
2019-07-07 11:18:12 +05:30
|
|
|
expect(merge_requests).to contain_exactly(merge_request1, merge_request2, merge_request5)
|
2019-03-13 22:55:13 +05:30
|
|
|
end
|
2019-12-04 20:38:33 +05:30
|
|
|
|
|
|
|
it 'filters by group projects including subgroups' do
|
|
|
|
# project3 is not in the group, so it should not return merge_request4
|
|
|
|
projects = [project3.id, project4.id]
|
|
|
|
params = { group_id: group.id, include_subgroups: true, projects: projects }
|
|
|
|
|
|
|
|
merge_requests = described_class.new(user, params).execute
|
|
|
|
|
|
|
|
expect(merge_requests).to contain_exactly(merge_request5)
|
|
|
|
end
|
2019-03-13 22:55:13 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it 'filters by non_archived' do
|
|
|
|
params = { non_archived: true }
|
2019-07-07 11:18:12 +05:30
|
|
|
|
2019-02-15 15:39:39 +05:30
|
|
|
merge_requests = described_class.new(user, params).execute
|
2019-07-07 11:18:12 +05:30
|
|
|
|
|
|
|
expect(merge_requests).to contain_exactly(merge_request1, merge_request2, merge_request3, merge_request5)
|
2019-03-13 22:55:13 +05:30
|
|
|
end
|
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
describe ':iid parameter' do
|
|
|
|
it_behaves_like 'scalar or array parameter' do
|
|
|
|
let(:params) { { project_id: project1.id } }
|
|
|
|
let(:merge_requests) { [merge_request1, merge_request2] }
|
|
|
|
let(:key) { :iids }
|
|
|
|
let(:attribute) { :iid }
|
|
|
|
end
|
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
[:source_branch, :target_branch].each do |param|
|
|
|
|
describe "#{param} parameter" do
|
|
|
|
let(:merge_requests) { create_list(:merge_request, 2, :unique_branches, source_project: project4, target_project: project4, author: user) }
|
|
|
|
let(:attribute) { param }
|
2019-03-13 22:55:13 +05:30
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
it_behaves_like 'scalar or array parameter'
|
|
|
|
end
|
2019-02-15 15:39:39 +05:30
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
|
2020-11-24 15:15:51 +05:30
|
|
|
shared_examples ':label_name parameter' do
|
|
|
|
describe ':label_name parameter' do
|
|
|
|
let(:common_labels) { create_list(:label, 3) }
|
|
|
|
let(:distinct_labels) { create_list(:label, 3) }
|
|
|
|
let(:merge_requests) do
|
|
|
|
common_attrs = {
|
|
|
|
source_project: project1, target_project: project1, author: user
|
|
|
|
}
|
|
|
|
distinct_labels.map do |label|
|
|
|
|
labels = [label, *common_labels]
|
|
|
|
create(:labeled_merge_request, :closed, labels: labels, **common_attrs)
|
|
|
|
end
|
2020-06-23 00:09:42 +05:30
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
|
2020-11-24 15:15:51 +05:30
|
|
|
def find(label_name)
|
|
|
|
described_class.new(user, label_name: label_name).execute
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'accepts a single label' do
|
|
|
|
found = find(distinct_labels.first.title)
|
|
|
|
common = find(common_labels.first.title)
|
|
|
|
|
|
|
|
expect(found).to contain_exactly(merge_requests.first)
|
|
|
|
expect(common).to match_array(merge_requests)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'accepts an array of labels, all of which must match' do
|
|
|
|
all_distinct = find(distinct_labels.pluck(:title))
|
|
|
|
all_common = find(common_labels.pluck(:title))
|
2019-02-15 15:39:39 +05:30
|
|
|
|
2020-11-24 15:15:51 +05:30
|
|
|
expect(all_distinct).to be_empty
|
|
|
|
expect(all_common).to match_array(merge_requests)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2019-02-15 15:39:39 +05:30
|
|
|
|
2020-11-24 15:15:51 +05:30
|
|
|
context 'when `optimized_issuable_label_filter` feature flag is off' do
|
|
|
|
before do
|
|
|
|
stub_feature_flags(optimized_issuable_label_filter: false)
|
2020-06-23 00:09:42 +05:30
|
|
|
end
|
2019-02-15 15:39:39 +05:30
|
|
|
|
2020-11-24 15:15:51 +05:30
|
|
|
it_behaves_like ':label_name parameter'
|
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
|
2020-11-24 15:15:51 +05:30
|
|
|
context 'when `optimized_issuable_label_filter` feature flag is on' do
|
|
|
|
before do
|
|
|
|
stub_feature_flags(optimized_issuable_label_filter: true)
|
2020-06-23 00:09:42 +05:30
|
|
|
end
|
2020-11-24 15:15:51 +05:30
|
|
|
|
|
|
|
it_behaves_like ':label_name parameter'
|
2019-02-15 15:39:39 +05:30
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
|
2019-07-07 11:18:12 +05:30
|
|
|
it 'filters by source project id' do
|
|
|
|
params = { source_project_id: merge_request2.source_project_id }
|
|
|
|
|
|
|
|
merge_requests = described_class.new(user, params).execute
|
|
|
|
|
|
|
|
expect(merge_requests).to contain_exactly(merge_request1, merge_request2, merge_request3)
|
|
|
|
end
|
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
it 'filters by state' do
|
|
|
|
params = { state: 'locked' }
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
merge_requests = described_class.new(user, params).execute
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
expect(merge_requests).to contain_exactly(merge_request3)
|
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
describe 'draft state' do
|
2019-07-07 11:18:12 +05:30
|
|
|
let!(:wip_merge_request1) { create(:merge_request, :simple, author: user, source_project: project5, target_project: project5, title: 'WIP: thing') }
|
|
|
|
let!(:wip_merge_request2) { create(:merge_request, :simple, author: user, source_project: project6, target_project: project6, title: 'wip thing') }
|
|
|
|
let!(:wip_merge_request3) { create(:merge_request, :simple, author: user, source_project: project1, target_project: project1, title: '[wip] thing') }
|
|
|
|
let!(:wip_merge_request4) { create(:merge_request, :simple, author: user, source_project: project1, target_project: project2, title: 'wip: thing') }
|
2020-10-24 23:57:45 +05:30
|
|
|
let!(:draft_merge_request1) { create(:merge_request, :simple, author: user, source_branch: 'draft1', source_project: project5, target_project: project5, title: 'Draft: thing') }
|
|
|
|
let!(:draft_merge_request2) { create(:merge_request, :simple, author: user, source_branch: 'draft2', source_project: project6, target_project: project6, title: '[draft] thing') }
|
|
|
|
let!(:draft_merge_request3) { create(:merge_request, :simple, author: user, source_branch: 'draft3', source_project: project1, target_project: project1, title: '(draft) thing') }
|
|
|
|
let!(:draft_merge_request4) { create(:merge_request, :simple, author: user, source_branch: 'draft4', source_project: project1, target_project: project2, title: 'Draft - thing') }
|
2018-03-27 19:54:05 +05:30
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
[:wip, :draft].each do |draft_param_key|
|
|
|
|
it "filters by #{draft_param_key}" do
|
|
|
|
params = { draft_param_key => 'yes' }
|
2018-03-27 19:54:05 +05:30
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
merge_requests = described_class.new(user, params).execute
|
2018-03-27 19:54:05 +05:30
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
expect(merge_requests).to contain_exactly(
|
|
|
|
merge_request4, merge_request5, wip_merge_request1, wip_merge_request2, wip_merge_request3, wip_merge_request4,
|
|
|
|
draft_merge_request1, draft_merge_request2, draft_merge_request3, draft_merge_request4
|
|
|
|
)
|
|
|
|
end
|
2018-03-27 19:54:05 +05:30
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
context 'when merge_request_draft_filter is disabled' do
|
|
|
|
it 'does not include draft merge requests' do
|
|
|
|
stub_feature_flags(merge_request_draft_filter: false)
|
2018-03-27 19:54:05 +05:30
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
merge_requests = described_class.new(user, { draft_param_key => 'yes' }).execute
|
2018-03-27 19:54:05 +05:30
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
expect(merge_requests).to contain_exactly(
|
|
|
|
merge_request4, merge_request5, wip_merge_request1, wip_merge_request2, wip_merge_request3, wip_merge_request4
|
|
|
|
)
|
|
|
|
end
|
|
|
|
end
|
2018-11-08 19:23:39 +05:30
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
it "filters by not #{draft_param_key}" do
|
|
|
|
params = { draft_param_key => 'no' }
|
2019-05-18 00:54:41 +05:30
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
merge_requests = described_class.new(user, params).execute
|
2019-07-07 11:18:12 +05:30
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
expect(merge_requests).to contain_exactly(merge_request1, merge_request2, merge_request3)
|
|
|
|
end
|
2018-11-08 19:23:39 +05:30
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
it "returns all items if no valid #{draft_param_key} param exists" do
|
|
|
|
params = { draft_param_key => '' }
|
|
|
|
|
|
|
|
merge_requests = described_class.new(user, params).execute
|
2018-11-08 19:23:39 +05:30
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
expect(merge_requests).to contain_exactly(
|
|
|
|
merge_request1, merge_request2, merge_request3, merge_request4,
|
|
|
|
merge_request5, wip_merge_request1, wip_merge_request2, wip_merge_request3, wip_merge_request4,
|
|
|
|
draft_merge_request1, draft_merge_request2, draft_merge_request3, draft_merge_request4
|
|
|
|
)
|
|
|
|
end
|
2019-07-07 11:18:12 +05:30
|
|
|
end
|
2020-03-13 15:44:24 +05:30
|
|
|
|
|
|
|
context 'filter by deployment' do
|
|
|
|
let_it_be(:project_with_repo) { create(:project, :repository) }
|
|
|
|
|
|
|
|
it 'returns the relevant merge requests' do
|
|
|
|
deployment1 = create(
|
|
|
|
:deployment,
|
|
|
|
project: project_with_repo,
|
2020-05-24 23:13:21 +05:30
|
|
|
sha: project_with_repo.commit.id
|
2020-03-13 15:44:24 +05:30
|
|
|
)
|
2020-05-24 23:13:21 +05:30
|
|
|
deployment2 = create(
|
2020-03-13 15:44:24 +05:30
|
|
|
:deployment,
|
|
|
|
project: project_with_repo,
|
2020-05-24 23:13:21 +05:30
|
|
|
sha: project_with_repo.commit.id
|
2020-03-13 15:44:24 +05:30
|
|
|
)
|
2020-05-24 23:13:21 +05:30
|
|
|
deployment1.link_merge_requests(MergeRequest.where(id: [merge_request1.id, merge_request2.id]))
|
|
|
|
deployment2.link_merge_requests(MergeRequest.where(id: merge_request3.id))
|
|
|
|
|
2020-03-13 15:44:24 +05:30
|
|
|
params = { deployment_id: deployment1.id }
|
|
|
|
merge_requests = described_class.new(user, params).execute
|
|
|
|
|
|
|
|
expect(merge_requests).to contain_exactly(merge_request1, merge_request2)
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when a deployment does not contain any merge requests' do
|
|
|
|
it 'returns an empty result' do
|
|
|
|
params = { deployment_id: create(:deployment, project: project_with_repo, sha: project_with_repo.commit.sha).id }
|
|
|
|
merge_requests = described_class.new(user, params).execute
|
|
|
|
|
|
|
|
expect(merge_requests).to be_empty
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2019-03-13 22:55:13 +05:30
|
|
|
end
|
2018-12-05 23:21:45 +05:30
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
describe '.scalar_params' do
|
|
|
|
it 'contains scalar params related to merge requests' do
|
|
|
|
scalar_params = described_class.scalar_params
|
|
|
|
|
|
|
|
expect(scalar_params).to include(:wip, :draft, :assignee_id)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2019-07-31 22:56:46 +05:30
|
|
|
context 'assignee filtering' do
|
|
|
|
let(:issuables) { described_class.new(user, params).execute }
|
2018-12-05 23:21:45 +05:30
|
|
|
|
2019-07-31 22:56:46 +05:30
|
|
|
it_behaves_like 'assignee ID filter' do
|
|
|
|
let(:params) { { assignee_id: user.id } }
|
|
|
|
let(:expected_issuables) { [merge_request1, merge_request2] }
|
2019-03-13 22:55:13 +05:30
|
|
|
end
|
2018-12-05 23:21:45 +05:30
|
|
|
|
2020-07-28 23:09:34 +05:30
|
|
|
it_behaves_like 'assignee NOT ID filter' do
|
|
|
|
let(:params) { { not: { assignee_id: user.id } } }
|
|
|
|
let(:expected_issuables) { [merge_request3, merge_request4, merge_request5] }
|
|
|
|
end
|
|
|
|
|
2019-07-31 22:56:46 +05:30
|
|
|
it_behaves_like 'assignee username filter' do
|
|
|
|
before do
|
|
|
|
project2.add_developer(user3)
|
|
|
|
merge_request3.assignees = [user2, user3]
|
|
|
|
end
|
2019-07-07 11:18:12 +05:30
|
|
|
|
2020-03-13 15:44:24 +05:30
|
|
|
let_it_be(:user3) { create(:user) }
|
2019-07-31 22:56:46 +05:30
|
|
|
let(:params) { { assignee_username: [user2.username, user3.username] } }
|
|
|
|
let(:expected_issuables) { [merge_request3] }
|
|
|
|
end
|
|
|
|
|
2020-07-28 23:09:34 +05:30
|
|
|
it_behaves_like 'assignee NOT username filter' do
|
|
|
|
before do
|
|
|
|
merge_request2.assignees = [user2]
|
|
|
|
end
|
|
|
|
|
|
|
|
let(:params) { { not: { assignee_username: [user.username, user2.username] } } }
|
|
|
|
let(:expected_issuables) { [merge_request4, merge_request5] }
|
|
|
|
end
|
|
|
|
|
2019-07-31 22:56:46 +05:30
|
|
|
it_behaves_like 'no assignee filter' do
|
2020-03-13 15:44:24 +05:30
|
|
|
let_it_be(:user3) { create(:user) }
|
2019-07-31 22:56:46 +05:30
|
|
|
let(:expected_issuables) { [merge_request4, merge_request5] }
|
|
|
|
end
|
|
|
|
|
|
|
|
it_behaves_like 'any assignee filter' do
|
|
|
|
let(:expected_issuables) { [merge_request1, merge_request2, merge_request3] }
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'filtering by group milestone' do
|
|
|
|
let(:group_milestone) { create(:milestone, group: group) }
|
|
|
|
|
|
|
|
before do
|
2020-10-24 23:57:45 +05:30
|
|
|
merge_request1.update!(milestone: group_milestone)
|
|
|
|
merge_request2.update!(milestone: group_milestone)
|
2019-07-31 22:56:46 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns merge requests assigned to that group milestone' do
|
|
|
|
params = { milestone_title: group_milestone.title }
|
|
|
|
|
|
|
|
merge_requests = described_class.new(user, params).execute
|
2018-12-05 23:21:45 +05:30
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
expect(merge_requests).to contain_exactly(merge_request1, merge_request2)
|
2019-07-31 22:56:46 +05:30
|
|
|
end
|
2020-07-28 23:09:34 +05:30
|
|
|
|
|
|
|
context 'using NOT' do
|
|
|
|
let(:params) { { not: { milestone_title: group_milestone.title } } }
|
|
|
|
|
|
|
|
it 'returns MRs not assigned to that group milestone' do
|
|
|
|
merge_requests = described_class.new(user, params).execute
|
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
expect(merge_requests).to contain_exactly(merge_request3, merge_request4, merge_request5)
|
2020-07-28 23:09:34 +05:30
|
|
|
end
|
|
|
|
end
|
2019-03-13 22:55:13 +05:30
|
|
|
end
|
|
|
|
end
|
2018-12-05 23:21:45 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
context 'filtering by created_at/updated_at' do
|
|
|
|
let(:new_project) { create(:project, forked_from_project: project1) }
|
2018-12-05 23:21:45 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
let!(:new_merge_request) do
|
|
|
|
create(:merge_request,
|
|
|
|
:simple,
|
|
|
|
author: user,
|
|
|
|
created_at: 1.week.from_now,
|
|
|
|
updated_at: 1.week.from_now,
|
|
|
|
source_project: new_project,
|
|
|
|
target_project: new_project)
|
|
|
|
end
|
2018-12-05 23:21:45 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
let!(:old_merge_request) do
|
|
|
|
create(:merge_request,
|
|
|
|
:simple,
|
|
|
|
author: user,
|
|
|
|
source_branch: 'feature_1',
|
|
|
|
created_at: 1.week.ago,
|
|
|
|
updated_at: 1.week.ago,
|
|
|
|
source_project: new_project,
|
|
|
|
target_project: new_project)
|
|
|
|
end
|
2018-12-05 23:21:45 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
before do
|
|
|
|
new_project.add_maintainer(user)
|
|
|
|
end
|
2018-12-05 23:21:45 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
it 'filters by created_after' do
|
|
|
|
params = { project_id: new_project.id, created_after: new_merge_request.created_at }
|
2018-12-05 23:21:45 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
merge_requests = described_class.new(user, params).execute
|
2018-12-05 23:21:45 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
expect(merge_requests).to contain_exactly(new_merge_request)
|
|
|
|
end
|
2017-09-10 17:25:29 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
it 'filters by created_before' do
|
|
|
|
params = { project_id: new_project.id, created_before: old_merge_request.created_at }
|
2017-09-10 17:25:29 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
merge_requests = described_class.new(user, params).execute
|
2017-09-10 17:25:29 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
expect(merge_requests).to contain_exactly(old_merge_request)
|
|
|
|
end
|
2017-09-10 17:25:29 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
it 'filters by created_after and created_before' do
|
|
|
|
params = {
|
|
|
|
project_id: new_project.id,
|
|
|
|
created_after: old_merge_request.created_at,
|
|
|
|
created_before: new_merge_request.created_at
|
|
|
|
}
|
2017-09-10 17:25:29 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
merge_requests = described_class.new(user, params).execute
|
2017-09-10 17:25:29 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
expect(merge_requests).to contain_exactly(old_merge_request, new_merge_request)
|
|
|
|
end
|
2017-09-10 17:25:29 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
it 'filters by updated_after' do
|
|
|
|
params = { project_id: new_project.id, updated_after: new_merge_request.updated_at }
|
2017-09-10 17:25:29 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
merge_requests = described_class.new(user, params).execute
|
2017-09-10 17:25:29 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
expect(merge_requests).to contain_exactly(new_merge_request)
|
|
|
|
end
|
2017-09-10 17:25:29 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
it 'filters by updated_before' do
|
|
|
|
params = { project_id: new_project.id, updated_before: old_merge_request.updated_at }
|
2017-09-10 17:25:29 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
merge_requests = described_class.new(user, params).execute
|
2017-09-10 17:25:29 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
expect(merge_requests).to contain_exactly(old_merge_request)
|
|
|
|
end
|
2018-03-27 19:54:05 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
it 'filters by updated_after and updated_before' do
|
|
|
|
params = {
|
|
|
|
project_id: new_project.id,
|
|
|
|
updated_after: old_merge_request.updated_at,
|
|
|
|
updated_before: new_merge_request.updated_at
|
|
|
|
}
|
2018-03-27 19:54:05 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
merge_requests = described_class.new(user, params).execute
|
2018-03-27 19:54:05 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
expect(merge_requests).to contain_exactly(old_merge_request, new_merge_request)
|
|
|
|
end
|
2018-03-27 19:54:05 +05:30
|
|
|
end
|
2019-03-13 22:55:13 +05:30
|
|
|
end
|
2018-03-27 19:54:05 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
describe '#row_count', :request_store do
|
|
|
|
it 'returns the number of rows for the default state' do
|
|
|
|
finder = described_class.new(user)
|
2018-03-27 19:54:05 +05:30
|
|
|
|
2019-07-07 11:18:12 +05:30
|
|
|
expect(finder.row_count).to eq(3)
|
2019-03-13 22:55:13 +05:30
|
|
|
end
|
2018-03-27 19:54:05 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
it 'returns the number of rows for a given state' do
|
|
|
|
finder = described_class.new(user, state: 'closed')
|
|
|
|
|
|
|
|
expect(finder.row_count).to eq(1)
|
2018-03-27 19:54:05 +05:30
|
|
|
end
|
2019-03-13 22:55:13 +05:30
|
|
|
end
|
2019-07-07 11:18:12 +05:30
|
|
|
|
|
|
|
context 'external authorization' do
|
|
|
|
it_behaves_like 'a finder with external authorization service' do
|
|
|
|
let!(:subject) { create(:merge_request, source_project: project) }
|
|
|
|
let(:project_params) { { project_id: project.id } }
|
|
|
|
end
|
|
|
|
end
|
2019-03-13 22:55:13 +05:30
|
|
|
end
|
2018-03-27 19:54:05 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
context 'when projects require different access levels for merge requests' do
|
|
|
|
let(:user) { create(:user) }
|
2018-03-27 19:54:05 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
let(:public_project) { create(:project, :public) }
|
|
|
|
let(:internal) { create(:project, :internal) }
|
|
|
|
let(:private_project) { create(:project, :private) }
|
|
|
|
let(:public_with_private_repo) { create(:project, :public, :repository, :repository_private) }
|
|
|
|
let(:internal_with_private_repo) { create(:project, :internal, :repository, :repository_private) }
|
|
|
|
|
|
|
|
let(:merge_requests) { described_class.new(user, {}).execute }
|
|
|
|
|
|
|
|
let!(:mr_public) { create(:merge_request, source_project: public_project) }
|
|
|
|
let!(:mr_private) { create(:merge_request, source_project: private_project) }
|
|
|
|
let!(:mr_internal) { create(:merge_request, source_project: internal) }
|
|
|
|
let!(:mr_private_repo_access) { create(:merge_request, source_project: public_with_private_repo) }
|
|
|
|
let!(:mr_internal_private_repo_access) { create(:merge_request, source_project: internal_with_private_repo) }
|
|
|
|
|
|
|
|
context 'with admin user' do
|
|
|
|
let(:user) { create(:user, :admin) }
|
2018-03-27 19:54:05 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
it 'returns all merge requests' do
|
|
|
|
expect(merge_requests).to eq(
|
|
|
|
[mr_internal_private_repo_access, mr_private_repo_access, mr_internal, mr_private, mr_public]
|
|
|
|
)
|
2018-03-27 19:54:05 +05:30
|
|
|
end
|
2019-03-13 22:55:13 +05:30
|
|
|
end
|
2018-03-27 19:54:05 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
context 'when project restricts merge requests' do
|
|
|
|
let(:non_member) { create(:user) }
|
|
|
|
let(:project) { create(:project, :repository, :public, :merge_requests_private) }
|
|
|
|
let!(:merge_request) { create(:merge_request, source_project: project) }
|
2018-03-27 19:54:05 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
it "returns nothing to to non members" do
|
|
|
|
merge_requests = described_class.new(
|
|
|
|
non_member,
|
|
|
|
project_id: project.id
|
|
|
|
).execute
|
2018-03-27 19:54:05 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
expect(merge_requests).to be_empty
|
2018-03-27 19:54:05 +05:30
|
|
|
end
|
2017-09-10 17:25:29 +05:30
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
context 'with external user' do
|
|
|
|
let(:user) { create(:user, :external) }
|
2018-03-17 18:26:18 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
it 'returns only public merge requests' do
|
|
|
|
expect(merge_requests).to eq([mr_public])
|
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
end
|
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
context 'with authenticated user' do
|
|
|
|
it 'returns public and internal merge requests' do
|
|
|
|
expect(merge_requests).to eq([mr_internal, mr_public])
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'being added to the private project' do
|
|
|
|
context 'as a guest' do
|
|
|
|
before do
|
|
|
|
private_project.add_guest(user)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not return merge requests from the private project' do
|
|
|
|
expect(merge_requests).to eq([mr_internal, mr_public])
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'as a developer' do
|
|
|
|
before do
|
|
|
|
private_project.add_developer(user)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns merge requests from the private project' do
|
|
|
|
expect(merge_requests).to eq([mr_internal, mr_private, mr_public])
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
|
2019-03-13 22:55:13 +05:30
|
|
|
context 'being added to the public project with private repo access' do
|
|
|
|
context 'as a guest' do
|
|
|
|
before do
|
|
|
|
public_with_private_repo.add_guest(user)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns merge requests from the project' do
|
|
|
|
expect(merge_requests).to eq([mr_internal, mr_public])
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'as a reporter' do
|
|
|
|
before do
|
|
|
|
public_with_private_repo.add_reporter(user)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns merge requests from the project' do
|
|
|
|
expect(merge_requests).to eq([mr_private_repo_access, mr_internal, mr_public])
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'being added to the internal project with private repo access' do
|
|
|
|
context 'as a guest' do
|
|
|
|
before do
|
|
|
|
internal_with_private_repo.add_guest(user)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns merge requests from the project' do
|
|
|
|
expect(merge_requests).to eq([mr_internal, mr_public])
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'as a reporter' do
|
|
|
|
before do
|
|
|
|
internal_with_private_repo.add_reporter(user)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns merge requests from the project' do
|
|
|
|
expect(merge_requests).to eq([mr_internal_private_repo_access, mr_internal, mr_public])
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
end
|
|
|
|
end
|
2014-09-02 18:07:02 +05:30
|
|
|
end
|