enju_circulation 0.2.5 → 0.3.0.beta.1

data/spec/controllers/manifestation_reserve_stats_controller_spec.rb

@@ -49,7 +49,7 @@ describe ManifestationReserveStatsController do
 
       it 'assigns the requested manifestation_reserve_stat as @manifestation_reserve_stat' do
         manifestation_reserve_stat = FactoryBot.create(:manifestation_reserve_stat)
-        get :show, id: manifestation_reserve_stat.id
+        get :show, params: { id: manifestation_reserve_stat.id }
         assigns(:manifestation_reserve_stat).should eq(manifestation_reserve_stat)
       end
     end
@@ -59,7 +59,7 @@ describe ManifestationReserveStatsController do
 
       it 'assigns the requested manifestation_reserve_stat as @manifestation_reserve_stat' do
         manifestation_reserve_stat = FactoryBot.create(:manifestation_reserve_stat)
-        get :show, id: manifestation_reserve_stat.id
+        get :show, params: { id: manifestation_reserve_stat.id }
         assigns(:manifestation_reserve_stat).should eq(manifestation_reserve_stat)
       end
     end
@@ -69,7 +69,7 @@ describe ManifestationReserveStatsController do
 
       it 'assigns the requested manifestation_reserve_stat as @manifestation_reserve_stat' do
         manifestation_reserve_stat = FactoryBot.create(:manifestation_reserve_stat)
-        get :show, id: manifestation_reserve_stat.id
+        get :show, params: { id: manifestation_reserve_stat.id }
         assigns(:manifestation_reserve_stat).should eq(manifestation_reserve_stat)
       end
     end
@@ -77,7 +77,7 @@ describe ManifestationReserveStatsController do
     describe 'When not logged in' do
       it 'assigns the requested manifestation_reserve_stat as @manifestation_reserve_stat' do
         manifestation_reserve_stat = FactoryBot.create(:manifestation_reserve_stat)
-        get :show, id: manifestation_reserve_stat.id
+        get :show, params: { id: manifestation_reserve_stat.id }
         assigns(:manifestation_reserve_stat).should eq(manifestation_reserve_stat)
       end
     end
@@ -127,7 +127,7 @@ describe ManifestationReserveStatsController do
 
       it 'assigns the requested manifestation_reserve_stat as @manifestation_reserve_stat' do
         manifestation_reserve_stat = FactoryBot.create(:manifestation_reserve_stat)
-        get :edit, id: manifestation_reserve_stat.id
+        get :edit, params: { id: manifestation_reserve_stat.id }
         assigns(:manifestation_reserve_stat).should eq(manifestation_reserve_stat)
       end
     end
@@ -137,7 +137,7 @@ describe ManifestationReserveStatsController do
 
       it 'assigns the requested manifestation_reserve_stat as @manifestation_reserve_stat' do
         manifestation_reserve_stat = FactoryBot.create(:manifestation_reserve_stat)
-        get :edit, id: manifestation_reserve_stat.id
+        get :edit, params: { id: manifestation_reserve_stat.id }
         assigns(:manifestation_reserve_stat).should eq(manifestation_reserve_stat)
       end
     end
@@ -147,7 +147,7 @@ describe ManifestationReserveStatsController do
 
       it 'assigns the requested manifestation_reserve_stat as @manifestation_reserve_stat' do
         manifestation_reserve_stat = FactoryBot.create(:manifestation_reserve_stat)
-        get :edit, id: manifestation_reserve_stat.id
+        get :edit, params: { id: manifestation_reserve_stat.id }
         response.should be_forbidden
       end
     end
@@ -155,7 +155,7 @@ describe ManifestationReserveStatsController do
     describe 'When not logged in' do
       it 'should not assign the requested manifestation_reserve_stat as @manifestation_reserve_stat' do
         manifestation_reserve_stat = FactoryBot.create(:manifestation_reserve_stat)
-        get :edit, id: manifestation_reserve_stat.id
+        get :edit, params: { id: manifestation_reserve_stat.id }
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -172,24 +172,24 @@ describe ManifestationReserveStatsController do
 
       describe 'with valid params' do
         it 'assigns a newly created manifestation_reserve_stat as @manifestation_reserve_stat' do
-          post :create, manifestation_reserve_stat: @attrs
+          post :create, params: { manifestation_reserve_stat: @attrs }
           assigns(:manifestation_reserve_stat).should be_valid
         end
 
         it 'redirects to the created manifestation_reserve_stat' do
-          post :create, manifestation_reserve_stat: @attrs
+          post :create, params: { manifestation_reserve_stat: @attrs }
           response.should redirect_to(manifestation_reserve_stat_url(assigns(:manifestation_reserve_stat)))
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved manifestation_reserve_stat as @manifestation_reserve_stat' do
-          post :create, manifestation_reserve_stat: @invalid_attrs
+          post :create, params: { manifestation_reserve_stat: @invalid_attrs }
           assigns(:manifestation_reserve_stat).should_not be_valid
         end
 
         it "re-renders the 'new' template" do
-          post :create, manifestation_reserve_stat: @invalid_attrs
+          post :create, params: { manifestation_reserve_stat: @invalid_attrs }
           response.should render_template('new')
         end
       end
