diff options
author | Robert Speicher <robert@gitlab.com> | 2017-08-22 21:24:39 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-08-22 21:24:39 +0000 |
commit | 8c09d09082e8abf1f66a01d0840340956ad76b60 (patch) | |
tree | 0dab8abe94b8b83a833f30ae5b771d0f247256ab | |
parent | df51a8009920f7efae87d2118e7199aaf6cc0d88 (diff) | |
parent | 6426168dd6c94d9e45c1bb4a055ea285b199740a (diff) | |
download | gitlab-ce-8c09d09082e8abf1f66a01d0840340956ad76b60.tar.gz |
Merge branch 'fix-group-policy-specs-on-mysql' into 'master'
Fixes group policy specs on MySQL.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/36810
See merge request !13747
-rw-r--r-- | spec/policies/group_policy_spec.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/policies/group_policy_spec.rb b/spec/policies/group_policy_spec.rb index cf420ae3ea6..7f832bfa563 100644 --- a/spec/policies/group_policy_spec.rb +++ b/spec/policies/group_policy_spec.rb @@ -105,6 +105,8 @@ describe GroupPolicy do let(:current_user) { owner } it do + allow(Group).to receive(:supports_nested_groups?).and_return(true) + expect_allowed(:read_group) expect_allowed(*reporter_permissions) expect_allowed(*master_permissions) @@ -116,6 +118,8 @@ describe GroupPolicy do let(:current_user) { admin } it do + allow(Group).to receive(:supports_nested_groups?).and_return(true) + expect_allowed(:read_group) expect_allowed(*reporter_permissions) expect_allowed(*master_permissions) @@ -229,6 +233,8 @@ describe GroupPolicy do let(:current_user) { owner } it do + allow(Group).to receive(:supports_nested_groups?).and_return(true) + expect_allowed(:read_group) expect_allowed(*reporter_permissions) expect_allowed(*master_permissions) |