Fix 404 error in files view after deleting the last file in a repository

Closes #1362

1 files changed, 91 insertions, 0 deletions

diff --git a/spec/controllers/projects/tree_controller_spec.rb b/spec/controllers/projects/tree_controller_spec.rb
new file mode 100644
index 00000000000..53915856357
--- /dev/null
+++ b/spec/controllers/projects/tree_controller_spec.rb
@@ -0,0 +1,91 @@
+require 'spec_helper'
+
+describe Projects::TreeController do
+  let(:project) { create(:project) }
+  let(:user)    { create(:user) }
+
+  before do
+    sign_in(user)
+
+    project.team << [user, :master]
+    controller.instance_variable_set(:@project, project)
+  end
+
+  describe "GET show" do
+    # Make sure any errors accessing the tree in our views bubble up to this spec
+    render_views
+
+    before do
+      get(:show,
+          namespace_id: project.namespace.to_param,
+          project_id: project.to_param,
+          id: id)
+    end
+
+    context "valid branch, no path" do
+      let(:id) { 'master' }
+      it { is_expected.to respond_with(:success) }
+    end
+
+    context "valid branch, valid path" do
+      let(:id) { 'master/encoding/' }
+      it { is_expected.to respond_with(:success) }
+    end
+
+    context "valid branch, invalid path" do
+      let(:id) { 'master/invalid-path/' }
+      it { is_expected.to respond_with(:not_found) }
+    end
+
+    context "invalid branch, valid path" do
+      let(:id) { 'invalid-branch/encoding/' }
+      it { is_expected.to respond_with(:not_found) }
+    end
+
+    context "valid empty branch, invalid path" do
+      let(:id) { 'empty-branch/invalid-path/' }
+      it { is_expected.to respond_with(:not_found) }
+    end
+
+    context "valid empty branch" do
+      let(:id) { 'empty-branch' }
+      it { is_expected.to respond_with(:success) }
+    end
+
+    context "invalid SHA commit ID" do
+      let(:id) { 'ff39438/.gitignore' }
+      it { is_expected.to respond_with(:not_found) }
+    end
+
+    context "valid SHA commit ID" do
+      let(:id) { '6d39438' }
+      it { is_expected.to respond_with(:success) }
+    end
+
+    context "valid SHA commit ID with path" do
+      let(:id) { '6d39438/.gitignore' }
+      it { expect(response.status).to eq(302) }
+    end
+
+  end
+
+  describe 'GET show with blob path' do
+    render_views
+
+    before do
+      get(:show,
+          namespace_id: project.namespace.to_param,
+          project_id: project.to_param,
+          id: id)
+    end
+
+    context 'redirect to blob' do
+      let(:id) { 'master/README.md' }
+      it 'redirects' do
+        redirect_url = "/#{project.path_with_namespace}/blob/master/README.md"
+        expect(subject).
+          to redirect_to(redirect_url)
+      end
+    end
+  end
+end