@@ -200,24 +200,24 @@ describe ManifestationReserveStatsController do
 
       describe 'with valid params' do
         it 'assigns a newly created manifestation_reserve_stat as @manifestation_reserve_stat' do
-          post :create, manifestation_reserve_stat: @attrs
+          post :create, params: { manifestation_reserve_stat: @attrs }
           assigns(:manifestation_reserve_stat).should be_valid
         end
 
         it 'redirects to the created manifestation_reserve_stat' do
-          post :create, manifestation_reserve_stat: @attrs
+          post :create, params: { manifestation_reserve_stat: @attrs }
           response.should redirect_to(manifestation_reserve_stat_url(assigns(:manifestation_reserve_stat)))
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved manifestation_reserve_stat as @manifestation_reserve_stat' do
-          post :create, manifestation_reserve_stat: @invalid_attrs
+          post :create, params: { manifestation_reserve_stat: @invalid_attrs }
           assigns(:manifestation_reserve_stat).should_not be_valid
         end
 
         it "re-renders the 'new' template" do
-          post :create, manifestation_reserve_stat: @invalid_attrs
+          post :create, params: { manifestation_reserve_stat: @invalid_attrs }
           response.should render_template('new')
         end
       end
@@ -228,24 +228,24 @@ describe ManifestationReserveStatsController do
 
       describe 'with valid params' do
         it 'assigns a newly created manifestation_reserve_stat as @manifestation_reserve_stat' do
-          post :create, manifestation_reserve_stat: @attrs
+          post :create, params: { manifestation_reserve_stat: @attrs }
           assigns(:manifestation_reserve_stat).should be_nil
         end
 
         it 'should be forbidden' do
-          post :create, manifestation_reserve_stat: @attrs
+          post :create, params: { manifestation_reserve_stat: @attrs }
           response.should be_forbidden
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved manifestation_reserve_stat as @manifestation_reserve_stat' do
-          post :create, manifestation_reserve_stat: @invalid_attrs
+          post :create, params: { manifestation_reserve_stat: @invalid_attrs }
           assigns(:manifestation_reserve_stat).should be_nil
         end
 
         it 'should be forbidden' do
-          post :create, manifestation_reserve_stat: @invalid_attrs
+          post :create, params: { manifestation_reserve_stat: @invalid_attrs }
           response.should be_forbidden
         end
       end
@@ -254,24 +254,24 @@ describe ManifestationReserveStatsController do
     describe 'When not logged in' do
       describe 'with valid params' do
         it 'assigns a newly created manifestation_reserve_stat as @manifestation_reserve_stat' do
-          post :create, manifestation_reserve_stat: @attrs
+          post :create, params: { manifestation_reserve_stat: @attrs }
           assigns(:manifestation_reserve_stat).should be_nil
         end
 
         it 'should be forbidden' do
