diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /spec/lib/extracts_path_spec.rb | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'spec/lib/extracts_path_spec.rb')
-rw-r--r-- | spec/lib/extracts_path_spec.rb | 73 |
1 files changed, 72 insertions, 1 deletions
diff --git a/spec/lib/extracts_path_spec.rb b/spec/lib/extracts_path_spec.rb index b69cbbf0ec0..05f3bb2f71a 100644 --- a/spec/lib/extracts_path_spec.rb +++ b/spec/lib/extracts_path_spec.rb @@ -7,9 +7,17 @@ RSpec.describe ExtractsPath do include RepoHelpers include Gitlab::Routing + # Make url_for work + def default_url_options + { controller: 'projects/blob', action: 'show', namespace_id: @project.namespace.path, project_id: @project.path } + end + let_it_be(:owner) { create(:user) } let_it_be(:container) { create(:project, :repository, creator: owner) } + let(:request) { double('request') } + let(:flash) { {} } + let(:redirect_renamed_default_branch?) { true } before do @project = container @@ -17,11 +25,14 @@ RSpec.describe ExtractsPath do allow(container.repository).to receive(:ref_names).and_return(ref_names) allow(request).to receive(:format=) + allow(request).to receive(:get?) + allow(request).to receive(:head?) end describe '#assign_ref_vars' do let(:ref) { sample_commit[:id] } - let(:params) { { path: sample_commit[:line_code_path], ref: ref } } + let(:path) { sample_commit[:line_code_path] } + let(:params) { { path: path, ref: ref } } it_behaves_like 'assigns ref vars' @@ -125,6 +136,66 @@ RSpec.describe ExtractsPath do expect(@commit).to be_nil end end + + context 'ref points to a previous default branch' do + let(:ref) { 'develop' } + + before do + @project.update!(previous_default_branch: ref) + + allow(@project).to receive(:default_branch).and_return('foo') + end + + it 'redirects to the new default branch for a GET request' do + allow(request).to receive(:get?).and_return(true) + + expect(self).to receive(:redirect_to).with("http://localhost/#{@project.full_path}/-/blob/foo/#{path}") + expect(self).not_to receive(:render_404) + + assign_ref_vars + + expect(@commit).to be_nil + expect(flash[:notice]).to match(/default branch/) + end + + it 'redirects to the new default branch for a HEAD request' do + allow(request).to receive(:head?).and_return(true) + + expect(self).to receive(:redirect_to).with("http://localhost/#{@project.full_path}/-/blob/foo/#{path}") + expect(self).not_to receive(:render_404) + + assign_ref_vars + + expect(@commit).to be_nil + expect(flash[:notice]).to match(/default branch/) + end + + it 'returns 404 for any other request type' do + expect(self).not_to receive(:redirect_to) + expect(self).to receive(:render_404) + + assign_ref_vars + + expect(@commit).to be_nil + expect(flash).to be_empty + end + + context 'redirect behaviour is disabled' do + let(:redirect_renamed_default_branch?) { false } + + it 'returns 404 for a GET request' do + allow(request).to receive(:get?).and_return(true) + + expect(self).not_to receive(:redirect_to) + expect(self).to receive(:render_404) + + assign_ref_vars + + expect(@commit).to be_nil + expect(flash).to be_empty + end + end + end end it_behaves_like 'extracts refs' |