Merge branch 'dev' into error-message-fixes

app/controllers/requests_controller.rb

@@ -1,4 +1,6 @@
 class RequestsController < ApplicationController
+  load_and_authorize_resource
+  skip_authorize_resource only: [:new, :create]
   before_action :set_request, only: [:show, :edit, :update, :destroy, :accept]
 
   # GET /requests

spec/controllers/requests_controller_spec.rb

@@ -33,13 +33,7 @@
     before :each do
       # Cannot use @request, because this variable is already in use.
       @a_request = Request.create! valid_attributes
-    end
-
-    describe "GET #index" do
-      it "disallows viewing all requests per default" do
-        get :index, session: valid_session
-        expect(response).to redirect_to(root_url)
-      end
+      sign_in FactoryGirl.create(:user, role: :organizer)
     end
 
     describe "GET #show" do
@@ -111,23 +105,50 @@
 
     describe "DELETE #destroy" do
       it "destroys the requested request" do
-        request = Request.create! valid_attributes
+        Request.create! valid_attributes
         expect {
           delete :destroy, id: @a_request.to_param, session: valid_session
         }.to change(Request, :count).by(-1)
       end
 
       it "redirects to the requests list" do
-        request = Request.create! valid_attributes
+        Request.create! valid_attributes
         delete :destroy, id: @a_request.to_param, session: valid_session
         expect(response).to redirect_to(requests_url)
       end
     end
   end
 
+  context "as user without login" do
+    before :each do
+      @a_request = Request.create! valid_attributes
+    end
+
+    it "redirects to home when updating" do
+      put :update, id: @a_request.to_param, request: valid_attributes, session: valid_session
+      expect(response).to redirect_to(root_path)
+    end
+
+    it "redirects to home when showing" do
+      get :show, id: @a_request.to_param, session: valid_session
+      expect(response).to redirect_to(root_path)
+    end
+
+    it "redirects to home when deleting" do
+      delete :destroy, id: @a_request.to_param, session: valid_session
+      expect(response).to redirect_to(root_path)
+    end
+
+    it "redirects to home when viewing the index page" do
+      get :index, session: valid_session
+      expect(response).to redirect_to(root_path)
+    end
+  end
+
   describe "PATCH #set_contact_person" do
     before :each do
       @a_request = Request.create! valid_attributes
+      sign_in FactoryGirl.create(:user, role: :organizer)
     end
 
     context "with valid params" do
@@ -161,7 +182,7 @@
         expect(assigns(:request)).to be_persisted
       end
 
-      it "redirects to the created request" do
+      it "redirects to the homepage" do
         post :create, request: valid_attributes, session: valid_session
         expect(response).to redirect_to(root_path)
       end