enju_circulation 0.2.5 → 0.3.0.beta.1

data/spec/controllers/checked_items_controller_spec.rb

@@ -14,7 +14,7 @@ describe CheckedItemsController do
       end
 
       it 'should get index without basket_id' do
-        get :index, item_id: 1
+        get :index, params: { item_id: 1 }
         assigns(:checked_items).should_not be_empty
         response.should be_success
       end
@@ -31,7 +31,7 @@ describe CheckedItemsController do
 
       describe 'When basket is specified' do
         it 'assigns checked_items as @checked_items' do
-          get :index, basket_id: 1
+          get :index, params: { basket_id: 1 }
           assigns(:checked_items).should_not be_empty
           response.should be_success
         end
@@ -48,7 +48,7 @@ describe CheckedItemsController do
       end
 
       it 'should not get index' do
-        get :index, basket_id: 3, item_id: 3
+        get :index, params: { basket_id: 3, item_id: 3 }
         response.should be_forbidden
       end
     end
@@ -61,7 +61,7 @@ describe CheckedItemsController do
       end
 
       it 'should not get index with basket_id and item_id' do
-        get :index, basket_id: 1, item_id: 1
+        get :index, params: { basket_id: 1, item_id: 1 }
         assigns(:checked_items).should be_nil
         response.should redirect_to(new_user_session_url)
       end
@@ -73,7 +73,7 @@ describe CheckedItemsController do
       login_fixture_admin
 
       it 'assigns the requested checked_item as @checked_item' do
-        get :show, id: 1
+        get :show, params: { id: 1 }
         assigns(:checked_item).should eq(checked_items(:checked_item_00001))
         response.should be_success
       end
@@ -83,7 +83,7 @@ describe CheckedItemsController do
       login_fixture_librarian
 
       it 'assigns the requested checked_item as @checked_item' do
-        get :show, id: 1
+        get :show, params: { id: 1 }
         assigns(:checked_item).should eq(checked_items(:checked_item_00001))
         response.should be_success
       end
@@ -93,7 +93,7 @@ describe CheckedItemsController do
       login_fixture_user
 
       it 'assigns the requested checked_item as @checked_item' do
-        get :show, id: 1
+        get :show, params: { id: 1 }
         assigns(:checked_item).should eq(checked_items(:checked_item_00001))
         response.should be_forbidden
       end
@@ -101,7 +101,7 @@ describe CheckedItemsController do
 
     describe 'When not logged in' do
       it 'assigns the requested checked_item as @checked_item' do
-        get :show, id: 1
+        get :show, params: { id: 1 }
         assigns(:checked_item).should eq(checked_items(:checked_item_00001))
         response.should redirect_to(new_user_session_url)
       end
@@ -113,7 +113,7 @@ describe CheckedItemsController do
       login_fixture_admin
 
       it 'assigns the requested checked_item as @checked_item' do
-        get :new, basket_id: 3
+        get :new, params: { basket_id: 3 }
         assigns(:checked_item).should_not be_valid
       end
 
@@ -129,7 +129,7 @@ describe CheckedItemsController do
       login_fixture_librarian
 
       it 'assigns the requested checked_item as @checked_item' do
-        get :new, basket_id: 3
+        get :new, params: { basket_id: 3 }
         assigns(:checked_item).should_not be_valid
         response.should be_success
       end
@@ -139,7 +139,7 @@ describe CheckedItemsController do
       login_fixture_user
 
       it 'should not assign the requested checked_item as @checked_item' do
-        get :new, basket_id: 3
+        get :new, params: { basket_id: 3 }
         assigns(:checked_item).should be_nil
         response.should be_forbidden
       end
@@ -147,7 +147,7 @@ describe CheckedItemsController do
 
     describe 'When not logged in' do
       it 'should not assign the requested checked_item as @checked_item' do
-        get :new, basket_id: 3
+        get :new, params: { basket_id: 3 }
         assigns(:checked_item).should be_nil
         response.should redirect_to(new_user_session_url)
       end
@@ -160,7 +160,7 @@ describe CheckedItemsController do
 
       it 'assigns the requested checked_item as @checked_item' do
         checked_item = checked_items(:checked_item_00001)
