summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2019-03-13 16:32:46 +0000
committerLin Jen-Shin <godfat@godfat.org>2019-03-13 16:32:46 +0000
commitff26347d5e52a4c0b1d3ae690df1529bb8d7b5a1 (patch)
tree307f620134bf97e6018aa0fab2b82493eed6b004
parent0f04d4b2b4f41b5530ac7110d1c883540d5bc96f (diff)
parent03fa783409694e6748b2b0ac06315a8d2dfd2c7e (diff)
downloadgitlab-ce-57092-geo-clone-button-should-check-for-geo.tar.gz
Merge branch 'fix-false-positive-specs' into 'master'57092-geo-clone-button-should-check-for-geo
Fix false positive specs See merge request gitlab-org/gitlab-ce!26031
-rw-r--r--spec/features/security/group/private_access_spec.rb6
-rw-r--r--spec/policies/group_policy_spec.rb13
2 files changed, 3 insertions, 16 deletions
diff --git a/spec/features/security/group/private_access_spec.rb b/spec/features/security/group/private_access_spec.rb
index de38a2c0204..a776169a8e5 100644
--- a/spec/features/security/group/private_access_spec.rb
+++ b/spec/features/security/group/private_access_spec.rb
@@ -98,11 +98,7 @@ describe 'Private Group access' do
let(:project) { create(:project, :public) }
before do
- Projects::GroupLinks::CreateService.new(
- project,
- create(:user),
- link_group_access: ProjectGroupLink::DEVELOPER
- ).execute(group)
+ create(:project_group_link, project: project, group: group)
end
subject { group_path(group) }
diff --git a/spec/policies/group_policy_spec.rb b/spec/policies/group_policy_spec.rb
index 0ad50c6f91f..92bdaa8b8b8 100644
--- a/spec/policies/group_policy_spec.rb
+++ b/spec/policies/group_policy_spec.rb
@@ -76,15 +76,10 @@ 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
- Projects::GroupLinks::CreateService.new(
- project,
- user,
- link_group_access: ProjectGroupLink::DEVELOPER
- ).execute(group)
+ create(:project_group_link, project: project, group: group)
end
it { expect_disallowed(:read_group) }
@@ -96,11 +91,7 @@ describe GroupPolicy do
let(:current_user) { create(:user) }
before do
- Projects::GroupLinks::CreateService.new(
- project,
- user,
- link_group_access: ProjectGroupLink::DEVELOPER
- ).execute(group)
+ create(:project_group_link, project: project, group: group)
end
it { expect_disallowed(:read_group) }