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>
150 lines
4.4 KiB
Ruby
150 lines
4.4 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe ProjectMember, models: true do
|
|
describe 'associations' do
|
|
it { is_expected.to belong_to(:project).class_name('Project').with_foreign_key(:source_id) }
|
|
end
|
|
|
|
describe 'validations' do
|
|
it { is_expected.to allow_value('Project').for(:source_type) }
|
|
it { is_expected.not_to allow_value('project').for(:source_type) }
|
|
it { is_expected.to validate_inclusion_of(:access_level).in_array(Gitlab::Access.values) }
|
|
end
|
|
|
|
describe 'modules' do
|
|
it { is_expected.to include_module(Gitlab::ShellAdapter) }
|
|
end
|
|
|
|
describe '.access_level_roles' do
|
|
it 'returns Gitlab::Access.options' do
|
|
expect(described_class.access_level_roles).to eq(Gitlab::Access.options)
|
|
end
|
|
end
|
|
|
|
describe '.add_user' do
|
|
context 'when called with the project owner' do
|
|
it 'adds the user as a member' do
|
|
project = create(:empty_project)
|
|
|
|
expect(project.users).not_to include(project.owner)
|
|
|
|
described_class.add_user(project, project.owner, :master, current_user: project.owner)
|
|
|
|
expect(project.users.reload).to include(project.owner)
|
|
end
|
|
end
|
|
end
|
|
|
|
describe '#real_source_type' do
|
|
subject { create(:project_member).real_source_type }
|
|
|
|
it { is_expected.to eq 'Project' }
|
|
end
|
|
|
|
describe "#destroy" do
|
|
let(:owner) { create(:project_member, access_level: ProjectMember::MASTER) }
|
|
let(:project) { owner.project }
|
|
let(:master) { create(:project_member, project: project) }
|
|
|
|
let(:owner_todos) { (0...2).map { create(:todo, user: owner.user, project: project) } }
|
|
let(:master_todos) { (0...3).map { create(:todo, user: master.user, project: project) } }
|
|
|
|
before do
|
|
owner_todos
|
|
master_todos
|
|
end
|
|
|
|
it "destroys itself and delete associated todos" do
|
|
expect(owner.user.todos.size).to eq(2)
|
|
expect(master.user.todos.size).to eq(3)
|
|
expect(Todo.count).to eq(5)
|
|
|
|
master_todo_ids = master_todos.map(&:id)
|
|
master.destroy
|
|
|
|
expect(owner.user.todos.size).to eq(2)
|
|
expect(Todo.count).to eq(2)
|
|
master_todo_ids.each do |id|
|
|
expect(Todo.exists?(id)).to eq(false)
|
|
end
|
|
end
|
|
end
|
|
|
|
describe '.import_team' do
|
|
before do
|
|
@project_1 = create :project
|
|
@project_2 = create :project
|
|
|
|
@user_1 = create :user
|
|
@user_2 = create :user
|
|
|
|
@project_1.team << [ @user_1, :developer ]
|
|
@project_2.team << [ @user_2, :reporter ]
|
|
|
|
@status = @project_2.team.import(@project_1)
|
|
end
|
|
|
|
it { expect(@status).to be_truthy }
|
|
|
|
describe 'project 2 should get user 1 as developer. user_2 should not be changed' do
|
|
it { expect(@project_2.users).to include(@user_1) }
|
|
it { expect(@project_2.users).to include(@user_2) }
|
|
|
|
it { expect(Ability.allowed?(@user_1, :create_project, @project_2)).to be_truthy }
|
|
it { expect(Ability.allowed?(@user_2, :read_project, @project_2)).to be_truthy }
|
|
end
|
|
|
|
describe 'project 1 should not be changed' do
|
|
it { expect(@project_1.users).to include(@user_1) }
|
|
it { expect(@project_1.users).not_to include(@user_2) }
|
|
end
|
|
end
|
|
|
|
describe '.add_users_to_projects' do
|
|
it 'adds the given users to the given projects' do
|
|
projects = create_list(:empty_project, 2)
|
|
users = create_list(:user, 2)
|
|
|
|
described_class.add_users_to_projects(
|
|
[projects.first.id, projects.second],
|
|
[users.first.id, users.second],
|
|
described_class::MASTER)
|
|
|
|
expect(projects.first.users).to include(users.first)
|
|
expect(projects.first.users).to include(users.second)
|
|
|
|
expect(projects.second.users).to include(users.first)
|
|
expect(projects.second.users).to include(users.second)
|
|
end
|
|
end
|
|
|
|
describe '.truncate_teams' do
|
|
before do
|
|
@project_1 = create :project
|
|
@project_2 = create :project
|
|
|
|
@user_1 = create :user
|
|
@user_2 = create :user
|
|
|
|
@project_1.team << [ @user_1, :developer]
|
|
@project_2.team << [ @user_2, :reporter]
|
|
|
|
ProjectMember.truncate_teams([@project_1.id, @project_2.id])
|
|
end
|
|
|
|
it { expect(@project_1.users).to be_empty }
|
|
it { expect(@project_2.users).to be_empty }
|
|
end
|
|
|
|
describe 'notifications' do
|
|
describe '#after_accept_request' do
|
|
it 'calls NotificationService.new_project_member' do
|
|
member = create(:project_member, user: build_stubbed(:user), requested_at: Time.now)
|
|
|
|
expect_any_instance_of(NotificationService).to receive(:new_project_member)
|
|
|
|
member.__send__(:after_accept_request)
|
|
end
|
|
end
|
|
end
|
|
end
|