-        get :edit, id: checked_item.id
+        get :edit, params: { id: checked_item.id }
         assigns(:checked_item).should eq(checked_item)
       end
     end
@@ -170,7 +170,7 @@ describe CheckedItemsController do
 
       it 'assigns the requested checked_item as @checked_item' do
         checked_item = checked_items(:checked_item_00001)
-        get :edit, id: checked_item.id
+        get :edit, params: { id: checked_item.id }
         assigns(:checked_item).should eq(checked_item)
         response.should be_success
       end
@@ -181,7 +181,7 @@ describe CheckedItemsController do
 
       it 'assigns the requested checked_item as @checked_item' do
         checked_item = checked_items(:checked_item_00001)
-        get :edit, id: checked_item.id
+        get :edit, params: { id: checked_item.id }
         response.should be_forbidden
       end
     end
@@ -189,7 +189,7 @@ describe CheckedItemsController do
     describe 'When not logged in' do
       it 'should not assign the requested checked_item as @checked_item' do
         checked_item = checked_items(:checked_item_00001)
-        get :edit, id: checked_item.id
+        get :edit, params: { id: checked_item.id }
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -206,7 +206,7 @@ describe CheckedItemsController do
 
       describe 'When the item is missing' do
         it 'assigns a newly created checked_item as @checked_item' do
-          post :create, checked_item: { item_identifier: 'not found' }, basket_id: 1
+          post :create, params: { checked_item: { item_identifier: 'not found' }, basket_id: 1 }
           assigns(:checked_item).should_not be_valid
           assigns(:checked_item).errors[:base].include?(I18n.t('activerecord.errors.messages.checked_item.item_not_found')).should be_truthy
         end
@@ -214,7 +214,7 @@ describe CheckedItemsController do
 
       describe 'When the item is not for checkout' do
         it 'assigns a newly created checked_item as @checked_item' do
-          post :create, checked_item: { item_identifier: '00017' }, basket_id: 1
+          post :create, params: { checked_item: { item_identifier: '00017' }, basket_id: 1 }
           assigns(:checked_item).should_not be_valid
           assigns(:checked_item).errors[:base].include?(I18n.t('activerecord.errors.messages.checked_item.not_available_for_checkout')).should be_truthy
         end
@@ -222,7 +222,7 @@ describe CheckedItemsController do
 
       describe 'When the item is already checked out' do
         it 'assigns a newly created checked_item as @checked_item' do
-          post :create, checked_item: { item_identifier: '00013' }, basket_id: 8
+          post :create, params: { checked_item: { item_identifier: '00013' }, basket_id: 8 }
           assigns(:checked_item).should_not be_valid
           assigns(:checked_item).errors[:base].include?(I18n.t('activerecord.errors.messages.checked_item.already_checked_out')).should be_truthy
         end
@@ -231,7 +231,7 @@ describe CheckedItemsController do
       describe 'When the item is reserved' do
         it 'assigns a newly created checked_item as @checked_item' do
           old_count = items(:item_00021).manifestation.reserves.waiting.count
-          post :create, checked_item: { item_identifier: '00021' }, basket_id: 11
+          post :create, params: { checked_item: { item_identifier: '00021' }, basket_id: 11 }
           assigns(:checked_item).should be_valid
           assigns(:checked_item).item.manifestation.reserves.waiting.count.should eq old_count
           assigns(:checked_item).librarian.should eq users(:admin)
@@ -239,12 +239,12 @@ describe CheckedItemsController do
       end
 
       it 'should not create checked_item without basket_id' do
-        post :create, checked_item: { item_identifier: '00004' }
+        post :create, params: { checked_item: { item_identifier: '00004' } }
         response.should be_forbidden
       end
 
       it 'should not create checked_item without item_id' do
-        post :create, checked_item: { item_identifier: '00004' }, basket_id: 1
+        post :create, params: { checked_item: { item_identifier: '00004' }, basket_id: 1 }
         response.should be_success
       end
     end
@@ -253,47 +253,47 @@ describe CheckedItemsController do
       login_fixture_librarian
 
       it 'should create checked_item' do
