enju_library 0.2.5 → 0.3.0.beta.2

data/spec/controllers/baskets_controller_spec.rb

@@ -8,7 +8,7 @@ describe BasketsController do
       login_fixture_admin
 
       it 'assigns all baskets as @baskets' do
-        get :index, user_id: users(:user1).username
+        get :index, params: { user_id: users(:user1).username }
         assigns(:baskets).should_not be_empty
         response.should be_success
       end
@@ -23,7 +23,7 @@ describe BasketsController do
       login_fixture_librarian
 
       it 'assigns all baskets as @baskets' do
-        get :index, user_id: users(:user1).username
+        get :index, params: { user_id: users(:user1).username }
         assigns(:baskets).should_not be_empty
         response.should be_success
       end
@@ -33,7 +33,7 @@ describe BasketsController do
       login_fixture_user
 
       it 'assigns all baskets as @baskets' do
-        get :index, user_id: users(:user1).username
+        get :index, params: { user_id: users(:user1).username }
         assigns(:baskets).should be_nil
         response.should be_forbidden
       end
@@ -41,7 +41,7 @@ describe BasketsController do
 
     describe 'When not logged in' do
       it 'assigns all baskets as @baskets' do
-        get :index, user_id: users(:user1).username
+        get :index, params: { user_id: users(:user1).username }
         assigns(:baskets).should be_nil
         response.should redirect_to(new_user_session_url)
       end
@@ -53,7 +53,7 @@ describe BasketsController do
       login_fixture_admin
 
       it 'assigns the requested basket as @basket' do
-        get :show, id: 1, user_id: users(:admin).username
+        get :show, params: { id: 1, user_id: users(:admin).username }
         assigns(:basket).should eq(Basket.find(1))
       end
     end
@@ -62,7 +62,7 @@ describe BasketsController do
       login_fixture_librarian
 
       it 'assigns the requested basket as @basket' do
-        get :show, id: 1, user_id: users(:admin).username
+        get :show, params: { id: 1, user_id: users(:admin).username }
         assigns(:basket).should eq(Basket.find(1))
       end
     end
@@ -71,7 +71,7 @@ describe BasketsController do
       login_fixture_user
 
       it 'assigns the requested basket as @basket' do
-        get :show, id: 1, user_id: users(:admin).username
+        get :show, params: { id: 1, user_id: users(:admin).username }
         assigns(:basket).should eq(Basket.find(1))
         response.should be_forbidden
       end
@@ -79,7 +79,7 @@ describe BasketsController do
 
     describe 'When not logged in' do
       it 'assigns the requested basket as @basket' do
-        get :show, id: 1, user_id: users(:admin).username
+        get :show, params: { id: 1, user_id: users(:admin).username }
         assigns(:basket).should eq(Basket.find(1))
         response.should redirect_to(new_user_session_url)
       end
@@ -132,7 +132,7 @@ describe BasketsController do
       end
 
       it 'assigns the requested basket as @basket' do
-        get :edit, id: @basket.id
+        get :edit, params: { id: @basket.id }
         assigns(:basket).should eq(@basket)
       end
     end
@@ -144,7 +144,7 @@ describe BasketsController do
       end
 
       it 'assigns the requested basket as @basket' do
-        get :edit, id: @basket.id
+        get :edit, params: { id: @basket.id }
         assigns(:basket).should eq(@basket)
       end
     end
@@ -156,7 +156,7 @@ describe BasketsController do
       end
 
       it 'should not assign the requested basket as @basket' do
-        get :edit, id: @basket.id
+        get :edit, params: { id: @basket.id }
         assigns(:basket).should eq(@basket)
         response.should be_forbidden
       end
@@ -168,7 +168,7 @@ describe BasketsController do
       end
 
       it 'should not assign the requested basket as @basket' do
-        get :edit, id: @basket.id
+        get :edit, params: { id: @basket.id }
         assigns(:basket).should eq(@basket)
         response.should redirect_to new_user_session_url
       end
@@ -186,21 +186,21 @@ describe BasketsController do
 
       describe 'with valid params' do
         it 'assigns a newly created basket as @basket' do
-          post :create, basket: { user_number: users(:user1).profile.user_number }
+          post :create, params: { basket: { user_number: users(:user1).profile.user_number } }
           assigns(:basket).should be_valid
         end
       end
 
       describe 'with blank params' do
         it 'assigns a newly created basket as @basket' do
