summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/commits_controller_spec.rb
diff options
context:
space:
mode:
authorGuilherme Vieira <guilherme@flipstudio.net>2017-10-01 11:54:12 -0300
committerGuilherme Vieira <guilherme@flipstudio.net>2017-10-18 23:41:00 -0200
commitada114065f332bb7d4add3156dd177eaf6662aaa (patch)
tree5d29b75e920de22a3e07048808734ad526a1f8dd /spec/controllers/projects/commits_controller_spec.rb
parent6c33fb846683ca9213dadaa79b0f32f482ebc0bf (diff)
downloadgitlab-ce-ada114065f332bb7d4add3156dd177eaf6662aaa.tar.gz
Renders 404 in commits controller if no commits are found
Diffstat (limited to 'spec/controllers/projects/commits_controller_spec.rb')
-rw-r--r--spec/controllers/projects/commits_controller_spec.rb31
1 files changed, 29 insertions, 2 deletions
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,