-        post :create, checked_item: @attrs, basket_id: 3
-        assigns(:checked_item).due_date.should eq Time.zone.now.tomorrow.end_of_day
+        post :create, params: { checked_item: @attrs, basket_id: 3 }
+        assigns(:checked_item).due_date.to_s.should eq Time.zone.now.tomorrow.end_of_day.to_s
         response.should redirect_to checked_items_url(basket_id: assigns(:checked_item).basket_id)
       end
 
       it 'should create checked_item with item_identifier' do
-        post :create, checked_item: { item_identifier: '00011' }, basket_id: 3
+        post :create, params: { checked_item: { item_identifier: '00011' }, basket_id: 3 }
         assigns(:checked_item).should be_truthy
         assigns(:checked_item).due_date.should_not be_nil
         response.should redirect_to checked_items_url(basket_id: assigns(:checked_item).basket_id)
       end
 
       it 'should override due_date' do
-        post :create, checked_item: { item_identifier: '00011', due_date_string: 1.year.from_now.strftime('%Y-%m-%d') }, basket_id: 3
+        post :create, params: { checked_item: { item_identifier: '00011', due_date_string: 1.year.from_now.strftime('%Y-%m-%d') }, basket_id: 3 }
         assigns(:checked_item).should be_truthy
-        assigns(:checked_item).due_date.should eq 1.year.from_now.end_of_day
+        assigns(:checked_item).due_date.to_s.should eq 1.year.from_now.end_of_day.to_s
         response.should redirect_to checked_items_url(basket_id: assigns(:checked_item).basket_id)
       end
 
       it 'should not create checked_item with an invalid due_date' do
-        post :create, checked_item: { item_identifier: '00011', due_date_string: 'invalid' }, basket_id: 3
+        post :create, params: { checked_item: { item_identifier: '00011', due_date_string: 'invalid' }, basket_id: 3 }
         assigns(:checked_item).should_not be_valid
         assigns(:checked_item).due_date.should be_nil
         response.should be_success
       end
 
       it 'should not create checked_item if excessed checkout_limit' do
-        post :create, checked_item: { item_identifier: '00011' }, basket_id: 1
+        post :create, params: { checked_item: { item_identifier: '00011' }, basket_id: 1 }
         response.should be_success
         assigns(:checked_item).errors['base'].include?(I18n.t('activerecord.errors.messages.checked_item.excessed_checkout_limit')).should be_truthy
       end
 
       it 'should show message when the item includes supplements' do
-        post :create, checked_item: { item_identifier: '00006' }, basket_id: 3
+        post :create, params: { checked_item: { item_identifier: '00006' }, basket_id: 3 }
         assigns(:checked_item).due_date.should_not be_nil
         response.should redirect_to checked_items_url(basket_id: assigns(:checked_item).basket_id)
         flash[:message].index(I18n.t('item.this_item_include_supplement')).should be_truthy
       end
 
       it 'should create checked_item when ignore_restriction is checked' do
-        post :create, checked_item: { item_identifier: '00011', ignore_restriction: '1' }, basket_id: 2
+        post :create, params: { checked_item: { item_identifier: '00011', ignore_restriction: '1' }, basket_id: 2 }
         assigns(:checked_item).due_date.should_not be_nil
         response.should redirect_to checked_items_url(basket_id: assigns(:checked_item).basket_id)
       end
@@ -303,14 +303,14 @@ describe CheckedItemsController do
       login_fixture_user
 
       it 'should not create checked_item' do
-        post :create, checked_item: { item_identifier: '00004' }, basket_id: 3
+        post :create, params: { checked_item: { item_identifier: '00004' }, basket_id: 3 }
         response.should be_forbidden
       end
     end
 
     describe 'When not logged in as' do
       it 'should not create checked_item' do
-        post :create, checked_item: { item_identifier: '00004' }, basket_id: 1
+        post :create, params: { checked_item: { item_identifier: '00004' }, basket_id: 1 }
         response.should redirect_to new_user_session_url
       end
     end
@@ -326,7 +326,7 @@ describe CheckedItemsController do
       login_fixture_admin
 
       it 'should not update checked_item without basket_id' do