-          post :create, basket: { note: 'test' }
+          post :create, params: { basket: { note: 'test' } }
           assigns(:basket).should_not be_valid
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created basket as @basket' do
-          post :create, basket: @invalid_attrs
+          post :create, params: { basket: @invalid_attrs }
           assigns(:basket).should_not be_valid
         end
       end
@@ -211,53 +211,53 @@ describe BasketsController do
 
       describe 'with valid params' do
         it 'assigns a newly created basket as @basket' do
-          post :create, basket: { user_number: users(:user1).profile.user_number }
+          post :create, params: { basket: { user_number: users(:user1).profile.user_number } }
           assigns(:basket).should be_valid
         end
       end
 
       describe 'with blank params' do
         it 'assigns a newly created basket as @basket' do
-          post :create, basket: { note: 'test' }
+          post :create, params: { basket: { note: 'test' } }
           assigns(:basket).should_not be_valid
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created basket as @basket' do
-          post :create, basket: @invalid_attrs
+          post :create, params: { basket: @invalid_attrs }
           assigns(:basket).should_not be_valid
         end
       end
 
       it 'should not create basket when user is suspended' do
-        post :create, basket: { user_number: users(:user4).profile.user_number }
+        post :create, params: { basket: { user_number: users(:user4).profile.user_number } }
         assigns(:basket).should_not be_valid
         assigns(:basket).errors['base'].include?(I18n.t('basket.this_account_is_suspended')).should be_truthy
         response.should be_success
       end
 
       it 'should not create basket when user is not found' do
-        post :create, basket: { user_number: 'not found' }
+        post :create, params: { basket: { user_number: 'not found' } }
         assigns(:basket).should_not be_valid
         assigns(:basket).errors['base'].include?(I18n.t('user.not_found')).should be_truthy
         response.should be_success
       end
 
       it 'should not create basket without user_number' do
-        post :create, basket: { note: 'test' }
+        post :create, params: { basket: { note: 'test' } }
         assigns(:basket).should_not be_valid
         response.should be_success
       end
 
       it 'should create basket' do
-        post :create, basket: { user_number: users(:user1).profile.user_number }
+        post :create, params: { basket: { user_number: users(:user1).profile.user_number } }
         assigns(:basket).should be_valid
         response.should redirect_to new_checked_item_url(basket_id: assigns(:basket).id)
       end
 
       it 'should not create basket without user_number' do
-        post :create, basket: { note: 'test' }
+        post :create, params: { basket: { note: 'test' } }
         assigns(:basket).should_not be_valid
         response.should be_success
       end
@@ -268,18 +268,18 @@ describe BasketsController do
 
       describe 'with valid params' do
         it 'assigns a newly created basket as @basket' do
-          post :create, basket: { user_number: users(:user1).profile.user_number }
+          post :create, params: { basket: { user_number: users(:user1).profile.user_number } }
           assigns(:basket).should be_nil
         end
 
         it 'should be forbidden' do
-          post :create, basket: { user_number: users(:user1).profile.user_number }
+          post :create, params: { basket: { user_number: users(:user1).profile.user_number } }
           response.should be_forbidden
         end
       end
 
       it 'should not create basket' do
-        post :create, basket: { user_number: users(:user1).profile.user_number }
+        post :create, params: { basket: { user_number: users(:user1).profile.user_number } }
         response.should be_forbidden
       end
     end
@@ -287,12 +287,12 @@ describe BasketsController do
     describe 'When not logged in' do
       describe 'with blank params' do
         it 'assigns a newly created basket as @basket' do
-          post :create, basket: { note: 'test' }
+          post :create, params: { basket: { note: 'test' } }
           assigns(:basket).should be_nil
         end
 
         it 'should be redirected to new_user_session_url' do
-          post :create, basket: { note: 'test' }
+          post :create, params: { basket: { note: 'test' } }
           assigns(:basket).should be_nil
           assert_response :redirect
           response.should redirect_to new_user_session_url
@@ -311,11 +311,11 @@ describe BasketsController do
 
       describe 'with valid params' do
         it 'updates the requested basket' do
-          put :update, id: 8, basket: @attrs
+          put :update, params: { id: 8, basket: @attrs }
         end
 
         it 'assigns the requested basket as @basket' do
-          put :update, id: 8, basket: @attrs
+          put :update, params: { id: 8, basket: @attrs }
           assigns(:basket).checkouts.order('created_at DESC').first.item.circulation_status.name.should eq 'On Loan'
           response.should redirect_to(checkouts_url(user_id: assigns(:basket).user.username))
         end
