| ... | ... | @@ -13,6 +13,7 @@ describe MergeRequestsFinder do |
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context "multiple projects with merge requests" do
|
|
|
|
let(:user) { create :user }
|
|
|
|
let(:user2) { create :user }
|
|
|
|
|
| ... | ... | @@ -55,7 +56,7 @@ describe MergeRequestsFinder do |
|
|
|
project6.add_developer(user)
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "#execute" do
|
|
|
|
describe '#execute' do
|
|
|
|
it 'filters by scope' do
|
|
|
|
params = { scope: 'authored', state: 'opened' }
|
|
|
|
merge_requests = described_class.new(user, params).execute
|
| ... | ... | @@ -278,6 +279,49 @@ describe MergeRequestsFinder do |
|
|
|
expect(merge_requests).to contain_exactly(old_merge_request, new_merge_request)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#row_count', :request_store do
|
|
|
|
it 'returns the number of rows for the default state' do
|
|
|
|
finder = described_class.new(user)
|
|
|
|
|
|
|
|
expect(finder.row_count).to eq(7)
|
|
|
|
end
|
|
|
|
|
|
|
|
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)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when projects require different access levels for merge requests' do
|
|
|
|
let(:user) { create(:user) }
|
|
|
|
|
|
|
|
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) }
|
|
|
|
|
|
|
|
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]
|
|
|
|
)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when project restricts merge requests' do
|
|
|
|
let(:non_member) { create(:user) }
|
| ... | ... | @@ -293,19 +337,85 @@ describe MergeRequestsFinder do |
|
|
|
expect(merge_requests).to be_empty
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'with external user' do
|
|
|
|
let(:user) { create(:user, :external) }
|
|
|
|
|
|
|
|
it 'returns only public merge requests' do
|
|
|
|
expect(merge_requests).to eq([mr_public])
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#row_count', :request_store do
|
|
|
|
it 'returns the number of rows for the default state' do
|
|
|
|
finder = described_class.new(user)
|
|
|
|
context 'with authenticated user' do
|
|
|
|
it 'returns public and internal merge requests' do
|
|
|
|
expect(merge_requests).to eq([mr_internal, mr_public])
|
|
|
|
end
|
|
|
|
|
|
|
|
expect(finder.row_count).to eq(7)
|
|
|
|
context 'being added to the private project' do
|
|
|
|
context 'as a guest' do
|
|
|
|
before do
|
|
|
|
private_project.add_guest(user)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns the number of rows for a given state' do
|
|
|
|
finder = described_class.new(user, state: 'closed')
|
|
|
|
it 'does not return merge requests from the private project' do
|
|
|
|
expect(merge_requests).to eq([mr_internal, mr_public])
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
expect(finder.row_count).to eq(1)
|
|
|
|
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
|
|
|
|
|
|
|
|
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
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end |