-        put :update, id: 1, checked_item: {}
+        put :update, params: { id: 1, checked_item: {} }
         response.should be_forbidden
       end
     end
@@ -335,12 +335,12 @@ describe CheckedItemsController do
       login_fixture_librarian
 
       it 'should not update checked_item without basket_id' do
-        put :update, id: 1, checked_item: {}
+        put :update, params: { id: 1, checked_item: {} }
         response.should be_forbidden
       end
 
       it 'should update checked_item' do
-        put :update, id: 4, checked_item: {}, basket_id: 8
+        put :update, params: { id: 4, checked_item: {}, basket_id: 8 }
         assigns(:checked_item).should be_valid
         response.should redirect_to checked_item_url(assigns(:checked_item))
       end
@@ -350,14 +350,14 @@ describe CheckedItemsController do
       login_fixture_user
 
       it 'should not update checked_item' do
-        put :update, id: 1, checked_item: {}, basket_id: 3
+        put :update, params: { id: 1, checked_item: {}, basket_id: 3 }
         response.should be_forbidden
       end
     end
 
     describe 'When not logged in' do
       it 'should not update checked_item' do
-        put :update, id: 1, checked_item: {}, basket_id: 1
+        put :update, params: { id: 1, checked_item: {}, basket_id: 1 }
         response.should redirect_to new_user_session_url
       end
     end
@@ -368,7 +368,7 @@ describe CheckedItemsController do
       login_fixture_admin
 
       it 'should destroy checked_item' do
-        delete :destroy, id: 1
+        delete :destroy, params: { id: 1 }
         response.should redirect_to checked_items_url(basket_id: assigns(:checked_item).basket_id)
       end
     end
@@ -377,7 +377,7 @@ describe CheckedItemsController do
       login_fixture_librarian
 
       it 'should destroy checked_item' do
-        delete :destroy, id: 1
+        delete :destroy, params: { id: 1 }
         response.should redirect_to checked_items_url(basket_id: assigns(:checked_item).basket_id)
       end
     end
@@ -386,14 +386,14 @@ describe CheckedItemsController do
       login_fixture_user
 
       it 'should not destroy checked_item' do
-        delete :destroy, id: 3
+        delete :destroy, params: { id: 3 }
         response.should be_forbidden
       end
     end
 
     describe 'When not logged in' do
       it 'should not destroy checked_item' do
-        delete :destroy, id: 1
+        delete :destroy, params: { id: 1 }
         response.should redirect_to new_user_session_url
       end
     end

data/spec/controllers/checkins_controller_spec.rb

@@ -21,7 +21,7 @@ describe CheckinsController do
 
       describe 'When basket_id is specified' do
         it 'assigns all checkins as @checkins' do
-          get :index, basket_id: 10
+          get :index, params: { basket_id: 10 }
           assigns(:checkins).should eq Basket.find(10).checkins.page(1)
           response.should be_success
         end
@@ -39,7 +39,7 @@ describe CheckinsController do
 
       describe 'When basket_id is specified' do
         it 'assigns all checkins as @checkins' do
-          get :index, basket_id: 9
+          get :index, params: { basket_id: 9 }
           assigns(:checkins).should eq Basket.find(9).checkins.page(1)
           response.should be_success
         end
@@ -63,7 +63,7 @@ describe CheckinsController do
 
       it 'assigns the requested checkin as @checkin' do
         checkin = checkins(:checkin_00001)
-        get :show, id: checkin.id
+        get :show, params: { id: checkin.id }
         assigns(:checkin).should eq(checkin)
       end
     end
@@ -73,7 +73,7 @@ describe CheckinsController do
 
       it 'assigns the requested checkin as @checkin' do
         checkin = checkins(:checkin_00001)
-        get :show, id: checkin.id
+        get :show, params: { id: checkin.id }
         assigns(:checkin).should eq(checkin)
       end
     end
@@ -83,7 +83,7 @@ describe CheckinsController do
 
       it 'assigns the requested checkin as @checkin' do
         checkin = checkins(:checkin_00001)
-        get :show, id: checkin.id
+        get :show, params: { id: checkin.id }
         assigns(:checkin).should eq(checkin)
         response.should be_forbidden
       end
