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
This commit is contained in:
Robert Speicher 2017-08-22 21:24:39 +00:00
commit 8c09d09082
1 changed files with 6 additions and 0 deletions

View File

@ -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)