| ... | @@ -31,7 +31,7 @@ describe MergeRequestsFinder do |
... | @@ -31,7 +31,7 @@ describe MergeRequestsFinder do |
|
|
p
|
|
p
|
|
|
end
|
|
end
|
|
|
end
|
|
end
|
|
|
let(:project4) { create_project_without_n_plus_1(group: subgroup) }
|
|
let(:project4) { create_project_without_n_plus_1(:repository, group: subgroup) }
|
|
|
let(:project5) { create_project_without_n_plus_1(group: subgroup) }
|
|
let(:project5) { create_project_without_n_plus_1(group: subgroup) }
|
|
|
let(:project6) { create_project_without_n_plus_1(group: subgroup) }
|
|
let(:project6) { create_project_without_n_plus_1(group: subgroup) }
|
|
|
|
|
|
| ... | @@ -68,6 +68,15 @@ describe MergeRequestsFinder do |
... | @@ -68,6 +68,15 @@ describe MergeRequestsFinder do |
|
|
expect(merge_requests.size).to eq(2)
|
|
expect(merge_requests.size).to eq(2)
|
|
|
end
|
|
end
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
|
|
context 'filtering by group' do
|
|
context 'filtering by group' do
|
|
|
it 'includes all merge requests when user has access' do
|
|
it 'includes all merge requests when user has access' do
|
|
|
params = { group_id: group.id }
|
|
params = { group_id: group.id }
|
| ... | @@ -269,6 +278,21 @@ describe MergeRequestsFinder do |
... | @@ -269,6 +278,21 @@ describe MergeRequestsFinder do |
|
|
expect(merge_requests).to contain_exactly(old_merge_request, new_merge_request)
|
|
expect(merge_requests).to contain_exactly(old_merge_request, new_merge_request)
|
|
|
end
|
|
end
|
|
|
end
|
|
end
|
|
|
|
|
|
|
|
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) }
|
|
|
|
|
|
|
|
it "returns nothing to to non members" do
|
|
|
|
merge_requests = described_class.new(
|
|
|
|
non_member,
|
|
|
|
project_id: project.id
|
|
|
|
).execute
|
|
|
|
|
|
|
|
expect(merge_requests).to be_empty
|
|
|
|
end
|
|
|
|
end
|
|
|
end
|
|
end
|
|
|
|
|
|
|
|
describe '#row_count', :request_store do
|
|
describe '#row_count', :request_store do
|
| ... | |
... | |
| ... | | ... | |