@@ -92,7 +92,7 @@ describe CheckinsController do
     describe 'When not logged in' do
       it 'assigns the requested checkin as @checkin' do
         checkin = checkins(:checkin_00001)
-        get :show, id: checkin.id
+        get :show, params: { id: checkin.id }
         assigns(:checkin).should eq(checkin)
         response.should redirect_to new_user_session_url
       end
@@ -143,7 +143,7 @@ describe CheckinsController do
 
       it 'assigns the requested checkin as @checkin' do
         checkin = checkins(:checkin_00001)
-        get :edit, id: checkin.id
+        get :edit, params: { id: checkin.id }
         assigns(:checkin).should eq(checkin)
       end
     end
@@ -153,7 +153,7 @@ describe CheckinsController do
 
       it 'assigns the requested checkin as @checkin' do
         checkin = checkins(:checkin_00001)
-        get :edit, id: checkin.id
+        get :edit, params: { id: checkin.id }
         assigns(:checkin).should eq(checkin)
       end
     end
@@ -163,7 +163,7 @@ describe CheckinsController do
 
       it 'assigns the requested checkin as @checkin' do
         checkin = checkins(:checkin_00001)
-        get :edit, id: checkin.id
+        get :edit, params: { id: checkin.id }
         response.should be_forbidden
       end
     end
@@ -171,7 +171,7 @@ describe CheckinsController do
     describe 'When not logged in' do
       it 'should not assign the requested checkin as @checkin' do
         checkin = checkins(:checkin_00001)
-        get :edit, id: checkin.id
+        get :edit, params: { id: checkin.id }
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -188,24 +188,24 @@ describe CheckinsController do
 
       describe 'with valid params' do
         it 'assigns a newly created checkin as @checkin' do
-          post :create, checkin: @attrs
+          post :create, params: { checkin: @attrs }
           assigns(:checkin).should be_nil
         end
 
         it 'should not create checkin without basket_id' do
-          post :create, checkin: @attrs
+          post :create, params: { checkin: @attrs }
           response.should be_forbidden
         end
 
         describe 'When basket_id is specified' do
           it 'redirects to the created checkin' do
-            post :create, checkin: @attrs, basket_id: 9
+            post :create, params: { checkin: @attrs, basket_id: 9 }
             response.should redirect_to(checkins_url(basket_id: assigns(:checkin).basket_id))
             assigns(:checkin).item.circulation_status.name.should eq 'Available On Shelf'
           end
 
           it 'should checkin the overdue item' do
-            post :create, checkin: { item_identifier: '00014' }, basket_id: 9
+            post :create, params: { checkin: { item_identifier: '00014' }, basket_id: 9 }
             response.should redirect_to(checkins_url(basket_id: assigns(:checkin).basket_id))
             assigns(:checkin).checkout.should be_valid
             assigns(:checkin).item.circulation_status.name.should eq 'Available On Shelf'
@@ -215,18 +215,18 @@ describe CheckinsController do
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved checkin as @checkin' do
-          post :create, checkin: @invalid_attrs
+          post :create, params: { checkin: @invalid_attrs }
           assigns(:checkin).should be_nil
         end
 
         it 'should be forbidden' do
-          post :create, checkin: @invalid_attrs
+          post :create, params: { checkin: @invalid_attrs }
           response.should be_forbidden
         end
       end
 
       it 'should not create checkin without item_id' do
-        post :create, checkin: { item_identifier: nil }, basket_id: 9
+        post :create, params: { checkin: { item_identifier: nil }, basket_id: 9 }
         assigns(:checkin).should_not be_valid
         response.should be_success
       end
@@ -237,17 +237,17 @@ describe CheckinsController do
 
       describe 'with valid params' do
         it 'assigns a newly created checkin as @checkin' do
-          post :create, checkin: @attrs
+          post :create, params: { checkin: @attrs }
           assigns(:checkin).should be_nil
         end
 
         it 'should not create checkin without basket_id' do
-          post :create, checkin: @attrs
+          post :create, params: { checkin: @attrs }
           response.should be_forbidden
         end
 
         it 'should show notification when it is reserved' do
