2 files changed, 27 insertions, 0 deletions
diff --git a/spec/controllers/blob_controller_spec.rb b/spec/controllers/blob_controller_spec.rb
index cea6922e1c3..929f6d3b46d 100644
--- a/spec/controllers/blob_controller_spec.rb
+++ b/spec/controllers/blob_controller_spec.rb
@@ -34,4 +34,18 @@ describe Projects::BlobController do
       it { should respond_with(:not_found) }
     end
   end
+
+  describe 'GET show with tree path' do
+    render_views
+
+    before do
+      get :show, project_id: project.to_param, id: id
+      controller.instance_variable_set(:@blob, nil)
+    end
+
+    context 'redirect to tree' do
+      let(:id) { 'master/doc' }
+      it { should redirect_to("/#{project.path_with_namespace}/tree/master/doc") }
+    end
+  end
 end
diff --git a/spec/controllers/tree_controller_spec.rb b/spec/controllers/tree_controller_spec.rb
index 479118a3465..b169c2a678f 100644
--- a/spec/controllers/tree_controller_spec.rb
+++ b/spec/controllers/tree_controller_spec.rb
@@ -40,4 +40,17 @@ describe Projects::TreeController do
       it { should respond_with(:not_found) }
     end
   end
+
+  describe 'GET show with blob path' do
+    render_views
+
+    before do
+      get :show, project_id: project.to_param, id: id
+    end
+
+    context 'redirect to blob' do
+      let(:id) { 'master/README.md' }
+      it { should redirect_to("/#{project.path_with_namespace}/blob/master/README.md") }
+    end
+  end
 end