From ada114065f332bb7d4add3156dd177eaf6662aaa Mon Sep 17 00:00:00 2001 From: Guilherme Vieira Date: Sun, 1 Oct 2017 11:54:12 -0300 Subject: Renders 404 in commits controller if no commits are found --- app/controllers/projects/commits_controller.rb | 2 ++ changelogs/unreleased/not-found-in-commits.yml | 5 ++++ features/steps/shared/paths.rb | 2 +- .../projects/commits_controller_spec.rb | 31 ++++++++++++++++++++-- 4 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 changelogs/unreleased/not-found-in-commits.yml diff --git a/app/controllers/projects/commits_controller.rb b/app/controllers/projects/commits_controller.rb index 4a841bf2073..d48284a4429 100644 --- a/app/controllers/projects/commits_controller.rb +++ b/app/controllers/projects/commits_controller.rb @@ -48,6 +48,8 @@ class Projects::CommitsController < Projects::ApplicationController private def set_commits + render_404 unless request.format == :atom || @repository.blob_at(@commit.id, @path) || @repository.tree(@commit.id, @path).entries.present? + @limit, @offset = (params[:limit] || 40).to_i, (params[:offset] || 0).to_i search = params[:search] diff --git a/changelogs/unreleased/not-found-in-commits.yml b/changelogs/unreleased/not-found-in-commits.yml new file mode 100644 index 00000000000..d5f9ff15a36 --- /dev/null +++ b/changelogs/unreleased/not-found-in-commits.yml @@ -0,0 +1,5 @@ +--- +title: Renders 404 in commits controller if no commits are found for a given path +merge_request: 14610 +author: Guilherme Vieira +type: fixed diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb index be69a96c3ee..398e0a1b06c 100644 --- a/features/steps/shared/paths.rb +++ b/features/steps/shared/paths.rb @@ -222,7 +222,7 @@ module SharedPaths end step "I visit my project's commits page for a specific path" do - visit project_commits_path(@project, root_ref + "/app/models/project.rb", { limit: 5 }) + visit project_commits_path(@project, root_ref + "/files/ruby/regex.rb", { limit: 5 }) end step 'I visit my project\'s commits stats page' do diff --git a/spec/controllers/projects/commits_controller_spec.rb b/spec/controllers/projects/commits_controller_spec.rb index e26731fb691..c459d732507 100644 --- a/spec/controllers/projects/commits_controller_spec.rb +++ b/spec/controllers/projects/commits_controller_spec.rb @@ -10,9 +10,36 @@ describe Projects::CommitsController do end describe "GET show" do - context "when the ref name ends in .atom" do - render_views + render_views + + context 'with file path' do + before do + get(:show, + namespace_id: project.namespace, + project_id: project, + id: id) + end + + context "valid branch, valid file" do + let(:id) { 'master/README.md' } + + it { is_expected.to respond_with(:success) } + end + + context "valid branch, invalid file" do + let(:id) { 'master/invalid-path.rb' } + it { is_expected.to respond_with(:not_found) } + end + + context "invalid branch, valid file" do + let(:id) { 'invalid-branch/README.md' } + + it { is_expected.to respond_with(:not_found) } + end + end + + context "when the ref name ends in .atom" do context "when the ref does not exist with the suffix" do it "renders as atom" do get(:show, -- cgit v1.2.3