1 files changed, 35 insertions, 27 deletions
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index 0544afe31ed..b1d7157e447 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -24,7 +24,7 @@ describe ProjectsController do
 
             get :new, namespace_id: group.id
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(response).to render_template('new')
           end
         end
@@ -33,7 +33,7 @@ describe ProjectsController do
           it 'responds with status 404' do
             get :new, namespace_id: group.id
 
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
             expect(response).not_to render_template('new')
           end
         end
@@ -152,7 +152,7 @@ describe ProjectsController do
       it 'renders a 503' do
         get :show, namespace_id: project.namespace, id: project
 
-        expect(response).to have_http_status(503)
+        expect(response).to have_gitlab_http_status(503)
       end
     end
 
@@ -222,6 +222,14 @@ describe ProjectsController do
         get :show, namespace_id: public_project.namespace, id: public_project
         expect(response).to render_template('_files')
       end
+
+      it "renders the readme view" do
+        allow(controller).to receive(:current_user).and_return(user)
+        allow(user).to receive(:project_view).and_return('readme')
+
+        get :show, namespace_id: public_project.namespace, id: public_project
+        expect(response).to render_template('_readme')
+      end
     end
 
     context "when the url contains .atom" do
@@ -249,7 +257,7 @@ describe ProjectsController do
 
         get :show, namespace_id: project.namespace, id: project, format: :git
 
-        expect(response).to have_http_status(302)
+        expect(response).to have_gitlab_http_status(302)
         expect(response).to redirect_to(namespace_project_path)
       end
     end
@@ -272,7 +280,7 @@ describe ProjectsController do
 
         expect(project.path).to include 'renamed_path'
         expect(assigns(:repository).path).to include project.path
-        expect(response).to have_http_status(302)
+        expect(response).to have_gitlab_http_status(302)
       end
     end
 
@@ -288,7 +296,7 @@ describe ProjectsController do
           .not_to change { project.reload.path }
 
         expect(controller).to set_flash[:alert].to(/container registry tags/)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
     end
 
@@ -304,7 +312,7 @@ describe ProjectsController do
           id: project.id,
           project: params
 
-      expect(response).to have_http_status(302)
+      expect(response).to have_gitlab_http_status(302)
       params.each do |param, value|
         expect(project.public_send(param)).to eq(value)
       end
@@ -337,7 +345,7 @@ describe ProjectsController do
       project.reload
 
       expect(project.namespace).to eq(new_namespace)
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     context 'when new namespace is empty' do
@@ -356,7 +364,7 @@ describe ProjectsController do
         project.reload
 
         expect(project.namespace).to eq(old_namespace)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(flash[:alert]).to eq 'Please select a new namespace for your project.'
       end
     end
@@ -373,7 +381,7 @@ describe ProjectsController do
       delete :destroy, namespace_id: project.namespace, id: project
 
       expect { Project.find(orig_id) }.to raise_error(ActiveRecord::RecordNotFound)
-      expect(response).to have_http_status(302)
+      expect(response).to have_gitlab_http_status(302)
       expect(response).to redirect_to(dashboard_projects_path)
     end
 
@@ -412,7 +420,7 @@ describe ProjectsController do
     end
 
     it 'has http status 200' do
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     it 'changes the user incoming email token' do
@@ -488,7 +496,7 @@ describe ProjectsController do
       delete(:remove_fork,
           namespace_id: project.namespace,
           id: project, format: :js)
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
   end
 
@@ -536,7 +544,7 @@ describe ProjectsController do
             get :show, namespace_id: public_project.namespace, id: public_project
 
             expect(assigns(:project)).to eq(public_project)
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
         end
 
@@ -575,13 +583,13 @@ describe ProjectsController do
         it 'does not 404' do
           post :toggle_star, namespace_id: public_project.namespace, id: public_project.path.upcase
 
-          expect(response).not_to have_http_status(404)
+          expect(response).not_to have_gitlab_http_status(404)
         end
 
         it 'does not redirect to the correct casing' do
           post :toggle_star, namespace_id: public_project.namespace, id: public_project.path.upcase
 
-          expect(response).not_to have_http_status(301)
+          expect(response).not_to have_gitlab_http_status(301)
         end
       end
 
@@ -591,7 +599,7 @@ describe ProjectsController do
         it 'returns not found' do
           post :toggle_star, namespace_id: 'foo', id: 'bar'
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
     end
@@ -605,13 +613,13 @@ describe ProjectsController do
         it 'does not 404' do
           delete :destroy, namespace_id: project.namespace, id: project.path.upcase
 
-          expect(response).not_to have_http_status(404)
+          expect(response).not_to have_gitlab_http_status(404)
         end
 
         it 'does not redirect to the correct casing' do
           delete :destroy, namespace_id: project.namespace, id: project.path.upcase
 
-          expect(response).not_to have_http_status(301)
+          expect(response).not_to have_gitlab_http_status(301)
         end
       end
 
@@ -621,7 +629,7 @@ describe ProjectsController do
         it 'returns not found' do
           delete :destroy, namespace_id: 'foo', id: 'bar'
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
     end
@@ -638,7 +646,7 @@ describe ProjectsController do
       it 'returns 302' do
         get :export, namespace_id: project.namespace, id: project
 
-        expect(response).to have_http_status(302)
+        expect(response).to have_gitlab_http_status(302)
       end
     end
 
@@ -650,7 +658,7 @@ describe ProjectsController do
       it 'returns 404' do
         get :export, namespace_id: project.namespace, id: project
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -666,7 +674,7 @@ describe ProjectsController do
       it 'returns 302' do
         get :download_export, namespace_id: project.namespace, id: project
 
-        expect(response).to have_http_status(302)
+        expect(response).to have_gitlab_http_status(302)
       end
     end
 
@@ -678,7 +686,7 @@ describe ProjectsController do
       it 'returns 404' do
         get :download_export, namespace_id: project.namespace, id: project
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -694,7 +702,7 @@ describe ProjectsController do
       it 'returns 302' do
         post :remove_export, namespace_id: project.namespace, id: project
 
-        expect(response).to have_http_status(302)
+        expect(response).to have_gitlab_http_status(302)
       end
     end
 
@@ -706,7 +714,7 @@ describe ProjectsController do
       it 'returns 404' do
         post :remove_export, namespace_id: project.namespace, id: project
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -722,7 +730,7 @@ describe ProjectsController do
       it 'returns 302' do
         post :generate_new_export, namespace_id: project.namespace, id: project
 
-        expect(response).to have_http_status(302)
+        expect(response).to have_gitlab_http_status(302)
       end
     end
 
@@ -734,7 +742,7 @@ describe ProjectsController do
       it 'returns 404' do
         post :generate_new_export, namespace_id: project.namespace, id: project
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end