@@ -332,12 +332,12 @@ describe BasketsController do
       login_fixture_admin
 
       it 'should destroy basket without user_id' do
-        delete :destroy, id: 1, basket: { user_id: nil }, user_id: users(:user1).username
+        delete :destroy, params: { id: 1, basket: { user_id: nil }, user_id: users(:user1).username }
         response.should redirect_to(checkouts_url(user_id: assigns(:basket).user.username))
       end
 
       it 'should destroy basket' do
-        delete :destroy, id: 1, basket: {}, user_id: users(:user1).username
+        delete :destroy, params: { id: 1, basket: {}, user_id: users(:user1).username }
         response.should redirect_to(checkouts_url(user_id: assigns(:basket).user.username))
       end
     end
@@ -346,12 +346,12 @@ describe BasketsController do
       login_fixture_librarian
 
       it 'should destroy basket without user_id' do
-        delete :destroy, id: 1, basket: { user_id: nil }, user_id: users(:user1).username
+        delete :destroy, params: { id: 1, basket: { user_id: nil }, user_id: users(:user1).username }
         response.should redirect_to(checkouts_url(user_id: assigns(:basket).user.username))
       end
 
       it 'should destroy basket' do
-        delete :destroy, id: 1, basket: {}, user_id: users(:user1).username
+        delete :destroy, params: { id: 1, basket: {}, user_id: users(:user1).username }
         response.should redirect_to(checkouts_url(user_id: assigns(:basket).user.username))
       end
     end
@@ -360,18 +360,18 @@ describe BasketsController do
       login_fixture_user
 
       it 'should not destroy basket' do
-        delete :destroy, id: 3, user_id: users(:user1).username
+        delete :destroy, params: { id: 3, user_id: users(:user1).username }
         response.should be_forbidden
       end
     end
 
     describe 'When not logged in' do
       it 'destroys the requested basket' do
-        delete :destroy, id: @basket.id
+        delete :destroy, params: { id: @basket.id }
       end
 
       it 'should be forbidden' do
-        delete :destroy, id: @basket.id
+        delete :destroy, params: { id: @basket.id }
         response.should redirect_to new_user_session_url
       end
     end

data/spec/controllers/bookstores_controller_spec.rb

@@ -60,7 +60,7 @@ describe BookstoresController do
       login_fixture_admin
 
       it 'assigns the requested bookstore as @bookstore' do
-        get :show, id: @bookstore.id
+        get :show, params: { id: @bookstore.id }
         assigns(:bookstore).should eq(@bookstore)
       end
     end
@@ -69,7 +69,7 @@ describe BookstoresController do
       login_fixture_librarian
 
       it 'assigns the requested bookstore as @bookstore' do
-        get :show, id: @bookstore.id
+        get :show, params: { id: @bookstore.id }
         assigns(:bookstore).should eq(@bookstore)
       end
     end
@@ -78,14 +78,14 @@ describe BookstoresController do
       login_fixture_user
 
       it 'assigns the requested bookstore as @bookstore' do
-        get :show, id: @bookstore.id
+        get :show, params: { id: @bookstore.id }
         assigns(:bookstore).should eq(@bookstore)
       end
     end
 
     describe 'When not logged in' do
       it 'assigns the requested bookstore as @bookstore' do
-        get :show, id: @bookstore.id
+        get :show, params: { id: @bookstore.id }
         assigns(:bookstore).should eq(@bookstore)
       end
     end
@@ -140,7 +140,7 @@ describe BookstoresController do
       login_fixture_admin
 
       it 'assigns the requested bookstore as @bookstore' do
-        get :edit, id: @bookstore.id
+        get :edit, params: { id: @bookstore.id }
         assigns(:bookstore).should eq(@bookstore)
       end
     end
@@ -149,7 +149,7 @@ describe BookstoresController do
       login_fixture_librarian
 
       it 'assigns the requested bookstore as @bookstore' do
-        get :edit, id: @bookstore.id
+        get :edit, params: { id: @bookstore.id }
         response.should be_forbidden
       end
     end
@@ -158,14 +158,14 @@ describe BookstoresController do
       login_fixture_user
 
       it 'assigns the requested bookstore as @bookstore' do
-        get :edit, id: @bookstore.id
+        get :edit, params: { id: @bookstore.id }
         response.should be_forbidden
       end
     end
 
     describe 'When not logged in' do
       it 'should not assign the requested bookstore as @bookstore' do
