summaryrefslogtreecommitdiff
path: root/spec/models/group_spec.rb
diff options
context:
space:
mode:
authorJames Lopez <james@gitlab.com>2018-12-06 13:15:29 +0000
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2018-12-06 13:15:29 +0000
commit64c11f104ceffdb7699686445ddc16c894dbe0c5 (patch)
treed4331a41db06511c3f4daaa6ec853110f31b4260 /spec/models/group_spec.rb
parent39c769aee8af82cd755a4c666a22eb5d6bec808e (diff)
downloadgitlab-ce-64c11f104ceffdb7699686445ddc16c894dbe0c5.tar.gz
Resolve "Can add an existing group member into a group project with new permissions but permissions are not overridden"
Diffstat (limited to 'spec/models/group_spec.rb')
-rw-r--r--spec/models/group_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index 0c3a49cd0f2..87aa5a46c21 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -76,7 +76,7 @@ describe Group do
before do
group.add_developer(user)
- sub_group.add_developer(user)
+ sub_group.add_maintainer(user)
end
it 'also gets notification settings from parent groups' do
@@ -498,7 +498,7 @@ describe Group do
it 'returns member users on every nest level without duplication' do
group.add_developer(user_a)
nested_group.add_developer(user_b)
- deep_nested_group.add_developer(user_a)
+ deep_nested_group.add_maintainer(user_a)
expect(group.users_with_descendants).to contain_exactly(user_a, user_b)
expect(nested_group.users_with_descendants).to contain_exactly(user_a, user_b)