-          post :create, manifestation_reserve_stat: @attrs
+          post :create, params: { manifestation_reserve_stat: @attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved manifestation_reserve_stat as @manifestation_reserve_stat' do
-          post :create, manifestation_reserve_stat: @invalid_attrs
+          post :create, params: { manifestation_reserve_stat: @invalid_attrs }
           assigns(:manifestation_reserve_stat).should be_nil
         end
 
         it 'should be forbidden' do
-          post :create, manifestation_reserve_stat: @invalid_attrs
+          post :create, params: { manifestation_reserve_stat: @invalid_attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
@@ -290,18 +290,18 @@ describe ManifestationReserveStatsController do
 
       describe 'with valid params' do
         it 'updates the requested manifestation_reserve_stat' do
-          put :update, id: @manifestation_reserve_stat.id, manifestation_reserve_stat: @attrs
+          put :update, params: { id: @manifestation_reserve_stat.id, manifestation_reserve_stat: @attrs }
         end
 
         it 'assigns the requested manifestation_reserve_stat as @manifestation_reserve_stat' do
-          put :update, id: @manifestation_reserve_stat.id, manifestation_reserve_stat: @attrs
+          put :update, params: { id: @manifestation_reserve_stat.id, manifestation_reserve_stat: @attrs }
           assigns(:manifestation_reserve_stat).should eq(@manifestation_reserve_stat)
         end
       end
 
       describe 'with invalid params' do
         it 'assigns the requested manifestation_reserve_stat as @manifestation_reserve_stat' do
-          put :update, id: @manifestation_reserve_stat.id, manifestation_reserve_stat: @invalid_attrs
+          put :update, params: { id: @manifestation_reserve_stat.id, manifestation_reserve_stat: @invalid_attrs }
           response.should render_template('edit')
         end
       end
@@ -312,11 +312,11 @@ describe ManifestationReserveStatsController do
 
       describe 'with valid params' do
         it 'updates the requested manifestation_reserve_stat' do
-          put :update, id: @manifestation_reserve_stat.id, manifestation_reserve_stat: @attrs
+          put :update, params: { id: @manifestation_reserve_stat.id, manifestation_reserve_stat: @attrs }
         end
 
         it 'assigns the requested manifestation_reserve_stat as @manifestation_reserve_stat' do
-          put :update, id: @manifestation_reserve_stat.id, manifestation_reserve_stat: @attrs
+          put :update, params: { id: @manifestation_reserve_stat.id, manifestation_reserve_stat: @attrs }
           assigns(:manifestation_reserve_stat).should eq(@manifestation_reserve_stat)
           response.should redirect_to(@manifestation_reserve_stat)
         end
@@ -324,12 +324,12 @@ describe ManifestationReserveStatsController do
 
       describe 'with invalid params' do
         it 'assigns the manifestation_reserve_stat as @manifestation_reserve_stat' do
-          put :update, id: @manifestation_reserve_stat, manifestation_reserve_stat: @invalid_attrs
+          put :update, params: { id: @manifestation_reserve_stat, manifestation_reserve_stat: @invalid_attrs }
           assigns(:manifestation_reserve_stat).should_not be_valid
         end
 
         it "re-renders the 'edit' template" do
-          put :update, id: @manifestation_reserve_stat, manifestation_reserve_stat: @invalid_attrs
+          put :update, params: { id: @manifestation_reserve_stat, manifestation_reserve_stat: @invalid_attrs }
           response.should render_template('edit')
         end
       end
@@ -340,11 +340,11 @@ describe ManifestationReserveStatsController do
 
       describe 'with valid params' do
         it 'updates the requested manifestation_reserve_stat' do
-          put :update, id: @manifestation_reserve_stat.id, manifestation_reserve_stat: @attrs
+          put :update, params: { id: @manifestation_reserve_stat.id, manifestation_reserve_stat: @attrs }
         end
 
         it 'assigns the requested manifestation_reserve_stat as @manifestation_reserve_stat' do
-          put :update, id: @manifestation_reserve_stat.id, manifestation_reserve_stat: @attrs
+          put :update, params: { id: @manifestation_reserve_stat.id, manifestation_reserve_stat: @attrs }
           assigns(:manifestation_reserve_stat).should eq(@manifestation_reserve_stat)
           response.should be_forbidden
         end
@@ -352,7 +352,7 @@ describe ManifestationReserveStatsController do
 
       describe 'with invalid params' do
         it 'assigns the requested manifestation_reserve_stat as @manifestation_reserve_stat' do
-          put :update, id: @manifestation_reserve_stat.id, manifestation_reserve_stat: @invalid_attrs
+          put :update, params: { id: @manifestation_reserve_stat.id, manifestation_reserve_stat: @invalid_attrs }
           response.should be_forbidden
         end
       end
@@ -361,18 +361,18 @@ describe ManifestationReserveStatsController do
     describe 'When not logged in' do
       describe 'with valid params' do
         it 'updates the requested manifestation_reserve_stat' do
-          put :update, id: @manifestation_reserve_stat.id, manifestation_reserve_stat: @attrs
+          put :update, params: { id: @manifestation_reserve_stat.id, manifestation_reserve_stat: @attrs }
         end
 
         it 'should be forbidden' do
-          put :update, id: @manifestation_reserve_stat.id, manifestation_reserve_stat: @attrs
+          put :update, params: { id: @manifestation_reserve_stat.id, manifestation_reserve_stat: @attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
 
       describe 'with invalid params' do
         it 'assigns the requested manifestation_reserve_stat as @manifestation_reserve_stat' do
-          put :update, id: @manifestation_reserve_stat.id, manifestation_reserve_stat: @invalid_attrs
+          put :update, params: { id: @manifestation_reserve_stat.id, manifestation_reserve_stat: @invalid_attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
@@ -388,11 +388,11 @@ describe ManifestationReserveStatsController do
       login_fixture_admin
 
       it 'destroys the requested manifestation_reserve_stat' do
-        delete :destroy, id: @manifestation_reserve_stat.id
+        delete :destroy, params: { id: @manifestation_reserve_stat.id }
       end
 
       it 'redirects to the manifestation_reserve_stats list' do
-        delete :destroy, id: @manifestation_reserve_stat.id
+        delete :destroy, params: { id: @manifestation_reserve_stat.id }
         response.should redirect_to(manifestation_reserve_stats_url)
       end
     end
@@ -401,11 +401,11 @@ describe ManifestationReserveStatsController do
       login_fixture_librarian
 
       it 'destroys the requested manifestation_reserve_stat' do
-        delete :destroy, id: @manifestation_reserve_stat.id
+        delete :destroy, params: { id: @manifestation_reserve_stat.id }
       end
 
       it 'redirects to the manifestation_reserve_stats list' do
-        delete :destroy, id: @manifestation_reserve_stat.id
+        delete :destroy, params: { id: @manifestation_reserve_stat.id }
         response.should redirect_to(manifestation_reserve_stats_url)
       end
     end
@@ -414,22 +414,22 @@ describe ManifestationReserveStatsController do
       login_fixture_user
 
       it 'destroys the requested manifestation_reserve_stat' do
-        delete :destroy, id: @manifestation_reserve_stat.id
+        delete :destroy, params: { id: @manifestation_reserve_stat.id }
       end
 
       it 'should be forbidden' do
-        delete :destroy, id: @manifestation_reserve_stat.id
+        delete :destroy, params: { id: @manifestation_reserve_stat.id }
         response.should be_forbidden
       end
     end
 
     describe 'When not logged in' do
       it 'destroys the requested manifestation_reserve_stat' do
-        delete :destroy, id: @manifestation_reserve_stat.id
+        delete :destroy, params: { id: @manifestation_reserve_stat.id }
       end
 
       it 'should be forbidden' do
-        delete :destroy, id: @manifestation_reserve_stat.id
+        delete :destroy, params: { id: @manifestation_reserve_stat.id }
         response.should redirect_to(new_user_session_url)
       end
     end

data/spec/controllers/profiles_controller_spec.rb

@@ -8,7 +8,7 @@ describe ProfilesController do
       login_fixture_user
 
       it 'should show icalendar feed' do
-        get :edit, id: profiles(:profile_user1).id, mode: 'feed_token'
+        get :edit, params: { id: profiles(:profile_user1).id, mode: 'feed_token' }
         response.should render_template('profiles/_feed_token')
       end
     end

data/spec/controllers/reserves_controller_spec.rb

@@ -17,7 +17,7 @@ describe ReservesController do
       end
 
       it "should get other user's reservation" do
-        get :index, user_id: users(:user1).username
+        get :index, params: { user_id: users(:user1).username }
         response.should be_success
         assigns(:reserves).should eq(users(:user1).reserves.order('reserves.id DESC').includes(:manifestation).page(1))
       end
@@ -46,25 +46,25 @@ describe ReservesController do
       end
 
       it 'should get index feed with user_id' do
-        get :index, user_id: users(:user1).username, format: 'rss'
+        get :index, params: { user_id: users(:user1).username, format: 'rss' }
         response.should be_success
         assigns(:reserves).should eq(users(:user1).reserves.order('reserves.id DESC').includes(:manifestation).page(1))
       end
 
       it 'should get index txt with user_id' do
-        get :index, user_id: users(:user1).username, format: 'txt'
+        get :index, params: { user_id: users(:user1).username, format: 'txt' }
         response.should be_success
         assigns(:reserves).should eq(users(:user1).reserves.order('reserves.id DESC').includes(:manifestation))
       end
 
       it "should get other user's index" do
-        get :index, user_id: users(:user1).username
+        get :index, params: { user_id: users(:user1).username }
         response.should be_success
         assigns(:reserves).should eq(users(:user1).reserves.order('reserves.id DESC').includes(:manifestation).page(1))
       end
 
       it "should get other user's index feed" do
-        get :index, user_id: users(:user1).username, format: :rss
+        get :index, params: { user_id: users(:user1).username, format: :rss }
         response.should be_success
         assigns(:reserves).should eq(users(:user1).reserves.order('reserves.id DESC').includes(:manifestation).page(1))
       end
@@ -97,17 +97,17 @@ describe ReservesController do
 
       describe 'When my user_id is specified' do
         it 'should redirect to my reservation' do
-          get :index, user_id: users(:user1).username
+          get :index, params: { user_id: users(:user1).username }
           response.should redirect_to reserves_url
         end
 
         it 'should redirect to my reservation feed' do
-          get :index, user_id: users(:user1).username, format: 'rss'
+          get :index, params: { user_id: users(:user1).username, format: 'rss' }
           response.should redirect_to reserves_url(format: :rss)
         end
 
         it 'should redirect to my reservation txt' do
-          get :index, user_id: users(:user1).username, format: 'txt'
+          get :index, params: { user_id: users(:user1).username, format: 'txt' }
           response.should redirect_to reserves_url(format: :txt)
         end
       end
@@ -118,13 +118,13 @@ describe ReservesController do
         end
 
         it 'should not get any reserve as @reserves' do
-          get :index, user_id: @user.username
+          get :index, params: { user_id: @user.username }
           response.should be_forbidden
         end
       end
 
       it "should not get other user's index" do
-        get :index, user_id: users(:user2).username
+        get :index, params: { user_id: users(:user2).username }
         response.should be_forbidden
       end
     end
@@ -144,12 +144,12 @@ describe ReservesController do
 
       it 'assigns the requested reserve as @reserve' do
         reserve = FactoryBot.create(:reserve)
-        get :show, id: reserve.id
+        get :show, params: { id: reserve.id }
         assigns(:reserve).should eq(reserve)
       end
 
       it "should show other user's reservation" do
-        get :show, id: 3
+        get :show, params: { id: 3 }
         response.should be_success
       end
     end
@@ -159,12 +159,12 @@ describe ReservesController do
 
       it 'assigns the requested reserve as @reserve' do
         reserve = FactoryBot.create(:reserve)
-        get :show, id: reserve.id
+        get :show, params: { id: reserve.id }
         assigns(:reserve).should eq(reserve)
       end
 
       it "should show other user's reservation" do
-        get :show, id: 3
+        get :show, params: { id: 3 }
         response.should be_success
       end
     end
@@ -174,17 +174,17 @@ describe ReservesController do
 
       it 'assigns the requested reserve as @reserve' do
         reserve = FactoryBot.create(:reserve)
-        get :show, id: reserve.id
+        get :show, params: { id: reserve.id }
         assigns(:reserve).should eq(reserve)
       end
 
       it 'should show my reservation' do
-        get :show, id: 3
+        get :show, params: { id: 3 }
         response.should be_success
       end
 
       it "should not show other user's reservation" do
-        get :show, id: 5
+        get :show, params: { id: 5 }
         response.should be_forbidden
       end
     end
@@ -195,12 +195,12 @@ describe ReservesController do
       end
 
       it 'assigns the requested reserve as @reserve' do
-        get :show, id: @reserve.id
+        get :show, params: { id: @reserve.id }
         assigns(:reserve).should eq(@reserve)
       end
 
       it 'should be redirected to new_user_session_url' do
-        get :show, id: @reserve.id
+        get :show, params: { id: @reserve.id }
         response.should redirect_to new_user_session_url
       end
     end
@@ -216,7 +216,7 @@ describe ReservesController do
       end
 
       it "should get other user's reservation" do
-        get :new, user_id: users(:user1).username, manifestation_id: 3
+        get :new, params: { user_id: users(:user1).username, manifestation_id: 3 }
         assigns(:reserve).user.should eq users(:user1)
         response.should be_success
       end
@@ -231,12 +231,12 @@ describe ReservesController do
       end
 
       it 'should get new template without user_id' do
-        get :new, manifestation_id: 3
+        get :new, params: { manifestation_id: 3 }
         response.should be_success
       end
 
       it "should get other user's reservation" do
-        get :new, user_id: users(:user1).username, manifestation_id: 3
+        get :new, params: { user_id: users(:user1).username, manifestation_id: 3 }
         assigns(:reserve).user.should eq users(:user1)
         response.should be_success
       end
@@ -252,18 +252,18 @@ describe ReservesController do
       end
 
       it 'should get my new reservation' do
-        get :new, manifestation_id: 3
+        get :new, params: { manifestation_id: 3 }
         response.should be_success
       end
 
       it "should not get other user's new reservation" do
-        get :new, user_id: users(:user2).username, manifestation_id: 5
+        get :new, params: { user_id: users(:user2).username, manifestation_id: 5 }
         response.should be_forbidden
       end
 
       it 'should not get new reservation when user_number is not set' do
         sign_in users(:user2)
-        get :new, user_id: users(:user2).username, manifestation_id: 3
+        get :new, params: { user_id: users(:user2).username, manifestation_id: 3 }
         response.should be_forbidden
       end
     end
@@ -283,12 +283,12 @@ describe ReservesController do
 
       it 'assigns the requested reserve as @reserve' do
         reserve = FactoryBot.create(:reserve)
-        get :edit, id: reserve.id
+        get :edit, params: { id: reserve.id }
         assigns(:reserve).should eq(reserve)
       end
 
       it "should edit other user's reservation" do
-        get :edit, id: 3
+        get :edit, params: { id: 3 }
         response.should be_success
       end
     end
@@ -298,12 +298,12 @@ describe ReservesController do
 
       it 'assigns the requested reserve as @reserve' do
         reserve = FactoryBot.create(:reserve)
-        get :edit, id: reserve.id
+        get :edit, params: { id: reserve.id }
         assigns(:reserve).should eq(reserve)
       end
 
       it 'should edit reserve without user_id' do
-        get :edit, id: 3
+        get :edit, params: { id: 3 }
         response.should be_success
       end
     end
@@ -313,17 +313,17 @@ describe ReservesController do
 
       it 'assigns the requested reserve as @reserve' do
         reserve = FactoryBot.create(:reserve)
-        get :edit, id: reserve.id
+        get :edit, params: { id: reserve.id }
         assigns(:reserve).should eq(reserve)
       end
 
       it 'should edit my reservation' do
-        get :edit, id: 3
+        get :edit, params: { id: 3 }
         response.should be_success
       end
 
       it "should not edit other user's reservation" do
-        get :edit, id: 5
+        get :edit, params: { id: 5 }
         response.should be_forbidden
       end
     end
@@ -331,7 +331,7 @@ describe ReservesController do
     describe 'When not logged in' do
       it 'should not assign the requested reserve as @reserve' do
         reserve = FactoryBot.create(:reserve)
-        get :edit, id: reserve.id
+        get :edit, params: { id: reserve.id }
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -348,12 +348,12 @@ describe ReservesController do
 
       describe 'with valid params' do
         it 'assigns a newly created reserve as @reserve' do
-          post :create, reserve: @attrs
+          post :create, params: { reserve: @attrs }
           assigns(:reserve).should be_valid
         end
 
         it 'redirects to the created reserve' do
-          post :create, reserve: @attrs
+          post :create, params: { reserve: @attrs }
           response.should redirect_to(assigns(:reserve))
           assigns(:reserve).expired_at.should be_nil
         end
@@ -361,12 +361,12 @@ describe ReservesController do
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved reserve as @reserve' do
-          post :create, reserve: @invalid_attrs
+          post :create, params: { reserve: @invalid_attrs }
           assigns(:reserve).should_not be_valid
         end
 
         it 'redirects to the list' do
-          post :create, reserve: @invalid_attrs
+          post :create, params: { reserve: @invalid_attrs }
           assigns(:reserve).expired_at.should be_nil
           response.should render_template('new')
           response.should be_success
@@ -374,24 +374,24 @@ describe ReservesController do
       end
 
       it 'should not create reservation with past date' do
-        post :create, reserve: { user_number: users(:user1).profile.user_number, manifestation_id: 5, expired_at: '1901-01-01' }
+        post :create, params: { reserve: { user_number: users(:user1).profile.user_number, manifestation_id: 5, expired_at: '1901-01-01' } }
         assigns(:reserve).should_not be_valid
         response.should be_success
       end
 
       it "should create other user's reserve" do
-        post :create, reserve: { user_number: users(:user1).profile.user_number, manifestation_id: 5 }
+        post :create, params: { reserve: { user_number: users(:user1).profile.user_number, manifestation_id: 5 } }
         assigns(:reserve).expired_at.should be_nil
         response.should redirect_to reserve_url(assigns(:reserve))
       end
 
       it 'should not create reserve without manifestation_id' do
-        post :create, reserve: { user_number: users(:admin).profile.user_number }
+        post :create, params: { reserve: { user_number: users(:admin).profile.user_number } }
         response.should be_success
       end
 
       it 'should not create reserve with missing user_number' do
-        post :create, reserve: { user_number: 'missing', manifestation_id: 5 }
+        post :create, params: { reserve: { user_number: 'missing', manifestation_id: 5 } }
         response.should render_template('new')
         response.should be_success
       end
@@ -402,31 +402,31 @@ describe ReservesController do
 
       describe 'with valid params' do
         it 'assigns a newly created reserve as @reserve' do
-          post :create, reserve: @attrs
+          post :create, params: { reserve: @attrs }
           assigns(:reserve).should be_valid
         end
 
         it 'redirects to the created reserve' do
-          post :create, reserve: @attrs
+          post :create, params: { reserve: @attrs }
           response.should redirect_to(assigns(:reserve))
           assigns(:reserve).expired_at.should be_nil
         end
 
         it 'should send accepted messages' do
           old_count = Message.count
-          post :create, reserve: @attrs
+          post :create, params: { reserve: @attrs }
           Message.count.should eq old_count + 2
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved reserve as @reserve' do
-          post :create, reserve: @invalid_attrs
+          post :create, params: { reserve: @invalid_attrs }
           assigns(:reserve).should_not be_valid
         end
 
         it "re-renders the 'new' template" do
-          post :create, reserve: @invalid_attrs
+          post :create, params: { reserve: @invalid_attrs }
           assigns(:reserve).expired_at.should be_nil
           response.should render_template('new')
           response.should be_success
@@ -434,14 +434,14 @@ describe ReservesController do
       end
 
       it "should create other user's reserve" do
-        post :create, reserve: { user_number: users(:user1).profile.user_number, manifestation_id: 5 }
+        post :create, params: { reserve: { user_number: users(:user1).profile.user_number, manifestation_id: 5 } }
         assigns(:reserve).should be_valid
         assigns(:reserve).expired_at.should be_nil
         response.should redirect_to reserve_url(assigns(:reserve))
       end
 
       it 'should not create reserve over reserve_limit' do
-        post :create, reserve: { user_number: users(:admin).profile.user_number, manifestation_id: 5 }
+        post :create, params: { reserve: { user_number: users(:admin).profile.user_number, manifestation_id: 5 } }
         assigns(:reserve).errors[:base].include?(I18n.t('reserve.excessed_reservation_limit')).should be_truthy
       end
     end
@@ -451,12 +451,12 @@ describe ReservesController do
 
       describe 'with valid params' do
         it 'assigns a newly created reserve as @reserve' do
-          post :create, reserve: @attrs
+          post :create, params: { reserve: @attrs }
           assigns(:reserve).should be_valid
         end
 
         it 'redirects to the created reserve' do
-          post :create, reserve: @attrs
+          post :create, params: { reserve: @attrs }
           response.should redirect_to(assigns(:reserve))
           assigns(:reserve).expired_at.should be_nil
         end
@@ -464,12 +464,12 @@ describe ReservesController do
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved reserve as @reserve' do
-          post :create, reserve: @invalid_attrs
+          post :create, params: { reserve: @invalid_attrs }
           assigns(:reserve).should_not be_valid
         end
 
         it "re-renders the 'new' template" do
-          post :create, reserve: @invalid_attrs
+          post :create, params: { reserve: @invalid_attrs }
           assigns(:reserve).expired_at.should be_nil
           response.should render_template('new')
           response.should be_success
@@ -477,7 +477,7 @@ describe ReservesController do
       end
 
       it "should not create other user's reservation" do
-        post :create, reserve: { user_number: users(:user2).profile.user_number, manifestation_id: 6 }
+        post :create, params: { reserve: { user_number: users(:user2).profile.user_number, manifestation_id: 6 } }
         assigns(:reserve).expired_at.should be_nil
         response.should be_forbidden
       end
@@ -486,24 +486,24 @@ describe ReservesController do
     describe 'When not logged in' do
       describe 'with valid params' do
         it 'assigns a newly created reserve as @reserve' do
-          post :create, reserve: @attrs
+          post :create, params: { reserve: @attrs }
           assigns(:reserve).should be_nil
         end
 
         it 'redirects to the login page' do
-          post :create, reserve: @attrs
+          post :create, params: { reserve: @attrs }
           response.should redirect_to new_user_session_url
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved reserve as @reserve' do
-          post :create, reserve: @invalid_attrs
+          post :create, params: { reserve: @invalid_attrs }
           assigns(:reserve).should be_nil
         end
 
         it 'redirects to the login page' do
-          post :create, reserve: @invalid_attrs
+          post :create, params: { reserve: @invalid_attrs }
           assigns(:reserve).should be_nil
           response.should redirect_to new_user_session_url
         end
@@ -523,11 +523,11 @@ describe ReservesController do
 
       describe 'with valid params' do
         it 'updates the requested reserve' do
-          put :update, id: @reserve.id, reserve: @attrs
+          put :update, params: { id: @reserve.id, reserve: @attrs }
         end
 
         it 'assigns the requested reserve as @reserve' do
-          put :update, id: @reserve.id, reserve: @attrs
+          put :update, params: { id: @reserve.id, reserve: @attrs }
           assigns(:reserve).should eq(@reserve)
           response.should redirect_to(assigns(:reserve))
         end
@@ -535,35 +535,35 @@ describe ReservesController do
 
       describe 'with invalid params' do
         it 'assigns the requested reserve as @reserve' do
-          put :update, id: @reserve.id, reserve: @invalid_attrs
+          put :update, params: { id: @reserve.id, reserve: @invalid_attrs }
         end
 
         it "re-renders the 'edit' template" do
-          put :update, id: @reserve.id, reserve: @invalid_attrs
+          put :update, params: { id: @reserve.id, reserve: @invalid_attrs }
           response.should render_template('edit')
         end
       end
 
       it 'should not update reserve without manifestation_id' do
-        put :update, id: 1, reserve: { user_number: users(:admin).profile.user_number, manifestation_id: nil }
+        put :update, params: { id: 1, reserve: { user_number: users(:admin).profile.user_number, manifestation_id: nil } }
         assigns(:reserve).should_not be_valid
         response.should be_success
       end
 
       it "should update other user's reservation without user_id" do
-        put :update, id: 3, reserve: { user_number: users(:user1).profile.user_number }
+        put :update, params: { id: 3, reserve: { user_number: users(:user1).profile.user_number } }
         assigns(:reserve).should be_valid
         response.should redirect_to reserve_url(assigns(:reserve))
       end
 
       it 'should not update retained reservations if item_identifier is invalid' do
-        put :update, id: 14, reserve: { item_identifier: 'invalid' }
+        put :update, params: { id: 14, reserve: { item_identifier: 'invalid' } }
         assigns(:reserve).should_not be_valid
         response.should be_success
       end
 
       it 'should not update retained reservations if force_retaining is disabled' do
-        put :update, id: 15, reserve: { item_identifier: '00021' }
+        put :update, params: { id: 15, reserve: { item_identifier: '00021' } }
         assigns(:reserve).should_not be_valid
         response.should be_success
         assigns(:reserve).current_state.should eq 'requested'
@@ -571,7 +571,7 @@ describe ReservesController do
       end
 
       it 'should update retained reservations if force_retaining is enabled' do
-        put :update, id: 15, reserve: { item_identifier: '00021', force_retaining: '1' }
+        put :update, params: { id: 15, reserve: { item_identifier: '00021', force_retaining: '1' } }
         assigns(:reserve).should be_valid
         assigns(:reserve).current_state.should eq 'retained'
         response.should redirect_to reserve_url(assigns(:reserve))
@@ -584,11 +584,11 @@ describe ReservesController do
 
       describe 'with valid params' do
         it 'updates the requested reserve' do
-          put :update, id: @reserve.id, reserve: @attrs
+          put :update, params: { id: @reserve.id, reserve: @attrs }
         end
 
         it 'assigns the requested reserve as @reserve' do
-          put :update, id: @reserve.id, reserve: @attrs
+          put :update, params: { id: @reserve.id, reserve: @attrs }
           assigns(:reserve).should eq(@reserve)
           response.should redirect_to(assigns(:reserve))
         end
@@ -596,19 +596,19 @@ describe ReservesController do
 
       describe 'with invalid params' do
         it 'assigns the reserve as @reserve' do
-          put :update, id: @reserve.id, reserve: @invalid_attrs
+          put :update, params: { id: @reserve.id, reserve: @invalid_attrs }
           assigns(:reserve).should_not be_valid
         end
 
         it "re-renders the 'edit' template" do
-          put :update, id: @reserve.id, reserve: @invalid_attrs
+          put :update, params: { id: @reserve.id, reserve: @invalid_attrs }
           response.should render_template('edit')
         end
       end
 
       it "should cancel other user's reservation" do
         old_message_requests_count = MessageRequest.count
-        put :update, id: 3, reserve: { user_number: users(:user1).profile.user_number }, mode: 'cancel'
+        put :update, params: { id: 3, reserve: { user_number: users(:user1).profile.user_number }, mode: 'cancel' }
         flash[:notice].should eq I18n.t('reserve.reservation_was_canceled')
         assigns(:reserve).current_state.should eq 'canceled'
         MessageRequest.count.should eq old_message_requests_count + 2
@@ -616,13 +616,13 @@ describe ReservesController do
       end
 
       it 'should update reserve without user_id' do
-        put :update, id: 3, reserve: { user_number: users(:user1).profile.user_number }
+        put :update, params: { id: 3, reserve: { user_number: users(:user1).profile.user_number } }
         assigns(:reserve).should be_valid
         response.should redirect_to reserve_url(assigns(:reserve))
       end
 
       it "should update other user's reservation" do
-        put :update, id: 3, reserve: { user_number: users(:user1).profile.user_number }
+        put :update, params: { id: 3, reserve: { user_number: users(:user1).profile.user_number } }
         assigns(:reserve).should be_valid
         response.should redirect_to reserve_url(assigns(:reserve))
       end
@@ -633,11 +633,11 @@ describe ReservesController do
 
       describe 'with valid params' do
         it 'updates the requested reserve' do
-          put :update, id: @reserve.id, reserve: @attrs
+          put :update, params: { id: @reserve.id, reserve: @attrs }
         end
 
         it 'assigns the requested reserve as @reserve' do
-          put :update, id: @reserve.id, reserve: @attrs
+          put :update, params: { id: @reserve.id, reserve: @attrs }
           assigns(:reserve).should eq(@reserve)
           response.should be_forbidden
         end
@@ -645,14 +645,14 @@ describe ReservesController do
 
       describe 'with invalid params' do
         it 'assigns the requested reserve as @reserve' do
-          put :update, id: @reserve.id, reserve: @invalid_attrs
+          put :update, params: { id: @reserve.id, reserve: @invalid_attrs }
           response.should be_forbidden
         end
       end
 
       it 'should cancel my reservation' do
         old_message_requests_count = MessageRequest.count
-        put :update, id: 3, mode: 'cancel'
+        put :update, params: { id: 3, mode: 'cancel' }
         flash[:notice].should eq I18n.t('reserve.reservation_was_canceled')
         assigns(:reserve).current_state.should eq 'canceled'
         MessageRequest.count.should eq old_message_requests_count + 2
@@ -660,18 +660,18 @@ describe ReservesController do
       end
 
       it 'should update my reservation' do
-        put :update, id: 3, reserve: { user_number: users(:user1).profile.user_number }
+        put :update, params: { id: 3, reserve: { user_number: users(:user1).profile.user_number } }
         flash[:notice].should eq I18n.t('controller.successfully_updated', model: I18n.t('activerecord.models.reserve'))
         response.should redirect_to reserve_url(assigns(:reserve))
       end
 
       it "should not update other user's reservation" do
-        put :update, id: 5, reserve: { user_number: users(:user2).profile.user_number }
+        put :update, params: { id: 5, reserve: { user_number: users(:user2).profile.user_number } }
         response.should be_forbidden
       end
 
       it "should not cancel other user's reservation" do
-        put :update, id: 5, reserve: { user_number: users(:user1).profile.user_number }, mode: 'cancel'
+        put :update, params: { id: 5, reserve: { user_number: users(:user1).profile.user_number }, mode: 'cancel' }
         response.should be_forbidden
       end
     end
@@ -679,18 +679,18 @@ describe ReservesController do
     describe 'When not logged in' do
       describe 'with valid params' do
         it 'updates the requested reserve' do
-          put :update, id: @reserve.id, reserve: @attrs
+          put :update, params: { id: @reserve.id, reserve: @attrs }
         end
 
         it 'should be forbidden' do
-          put :update, id: @reserve.id, reserve: @attrs
+          put :update, params: { id: @reserve.id, reserve: @attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
 
       describe 'with invalid params' do
         it 'assigns the requested reserve as @reserve' do
-          put :update, id: @reserve.id, reserve: @invalid_attrs
+          put :update, params: { id: @reserve.id, reserve: @invalid_attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
@@ -706,16 +706,16 @@ describe ReservesController do
       login_fixture_admin
 
       it 'destroys the requested reserve' do
-        delete :destroy, id: @reserve.id
+        delete :destroy, params: { id: @reserve.id }
       end
 
       it 'redirects to the reserves list' do
-        delete :destroy, id: @reserve.id
+        delete :destroy, params: { id: @reserve.id }
         response.should redirect_to(reserves_url)
       end
 
       it "should destroy other user's reservation" do
-        delete :destroy, id: 3
+        delete :destroy, params: { id: 3 }
         response.should redirect_to reserves_url
       end
     end
@@ -724,16 +724,16 @@ describe ReservesController do
       login_fixture_librarian
 
       it 'destroys the requested reserve' do
-        delete :destroy, id: @reserve.id
+        delete :destroy, params: { id: @reserve.id }
       end
 
       it 'redirects to the reserves list' do
-        delete :destroy, id: @reserve.id
+        delete :destroy, params: { id: @reserve.id }
         response.should redirect_to(reserves_url)
       end
 
       it "should destroy other user's reservation" do
-        delete :destroy, id: 3
+        delete :destroy, params: { id: 3 }
         response.should redirect_to reserves_url
       end
     end
@@ -742,32 +742,32 @@ describe ReservesController do
       login_fixture_user
 
       it 'destroys the requested reserve' do
-        delete :destroy, id: @reserve.id
+        delete :destroy, params: { id: @reserve.id }
       end
 
       it 'should be forbidden' do
-        delete :destroy, id: @reserve.id
+        delete :destroy, params: { id: @reserve.id }
         response.should be_forbidden
       end
 
       it 'should destroy my reservation' do
-        delete :destroy, id: 3
+        delete :destroy, params: { id: 3 }
         response.should redirect_to reserves_url
       end
 
       it "should not destroy other user's reservation" do
-        delete :destroy, id: 5
+        delete :destroy, params: { id: 5 }
         response.should be_forbidden
       end
     end
 
     describe 'When not logged in' do
       it 'destroys the requested reserve' do
-        delete :destroy, id: @reserve.id
+        delete :destroy, params: { id: @reserve.id }
       end
 
       it 'should be forbidden' do
-        delete :destroy, id: @reserve.id
+        delete :destroy, params: { id: @reserve.id }
         response.should redirect_to(new_user_session_url)
       end
     end