ec0061a95c
Changes include: - Ensure Member.add_user is not called directly when not necessary - New GroupMember.add_users_to_group to have the same abstraction level as for Project - Refactor Member.add_user to take a source instead of an array of members - Fix Rubocop offenses - Always use Project#add_user instead of project.team.add_user - Factorize users addition as members in Member.add_users_to_source - Make access_level a keyword argument in GroupMember.add_users_to_group and ProjectMember.add_users_to_projects - Destroy any requester before adding them as a member - Improve the way we handle access requesters in Member.add_user Instead of removing the requester and creating a new member, we now simply accepts their access request. This way, they will receive a "access request granted" email. - Fix error that was previously silently ignored - Stop raising when access level is invalid in Member, let Rails validation do their work Signed-off-by: Rémy Coutable <remy@rymai.me>
58 lines
1.4 KiB
Ruby
58 lines
1.4 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe ProjectsFinder do
|
|
describe '#execute' do
|
|
let(:user) { create(:user) }
|
|
let(:group) { create(:group, :public) }
|
|
|
|
let!(:private_project) do
|
|
create(:project, :private, name: 'A', path: 'A')
|
|
end
|
|
|
|
let!(:internal_project) do
|
|
create(:project, :internal, group: group, name: 'B', path: 'B')
|
|
end
|
|
|
|
let!(:public_project) do
|
|
create(:project, :public, group: group, name: 'C', path: 'C')
|
|
end
|
|
|
|
let!(:shared_project) do
|
|
create(:project, :private, name: 'D', path: 'D')
|
|
end
|
|
|
|
let(:finder) { described_class.new }
|
|
|
|
describe 'without a user' do
|
|
subject { finder.execute }
|
|
|
|
it { is_expected.to eq([public_project]) }
|
|
end
|
|
|
|
describe 'with a user' do
|
|
subject { finder.execute(user) }
|
|
|
|
describe 'without private projects' do
|
|
it { is_expected.to eq([public_project, internal_project]) }
|
|
end
|
|
|
|
describe 'with private projects' do
|
|
before do
|
|
private_project.add_user(user, Gitlab::Access::MASTER)
|
|
end
|
|
|
|
it do
|
|
is_expected.to eq([public_project, internal_project, private_project])
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'with project_ids_relation' do
|
|
let(:project_ids_relation) { Project.where(id: internal_project.id) }
|
|
|
|
subject { finder.execute(user, project_ids_relation) }
|
|
|
|
it { is_expected.to eq([internal_project]) }
|
|
end
|
|
end
|
|
end
|