diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /spec/requests/search_controller_spec.rb | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'spec/requests/search_controller_spec.rb')
-rw-r--r-- | spec/requests/search_controller_spec.rb | 82 |
1 files changed, 72 insertions, 10 deletions
diff --git a/spec/requests/search_controller_spec.rb b/spec/requests/search_controller_spec.rb index 52bfc480313..93a2fecab74 100644 --- a/spec/requests/search_controller_spec.rb +++ b/spec/requests/search_controller_spec.rb @@ -7,7 +7,7 @@ RSpec.describe SearchController, type: :request do let_it_be(:group) { create(:group) } let_it_be(:project) { create(:project, :public, :repository, :wiki_repo, name: 'awesome project', group: group) } - before_all do + before do login_as(user) end @@ -31,9 +31,11 @@ RSpec.describe SearchController, type: :request do context 'for issues scope' do let(:object) { :issue } - let(:creation_args) { { project: project } } - let(:params) { { search: '*', scope: 'issues' } } - let(:threshold) { 0 } + let(:creation_args) { { project: project, title: 'foo' } } + let(:params) { { search: 'foo', scope: 'issues' } } + # there are 4 additional queries run for the logged in user: + # (1) geo_nodes, (1) users, (2) broadcast_messages + let(:threshold) { 4 } it_behaves_like 'an efficient database result' end @@ -41,9 +43,11 @@ RSpec.describe SearchController, type: :request do context 'for merge_request scope' do let(:creation_traits) { [:unique_branches] } let(:object) { :merge_request } - let(:creation_args) { { source_project: project } } - let(:params) { { search: '*', scope: 'merge_requests' } } - let(:threshold) { 0 } + let(:creation_args) { { source_project: project, title: 'bar' } } + let(:params) { { search: 'bar', scope: 'merge_requests' } } + # there are 4 additional queries run for the logged in user: + # - (1) geo_nodes, (1) users, (2) broadcast_messages + let(:threshold) { 4 } it_behaves_like 'an efficient database result' end @@ -51,16 +55,74 @@ RSpec.describe SearchController, type: :request do context 'for project scope' do let(:creation_traits) { [:public] } let(:object) { :project } - let(:creation_args) { {} } - let(:params) { { search: '*', scope: 'projects' } } + let(:creation_args) { { name: 'project' } } + let(:params) { { search: 'project', scope: 'projects' } } # some N+1 queries still exist # each project requires 3 extra queries # - one count for forks # - one count for open MRs # - one count for open Issues - let(:threshold) { 9 } + # there are 4 additional queries run for the logged in user: + # (1) geo_nodes, (1) users, (2) broadcast_messages + let(:threshold) { 13 } it_behaves_like 'an efficient database result' end + + context 'when searching by SHA' do + let(:sha) { '6d394385cf567f80a8fd85055db1ab4c5295806f' } + + it 'finds a commit and redirects to its page' do + send_search_request({ search: sha, scope: 'projects', project_id: project.id }) + + expect(response).to redirect_to(project_commit_path(project, sha)) + end + + it 'finds a commit in uppercase and redirects to its page' do + send_search_request( { search: sha.upcase, scope: 'projects', project_id: project.id }) + + expect(response).to redirect_to(project_commit_path(project, sha)) + end + + it 'finds a commit with a partial sha and redirects to its page' do + send_search_request( { search: sha[0..10], scope: 'projects', project_id: project.id }) + + expect(response).to redirect_to(project_commit_path(project, sha)) + end + + it 'redirects to the commit even if another scope result is returned' do + create(:note, project: project, note: "This is the #{sha}") + send_search_request( { search: sha, scope: 'projects', project_id: project.id }) + + expect(response).to redirect_to(project_commit_path(project, sha)) + end + + it 'goes to search results with the force_search_results param set' do + send_search_request({ search: sha, force_search_results: true, project_id: project.id }) + + expect(response).not_to redirect_to(project_commit_path(project, sha)) + end + + it 'does not redirect if user cannot download_code from project' do + allow(Ability).to receive(:allowed?).and_call_original + allow(Ability).to receive(:allowed?).with(user, :download_code, project).and_return(false) + + send_search_request({ search: sha, project_id: project.id }) + + expect(response).not_to redirect_to(project_commit_path(project, sha)) + end + + it 'does not redirect if commit sha not found in project' do + send_search_request({ search: '23594bc765e25c5b22c17a8cca25ebd50f792598', project_id: project.id }) + + expect(response).not_to redirect_to(project_commit_path(project, sha)) + end + + it 'does not redirect if not using project scope' do + send_search_request({ search: sha, group_id: project.root_namespace.id }) + + expect(response).not_to redirect_to(project_commit_path(project, sha)) + end + end end end |