-          post :create, checkin: { item_identifier: '00008' }, basket_id: 9
+          post :create, params: { checkin: { item_identifier: '00008' }, basket_id: 9 }
           flash[:message].to_s.index(I18n.t('item.this_item_is_reserved')).should be_truthy
           assigns(:checkin).item.should be_retained
           assigns(:checkin).item.circulation_status.name.should eq 'Available On Shelf'
@@ -255,7 +255,7 @@ describe CheckinsController do
         end
 
         it 'should show notification when an item includes supplements' do
-          post :create, checkin: { item_identifier: '00004' }, basket_id: 9
+          post :create, params: { checkin: { item_identifier: '00004' }, basket_id: 9 }
           assigns(:checkin).item.circulation_status.name.should eq 'Available On Shelf'
           flash[:message].to_s.index(I18n.t('item.this_item_include_supplement')).should be_truthy
           response.should redirect_to(checkins_url(basket_id: assigns(:basket).id))
@@ -264,7 +264,7 @@ describe CheckinsController do
 
       it "should show notice when other library's item is checked in" do
         sign_in users(:librarian2)
-        post :create, checkin: { item_identifier: '00009' }, basket_id: 9
+        post :create, params: { checkin: { item_identifier: '00009' }, basket_id: 9 }
         assigns(:checkin).should be_valid
         flash[:message].to_s.index(I18n.t('checkin.other_library_item')).should be_truthy
         response.should redirect_to(checkins_url(basket_id: assigns(:basket).id))
@@ -276,12 +276,12 @@ describe CheckinsController do
 
       describe 'with valid params' do
         it 'assigns a newly created checkin as @checkin' do
-          post :create, checkin: @attrs
+          post :create, params: { checkin: @attrs }
           assigns(:checkin).should be_nil
         end
 
         it 'should be forbidden' do
-          post :create, checkin: @attrs
+          post :create, params: { checkin: @attrs }
           response.should be_forbidden
         end
       end
@@ -295,11 +295,11 @@ describe CheckinsController do
 
       describe 'with valid params' do
         it 'assigns a newly created checkin as @checkin' do
-          post :create, checkin: @attrs
+          post :create, params: { checkin: @attrs }
         end
 
         it 'should redirect to new session url' do
-          post :create, checkin: @attrs
+          post :create, params: { checkin: @attrs }
           response.should redirect_to new_user_session_url
         end
       end
@@ -318,11 +318,11 @@ describe CheckinsController do
 
       describe 'with valid params' do
         it 'updates the requested checkin' do
-          put :update, id: @checkin.id, checkin: @attrs
+          put :update, params: { id: @checkin.id, checkin: @attrs }
         end
 
         it 'assigns the requested checkin as @checkin' do
-          put :update, id: @checkin.id, checkin: @attrs
+          put :update, params: { id: @checkin.id, checkin: @attrs }
           assigns(:checkin).should eq(@checkin)
           response.should redirect_to(@checkin)
         end
@@ -330,16 +330,16 @@ describe CheckinsController do
 
       describe 'with invalid params' do
         it 'assigns the requested checkin as @checkin' do
-          put :update, id: @checkin.id, checkin: @invalid_attrs
+          put :update, params: { id: @checkin.id, checkin: @invalid_attrs }
         end
 
         it "re-renders the 'edit' template" do
-          put :update, id: @checkin.id, checkin: @invalid_attrs
+          put :update, params: { id: @checkin.id, checkin: @invalid_attrs }
           response.should render_template('edit')
         end
 
         it 'should not update checkin without item_identifier' do
-          put :update, id: @checkin.id, checkin: @attrs.merge(item_identifier: nil)
+          put :update, params: { id: @checkin.id, checkin: @attrs.merge(item_identifier: nil) }
           assigns(:checkin).should be_valid
           response.should redirect_to(@checkin)
         end
@@ -351,11 +351,11 @@ describe CheckinsController do
 
       describe 'with valid params' do
         it 'updates the requested checkin' do
-          put :update, id: @checkin.id, checkin: @attrs
+          put :update, params: { id: @checkin.id, checkin: @attrs }
         end
 
         it 'assigns the requested checkin as @checkin' do
