From e285fb50498912c7fbabf5edfe64a9bedd85fc71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C5=82gorzata=20Ksionek?= Date: Tue, 12 Mar 2019 12:33:45 +0100 Subject: Fix false positive specs --- spec/features/security/group/private_access_spec.rb | 6 +++++- spec/policies/group_policy_spec.rb | 14 ++++++++++++-- 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 -- cgit v1.2.1 From 03fa783409694e6748b2b0ac06315a8d2dfd2c7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C5=82gorzata=20Ksionek?= Date: Wed, 13 Mar 2019 11:54:06 +0100 Subject: Add cr remarks --- .../features/security/group/private_access_spec.rb | 10 +------- spec/policies/group_policy_spec.rb | 27 ++++------------------ 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 -- cgit v1.2.1