-        get :edit, id: @bookstore.id
+        get :edit, params: { id: @bookstore.id }
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -182,24 +182,24 @@ describe BookstoresController do
 
       describe 'with valid params' do
         it 'assigns a newly created bookstore as @bookstore' do
-          post :create, bookstore: @attrs
+          post :create, params: { bookstore: @attrs }
           assigns(:bookstore).should be_valid
         end
 
         it 'redirects to the created bookstore' do
-          post :create, bookstore: @attrs
+          post :create, params: { bookstore: @attrs }
           response.should redirect_to(assigns(:bookstore))
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved bookstore as @bookstore' do
-          post :create, bookstore: @invalid_attrs
+          post :create, params: { bookstore: @invalid_attrs }
           assigns(:bookstore).should_not be_valid
         end
 
         it 'should be successful' do
-          post :create, bookstore: @invalid_attrs
+          post :create, params: { bookstore: @invalid_attrs }
           response.should be_success
         end
       end
@@ -210,24 +210,24 @@ describe BookstoresController do
 
       describe 'with valid params' do
         it 'assigns a newly created bookstore as @bookstore' do
-          post :create, bookstore: @attrs
+          post :create, params: { bookstore: @attrs }
           assigns(:bookstore).should be_nil
         end
 
         it 'should be forbidden' do
-          post :create, bookstore: @attrs
+          post :create, params: { bookstore: @attrs }
           response.should be_forbidden
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved bookstore as @bookstore' do
-          post :create, bookstore: @invalid_attrs
+          post :create, params: { bookstore: @invalid_attrs }
           assigns(:bookstore).should be_nil
         end
 
         it 'should be forbidden' do
-          post :create, bookstore: @invalid_attrs
+          post :create, params: { bookstore: @invalid_attrs }
           response.should be_forbidden
         end
       end
@@ -238,24 +238,24 @@ describe BookstoresController do
 
       describe 'with valid params' do
         it 'assigns a newly created bookstore as @bookstore' do
-          post :create, bookstore: @attrs
+          post :create, params: { bookstore: @attrs }
           assigns(:bookstore).should be_nil
         end
 
         it 'should be forbidden' do
-          post :create, bookstore: @attrs
+          post :create, params: { bookstore: @attrs }
           response.should be_forbidden
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved bookstore as @bookstore' do
-          post :create, bookstore: @invalid_attrs
+          post :create, params: { bookstore: @invalid_attrs }
           assigns(:bookstore).should be_nil
         end
 
         it 'should be forbidden' do
-          post :create, bookstore: @invalid_attrs
+          post :create, params: { bookstore: @invalid_attrs }
           response.should be_forbidden
         end
       end
@@ -264,24 +264,24 @@ describe BookstoresController do
     describe 'When not logged in' do
       describe 'with valid params' do
         it 'assigns a newly created bookstore as @bookstore' do
-          post :create, bookstore: @attrs
+          post :create, params: { bookstore: @attrs }
           assigns(:bookstore).should be_nil
         end
 
         it 'should be forbidden' do
