diff options
author | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-03-07 01:30:47 +0300 |
---|---|---|
committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-03-07 18:59:17 +0300 |
commit | 9aabd8fd5ecb4090515db48692f3d064624aec0a (patch) | |
tree | 318418b94d97bc846e6e00ed782181cfd26e9487 /spec | |
parent | 9b27027619580bffeffa88965007c2c29ac9648c (diff) |
Limit queries to a user-branch combination
The query becomes a lot simpler if we can check the branch name as
well instead of having to load all branch names.
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/merge_request/maintainer_edits_fork_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/checks/change_access_spec.rb | 5 | ||||
-rw-r--r-- | spec/models/project_spec.rb | 91 | ||||
-rw-r--r-- | spec/policies/project_policy_spec.rb | 2 |
4 files changed, 70 insertions, 30 deletions
diff --git a/spec/features/merge_request/maintainer_edits_fork_spec.rb b/spec/features/merge_request/maintainer_edits_fork_spec.rb index d11ccb46a26..c1f76202e60 100644 --- a/spec/features/merge_request/maintainer_edits_fork_spec.rb +++ b/spec/features/merge_request/maintainer_edits_fork_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe 'a maintainer edits files on a source-branch of an MR from a fork', :js do include ProjectForksHelper - let(:user) { create(:user) } + let(:user) { create(:user, username: 'the-maintainer') } let(:target_project) { create(:project, :public, :repository) } let(:author) { create(:user, username: 'mr-authoring-machine') } let(:source_project) { fork_project(target_project, author, repository: true) } diff --git a/spec/lib/gitlab/checks/change_access_spec.rb b/spec/lib/gitlab/checks/change_access_spec.rb index 2f173d2e75c..48e9902027c 100644 --- a/spec/lib/gitlab/checks/change_access_spec.rb +++ b/spec/lib/gitlab/checks/change_access_spec.rb @@ -32,7 +32,8 @@ describe Gitlab::Checks::ChangeAccess do context 'when the user is not allowed to push to the repo' do it 'raises an error' do - expect(user_access).to receive(:can_do_action?).with(:push_to_repo).and_return(false) + expect(user_access).to receive(:can_do_action?).with(:push_code).and_return(false) + expect(user_access).to receive(:can_push_to_branch?).with('master').and_return(false) expect { subject.exec }.to raise_error(Gitlab::GitAccess::UnauthorizedError, 'You are not allowed to push code to this project.') end @@ -42,7 +43,7 @@ describe Gitlab::Checks::ChangeAccess do let(:ref) { 'refs/tags/v1.0.0' } it 'raises an error if the user is not allowed to update tags' do - allow(user_access).to receive(:can_do_action?).with(:push_to_repo).and_return(true) + allow(user_access).to receive(:can_do_action?).with(:push_code).and_return(true) expect(user_access).to receive(:can_do_action?).with(:admin_project).and_return(false) expect { subject.exec }.to raise_error(Gitlab::GitAccess::UnauthorizedError, 'You are not allowed to change existing tags on this project.') diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index a95a4637234..3463cf2eeca 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -3381,8 +3381,8 @@ describe Project do end end - describe '#branches_allowing_maintainer_access_to_user' do - let(:maintainer) { create(:user) } + context 'with cross project merge requests' do + let(:user) { create(:user) } let(:target_project) { create(:project) } let(:project) { fork_project(target_project) } let!(:merge_request) do @@ -3396,37 +3396,76 @@ describe Project do end before do - target_project.add_developer(maintainer) + target_project.add_developer(user) end - it 'includes branch names for merge requests allowing maintainer access to a user' do - expect(project.branches_allowing_maintainer_access_to_user(maintainer)) - .to include('awesome-feature-1') - end + describe '#merge_requests_allowing_push_to_user' do + it 'returns open merge requests for which the user has developer access to the target project' do + expect(project.merge_requests_allowing_push_to_user(user)).to include(merge_request) + end - it 'does not include branches for closed MRs' do - create(:merge_request, :closed, - target_project: target_project, - source_project: project, - source_branch: 'rejected-feature-1', - allow_maintainer_to_push: true) + it 'does not include closed merge requests' do + merge_request.close - expect(project.branches_allowing_maintainer_access_to_user(maintainer)) - .not_to include('rejected-feature-1') - end + expect(project.merge_requests_allowing_push_to_user(user)).to be_empty + end + + it 'does not include merge requests for guest users' do + guest = create(:user) + target_project.add_guest(guest) - it 'only queries once per user' do - expect { 3.times { project.branches_allowing_maintainer_access_to_user(maintainer) } } - .not_to exceed_query_limit(1) + expect(project.merge_requests_allowing_push_to_user(guest)).to be_empty + end + + it 'does not include the merge request for other users' do + other_user = create(:user) + + expect(project.merge_requests_allowing_push_to_user(other_user)).to be_empty + end + + it 'is empty when no user is passed' do + expect(project.merge_requests_allowing_push_to_user(nil)).to be_empty + end end - context 'when the requeststore is active', :request_store do - it 'only queries once per user accross project instances' do - # limiting to 3 queries: - # 2 times loading the project - # once loading the accessible branches - expect { 2.times { described_class.find(project.id).branches_allowing_maintainer_access_to_user(maintainer) } } - .not_to exceed_query_limit(3) + describe '#branch_allows_maintainer_push?' do + it 'includes branch names for merge requests allowing maintainer access to a user' do + expect(project.branch_allows_maintainer_push?(user, 'awesome-feature-1')) + .to be_truthy + end + + it 'does not allow guest users access' do + guest = create(:user) + target_project.add_guest(guest) + + expect(project.branch_allows_maintainer_push?(guest, 'awesome-feature-1')) + .to be_falsy + end + + it 'does not include branches for closed MRs' do + create(:merge_request, :closed, + target_project: target_project, + source_project: project, + source_branch: 'rejected-feature-1', + allow_maintainer_to_push: true) + + expect(project.branch_allows_maintainer_push?(user, 'rejected-feature-1')) + .to be_falsy + end + + it 'only queries once per user' do + expect { 3.times { project.branch_allows_maintainer_push?(user, 'awesome-feature-1') } } + .not_to exceed_query_limit(1) + end + + context 'when the requeststore is active', :request_store do + it 'only queries once per user accross project instances' do + # limiting to 3 queries: + # 2 times loading the project + # once loading the accessible branches + expect { 2.times { described_class.find(project.id).branch_allows_maintainer_push?(user, 'awesome-feature-1') } } + .not_to exceed_query_limit(3) + end end end end diff --git a/spec/policies/project_policy_spec.rb b/spec/policies/project_policy_spec.rb index f449fbd6b52..ea76e604153 100644 --- a/spec/policies/project_policy_spec.rb +++ b/spec/policies/project_policy_spec.rb @@ -323,7 +323,7 @@ describe ProjectPolicy do ) end let(:maintainer_abilities) do - %w(push_single_branch create_build update_build create_pipeline update_pipeline) + %w(create_build update_build create_pipeline update_pipeline) end subject { described_class.new(user, project) } |