summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMałgorzata Ksionek <meksionek@gmail.com>2019-03-12 12:33:45 +0100
committerMałgorzata Ksionek <meksionek@gmail.com>2019-03-12 12:33:45 +0100
commite285fb50498912c7fbabf5edfe64a9bedd85fc71 (patch)
tree41c9c6f322c8dad2f4094d1b767aa13951c6d610
parente4b2c3b08b0aced417e072e60d5b299144c40474 (diff)
downloadgitlab-ce-e285fb50498912c7fbabf5edfe64a9bedd85fc71.tar.gz
Fix false positive specs
-rw-r--r--spec/features/security/group/private_access_spec.rb6
-rw-r--r--spec/policies/group_policy_spec.rb14
2 files changed, 17 insertions, 3 deletions
diff --git a/spec/features/security/group/private_access_spec.rb b/spec/features/security/group/private_access_spec.rb
index 3238e07fe15..8944124bd72 100644
--- a/spec/features/security/group/private_access_spec.rb
+++ b/spec/features/security/group/private_access_spec.rb
@@ -96,16 +96,20 @@ describe 'Private Group access' do
describe 'GET /groups/:path for shared projects' do
let(:project) { create(:project, :public) }
+ let(:linking_user) { create(:user) }
before do
+ group.add_guest(linking_user)
+
Projects::GroupLinks::CreateService.new(
project,
- create(:user),
+ linking_user,
link_group_access: ProjectGroupLink::DEVELOPER
).execute(group)
end
subject { group_path(group) }
+ it { expect(group.shared_projects).not_to be_empty }
it { is_expected.to be_allowed_for(:admin) }
it { is_expected.to be_allowed_for(:owner).of(group) }
it { is_expected.to be_allowed_for(:maintainer).of(group) }
diff --git a/spec/policies/group_policy_spec.rb b/spec/policies/group_policy_spec.rb
index 0ad50c6f91f..28fc7e0ddf5 100644
--- a/spec/policies/group_policy_spec.rb
+++ b/spec/policies/group_policy_spec.rb
@@ -80,6 +80,8 @@ describe GroupPolicy do
let(:current_user) { nil }
before do
+ group.add_developer(user)
+
Projects::GroupLinks::CreateService.new(
project,
user,
@@ -87,7 +89,10 @@ describe GroupPolicy do
).execute(group)
end
- it { expect_disallowed(:read_group) }
+ it do
+ expect(group.shared_projects).not_to be_empty
+ expect_disallowed(:read_group)
+ end
end
context 'with foreign user and public project' do
@@ -96,6 +101,8 @@ describe GroupPolicy do
let(:current_user) { create(:user) }
before do
+ group.add_developer(user)
+
Projects::GroupLinks::CreateService.new(
project,
user,
@@ -103,7 +110,10 @@ describe GroupPolicy do
).execute(group)
end
- it { expect_disallowed(:read_group) }
+ it do
+ expect(group.shared_projects).not_to be_empty
+ expect_disallowed(:read_group)
+ end
end
context 'has projects' do