diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-31 10:40:07 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-31 10:40:07 +0000 |
commit | 493cb38db1fc08f2c8cb3bb18a8ef2199eb76e02 (patch) | |
tree | 0d74efc84a8d36218360119393f440f084345f16 /spec/models | |
parent | 8a97772aca25cb233778ce99c487c674c86ba2fd (diff) | |
download | gitlab-ce-493cb38db1fc08f2c8cb3bb18a8ef2199eb76e02.tar.gz |
Add latest changes from gitlab-org/security/gitlab@12-6-stable-ee
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/user_spec.rb | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 749d80ebfc2..58aa945bff0 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -2637,8 +2637,8 @@ describe User, :do_not_mock_admin_mode do add_user(:maintainer) end - it 'loads' do - expect(user.ci_owned_runners).to contain_exactly(runner) + it 'does not load' do + expect(user.ci_owned_runners).to be_empty end end @@ -2653,6 +2653,20 @@ describe User, :do_not_mock_admin_mode do end end + shared_examples :group_member do + context 'when the user is owner' do + before do + add_user(:owner) + end + + it 'loads' do + expect(user.ci_owned_runners).to contain_exactly(runner) + end + end + + it_behaves_like :member + end + context 'with groups projects runners' do let(:group) { create(:group) } let!(:project) { create(:project, group: group) } @@ -2661,7 +2675,7 @@ describe User, :do_not_mock_admin_mode do group.add_user(user, access) end - it_behaves_like :member + it_behaves_like :group_member end context 'with groups runners' do @@ -2672,14 +2686,14 @@ describe User, :do_not_mock_admin_mode do group.add_user(user, access) end - it_behaves_like :member + it_behaves_like :group_member end context 'with other projects runners' do let!(:project) { create(:project) } def add_user(access) - project.add_role(user, access) + project.add_user(user, access) end it_behaves_like :member @@ -2697,7 +2711,7 @@ describe User, :do_not_mock_admin_mode do subgroup.add_user(another_user, :owner) end - it_behaves_like :member + it_behaves_like :group_member end end |