-          put :update, id: @checkin.id, checkin: @attrs
+          put :update, params: { id: @checkin.id, checkin: @attrs }
           assigns(:checkin).should eq(@checkin)
           response.should redirect_to(@checkin)
         end
@@ -363,12 +363,12 @@ describe CheckinsController do
 
       describe 'with invalid params' do
         it 'assigns the checkin as @checkin' do
-          put :update, id: @checkin.id, checkin: @invalid_attrs
+          put :update, params: { id: @checkin.id, checkin: @invalid_attrs }
           assigns(:checkin).should_not be_valid
         end
 
         it "re-renders the 'edit' template" do
-          put :update, id: @checkin.id, checkin: @invalid_attrs
+          put :update, params: { id: @checkin.id, checkin: @invalid_attrs }
           response.should render_template('edit')
         end
       end
@@ -379,11 +379,11 @@ describe CheckinsController do
 
       describe 'with valid params' do
         it 'updates the requested checkin' do
-          put :update, id: @checkin.id, checkin: @attrs
+          put :update, params: { id: @checkin.id, checkin: @attrs }
         end
 
         it 'assigns the requested checkin as @checkin' do
-          put :update, id: @checkin.id, checkin: @attrs
+          put :update, params: { id: @checkin.id, checkin: @attrs }
           assigns(:checkin).should eq(@checkin)
           response.should be_forbidden
         end
@@ -391,7 +391,7 @@ describe CheckinsController do
 
       describe 'with invalid params' do
         it 'assigns the requested checkin as @checkin' do
-          put :update, id: @checkin.id, checkin: @invalid_attrs
+          put :update, params: { id: @checkin.id, checkin: @invalid_attrs }
           response.should be_forbidden
         end
       end
@@ -400,18 +400,18 @@ describe CheckinsController do
     describe 'When not logged in' do
       describe 'with valid params' do
         it 'updates the requested checkin' do
-          put :update, id: @checkin.id, checkin: @attrs
+          put :update, params: { id: @checkin.id, checkin: @attrs }
         end
 
         it 'should be forbidden' do
-          put :update, id: @checkin.id, checkin: @attrs
+          put :update, params: { id: @checkin.id, checkin: @attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
 
       describe 'with invalid params' do
         it 'assigns the requested checkin as @checkin' do
-          put :update, id: @checkin.id, checkin: @invalid_attrs
+          put :update, params: { id: @checkin.id, checkin: @invalid_attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
@@ -427,11 +427,11 @@ describe CheckinsController do
       login_fixture_admin
 
       it 'destroys the requested checkin' do
-        delete :destroy, id: @checkin.id
+        delete :destroy, params: { id: @checkin.id }
       end
 
       it 'redirects to the checkins list' do
-        delete :destroy, id: @checkin.id
+        delete :destroy, params: { id: @checkin.id }
         response.should redirect_to(checkins_url)
       end
     end
@@ -440,11 +440,11 @@ describe CheckinsController do
       login_fixture_librarian
 
       it 'destroys the requested checkin' do
-        delete :destroy, id: @checkin.id
+        delete :destroy, params: { id: @checkin.id }
       end
 
       it 'redirects to the checkins list' do
-        delete :destroy, id: @checkin.id
+        delete :destroy, params: { id: @checkin.id }
         response.should redirect_to(checkins_url)
       end
     end
@@ -453,22 +453,22 @@ describe CheckinsController do
       login_fixture_user
 
       it 'destroys the requested checkin' do
-        delete :destroy, id: @checkin.id
+        delete :destroy, params: { id: @checkin.id }
       end
 
       it 'should be forbidden' do
-        delete :destroy, id: @checkin.id
+        delete :destroy, params: { id: @checkin.id }
         response.should be_forbidden
       end
     end
 
     describe 'When not logged in' do
       it 'destroys the requested checkin' do
-        delete :destroy, id: @checkin.id
+        delete :destroy, params: { id: @checkin.id }
       end
 
       it 'should be forbidden' do
-        delete :destroy, id: @checkin.id
+        delete :destroy, params: { id: @checkin.id }
         response.should redirect_to(new_user_session_url)
       end
     end