summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMałgorzata Ksionek <meksionek@gmail.com>2019-03-13 11:54:06 +0100
committerMałgorzata Ksionek <meksionek@gmail.com>2019-03-13 11:54:06 +0100
commit03fa783409694e6748b2b0ac06315a8d2dfd2c7e (patch)
treec71c87333e1a92123ed9f51ba29ccecd51291748
parente285fb50498912c7fbabf5edfe64a9bedd85fc71 (diff)
downloadgitlab-ce-fix-false-positive-specs.tar.gz
-rw-r--r--spec/features/security/group/private_access_spec.rb10
-rw-r--r--spec/policies/group_policy_spec.rb27
2 files changed, 5 insertions, 32 deletions
diff --git a/spec/features/security/group/private_access_spec.rb b/spec/features/security/group/private_access_spec.rb
index 8944124bd72..21be6126884 100644
--- a/spec/features/security/group/private_access_spec.rb
+++ b/spec/features/security/group/private_access_spec.rb
@@ -96,20 +96,12 @@ 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,
- linking_user,
- link_group_access: ProjectGroupLink::DEVELOPER
- ).execute(group)
+ create(:project_group_link, project: project, group: 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 28fc7e0ddf5..92bdaa8b8b8 100644
--- a/spec/policies/group_policy_spec.rb
+++ b/spec/policies/group_policy_spec.rb
@@ -76,23 +76,13 @@ describe GroupPolicy do
context 'with no user and public project' do
let(:project) { create(:project, :public) }
- let(:user) { create(:user) }
let(:current_user) { nil }
before do
- group.add_developer(user)
-
- Projects::GroupLinks::CreateService.new(
- project,
- user,
- link_group_access: ProjectGroupLink::DEVELOPER
- ).execute(group)
+ create(:project_group_link, project: project, group: group)
end
- it do
- expect(group.shared_projects).not_to be_empty
- expect_disallowed(:read_group)
- end
+ it { expect_disallowed(:read_group) }
end
context 'with foreign user and public project' do
@@ -101,19 +91,10 @@ describe GroupPolicy do
let(:current_user) { create(:user) }
before do
- group.add_developer(user)
-
- Projects::GroupLinks::CreateService.new(
- project,
- user,
- link_group_access: ProjectGroupLink::DEVELOPER
- ).execute(group)
+ create(:project_group_link, project: project, group: group)
end
- it do
- expect(group.shared_projects).not_to be_empty
- expect_disallowed(:read_group)
- end
+ it { expect_disallowed(:read_group) }
end
context 'has projects' do