-          post :create, bookstore: @attrs
+          post :create, params: { bookstore: @attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved bookstore as @bookstore' do
-          post :create, bookstore: @invalid_attrs
+          post :create, params: { bookstore: @invalid_attrs }
           assigns(:bookstore).should be_nil
         end
 
         it 'should be forbidden' do
-          post :create, bookstore: @invalid_attrs
+          post :create, params: { bookstore: @invalid_attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
@@ -300,23 +300,23 @@ describe BookstoresController do
 
       describe 'with valid params' do
         it 'updates the requested bookstore' do
-          put :update, id: @bookstore.id, bookstore: @attrs
+          put :update, params: { id: @bookstore.id, bookstore: @attrs }
         end
 
         it 'assigns the requested bookstore as @bookstore' do
-          put :update, id: @bookstore.id, bookstore: @attrs
+          put :update, params: { id: @bookstore.id, bookstore: @attrs }
           assigns(:bookstore).should eq(@bookstore)
         end
 
         it 'moves its position when specified' do
-          put :update, id: @bookstore.id, bookstore: @attrs, move: 'lower'
+          put :update, params: { id: @bookstore.id, bookstore: @attrs, move: 'lower' }
           response.should redirect_to(bookstores_url)
         end
       end
 
       describe 'with invalid params' do
         it 'assigns the requested bookstore as @bookstore' do
-          put :update, id: @bookstore.id, bookstore: @invalid_attrs
+          put :update, params: { id: @bookstore.id, bookstore: @invalid_attrs }
           response.should render_template('edit')
         end
       end
@@ -327,11 +327,11 @@ describe BookstoresController do
 
       describe 'with valid params' do
         it 'updates the requested bookstore' do
-          put :update, id: @bookstore.id, bookstore: @attrs
+          put :update, params: { id: @bookstore.id, bookstore: @attrs }
         end
 
         it 'assigns the requested bookstore as @bookstore' do
-          put :update, id: @bookstore.id, bookstore: @attrs
+          put :update, params: { id: @bookstore.id, bookstore: @attrs }
           assigns(:bookstore).should eq(@bookstore)
           response.should be_forbidden
         end
@@ -339,7 +339,7 @@ describe BookstoresController do
 
       describe 'with invalid params' do
         it 'assigns the requested bookstore as @bookstore' do
-          put :update, id: @bookstore.id, bookstore: @invalid_attrs
+          put :update, params: { id: @bookstore.id, bookstore: @invalid_attrs }
           response.should be_forbidden
         end
       end
@@ -350,11 +350,11 @@ describe BookstoresController do
 
       describe 'with valid params' do
         it 'updates the requested bookstore' do
-          put :update, id: @bookstore.id, bookstore: @attrs
+          put :update, params: { id: @bookstore.id, bookstore: @attrs }
         end
 
         it 'assigns the requested bookstore as @bookstore' do
-          put :update, id: @bookstore.id, bookstore: @attrs
+          put :update, params: { id: @bookstore.id, bookstore: @attrs }
           assigns(:bookstore).should eq(@bookstore)
           response.should be_forbidden
         end
@@ -362,7 +362,7 @@ describe BookstoresController do
 
       describe 'with invalid params' do
         it 'assigns the requested bookstore as @bookstore' do
-          put :update, id: @bookstore.id, bookstore: @invalid_attrs
+          put :update, params: { id: @bookstore.id, bookstore: @invalid_attrs }
           response.should be_forbidden
         end
       end
@@ -371,18 +371,18 @@ describe BookstoresController do
     describe 'When not logged in' do
       describe 'with valid params' do
         it 'updates the requested bookstore' do
-          put :update, id: @bookstore.id, bookstore: @attrs
+          put :update, params: { id: @bookstore.id, bookstore: @attrs }
         end
 
         it 'should be forbidden' do
-          put :update, id: @bookstore.id, bookstore: @attrs
+          put :update, params: { id: @bookstore.id, bookstore: @attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
 
       describe 'with invalid params' do
         it 'assigns the requested bookstore as @bookstore' do
-          put :update, id: @bookstore.id, bookstore: @invalid_attrs
+          put :update, params: { id: @bookstore.id, bookstore: @invalid_attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
@@ -398,11 +398,11 @@ describe BookstoresController do
       login_fixture_admin
 
       it 'destroys the requested bookstore' do
-        delete :destroy, id: @bookstore.id
+        delete :destroy, params: { id: @bookstore.id }
       end
 
       it 'redirects to the bookstores list' do
-        delete :destroy, id: @bookstore.id
+        delete :destroy, params: { id: @bookstore.id }
         response.should redirect_to(bookstores_url)
       end
     end
@@ -411,11 +411,11 @@ describe BookstoresController do
       login_fixture_librarian
 
       it 'destroys the requested bookstore' do
-        delete :destroy, id: @bookstore.id
+        delete :destroy, params: { id: @bookstore.id }
       end
 
       it 'should be forbidden' do
-        delete :destroy, id: @bookstore.id
+        delete :destroy, params: { id: @bookstore.id }
         response.should be_forbidden
       end
     end
@@ -424,22 +424,22 @@ describe BookstoresController do
       login_fixture_user
 
       it 'destroys the requested bookstore' do
-        delete :destroy, id: @bookstore.id
+        delete :destroy, params: { id: @bookstore.id }
       end
 
       it 'should be forbidden' do
-        delete :destroy, id: @bookstore.id
+        delete :destroy, params: { id: @bookstore.id }
         response.should be_forbidden
       end
     end
 
     describe 'When not logged in' do
       it 'destroys the requested bookstore' do
-        delete :destroy, id: @bookstore.id
+        delete :destroy, params: { id: @bookstore.id }
       end
 
       it 'should be forbidden' do
-        delete :destroy, id: @bookstore.id
+        delete :destroy, params: { id: @bookstore.id }
         response.should redirect_to(new_user_session_url)
       end
     end