enju_library 0.2.5 → 0.3.0.beta.2

data/spec/controllers/budget_types_controller_spec.rb

@@ -40,7 +40,7 @@ describe BudgetTypesController do
   describe 'GET show' do
     it 'assigns the requested budget_type as @budget_type' do
       budget_type = BudgetType.create! valid_attributes
-      get :show, id: budget_type.id
+      get :show, params: { id: budget_type.id }
       assigns(:budget_type).should eq(budget_type)
     end
   end
@@ -55,7 +55,7 @@ describe BudgetTypesController do
   describe 'GET edit' do
     it 'assigns the requested budget_type as @budget_type' do
       budget_type = BudgetType.create! valid_attributes
-      get :edit, id: budget_type.id
+      get :edit, params: { id: budget_type.id }
       assigns(:budget_type).should eq(budget_type)
     end
   end
@@ -64,18 +64,18 @@ describe BudgetTypesController do
     describe 'with valid params' do
       it 'creates a new BudgetType' do
         expect do
-          post :create, budget_type: valid_attributes
+          post :create, params: { budget_type: valid_attributes }
         end.to change(BudgetType, :count).by(1)
       end
 
       it 'assigns a newly created budget_type as @budget_type' do
-        post :create, budget_type: valid_attributes
+        post :create, params: { budget_type: valid_attributes }
         assigns(:budget_type).should be_a(BudgetType)
         assigns(:budget_type).should be_persisted
       end
 
       it 'redirects to the created budget_type' do
-        post :create, budget_type: valid_attributes
+        post :create, params: { budget_type: valid_attributes }
         response.should redirect_to(BudgetType.last)
       end
     end
@@ -84,14 +84,14 @@ describe BudgetTypesController do
       it 'assigns a newly created but unsaved budget_type as @budget_type' do
         # Trigger the behavior that occurs when invalid params are submitted
         BudgetType.any_instance.stub(:save).and_return(false)
-        post :create, budget_type: { note: 'test' }
+        post :create, params: { budget_type: { note: 'test' } }
         assigns(:budget_type).should be_a_new(BudgetType)
       end
 
       it "re-renders the 'new' template" do
         # Trigger the behavior that occurs when invalid params are submitted
         BudgetType.any_instance.stub(:save).and_return(false)
-        post :create, budget_type: { note: 'test' }
+        post :create, params: { budget_type: { note: 'test' } }
         # response.should render_template("new")
       end
     end
@@ -106,25 +106,25 @@ describe BudgetTypesController do
         # receives the :update_attributes message with whatever params are
         # submitted in the request.
         BudgetType.any_instance.should_receive(:update_attributes).with('note' => 'test')
-        put :update, id: budget_type.id, budget_type: { note: 'test' }
+        put :update, params: { id: budget_type.id, budget_type: { note: 'test' } }
       end
 
       it 'assigns the requested budget_type as @budget_type' do
         budget_type = BudgetType.create! valid_attributes
-        put :update, id: budget_type.id, budget_type: valid_attributes
+        put :update, params: { id: budget_type.id, budget_type: valid_attributes }
         assigns(:budget_type).should eq(budget_type)
       end
 
       it 'redirects to the budget_type' do
         budget_type = BudgetType.create! valid_attributes
-        put :update, id: budget_type.id, budget_type: valid_attributes
+        put :update, params: { id: budget_type.id, budget_type: valid_attributes }
         response.should redirect_to(budget_type)
       end
 
       it 'moves its position when specified' do
         budget_type = BudgetType.create! valid_attributes
         position = budget_type.position
-        put :update, id: budget_type.id, move: 'higher'
+        put :update, params: { id: budget_type.id, move: 'higher' }
         response.should redirect_to budget_types_url
         budget_type.reload
         budget_type.position.should eq position - 1
@@ -136,7 +136,7 @@ describe BudgetTypesController do
         budget_type = BudgetType.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         BudgetType.any_instance.stub(:save).and_return(false)
-        put :update, id: budget_type.id, budget_type: { note: 'test' }
+        put :update, params: { id: budget_type.id, budget_type: { note: 'test' } }
         assigns(:budget_type).should eq(budget_type)
       end
 
@@ -144,7 +144,7 @@ describe BudgetTypesController do
         budget_type = BudgetType.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         BudgetType.any_instance.stub(:save).and_return(false)
-        put :update, id: budget_type.id, budget_type: { note: 'test' }
+        put :update, params: { id: budget_type.id, budget_type: { note: 'test' } }
         # response.should render_template("edit")
       end
     end
@@ -154,13 +154,13 @@ describe BudgetTypesController do
     it 'destroys the requested budget_type' do
       budget_type = BudgetType.create! valid_attributes
       expect do
-        delete :destroy, id: budget_type.id
+        delete :destroy, params: { id: budget_type.id }
       end.to change(BudgetType, :count).by(-1)
     end
 
     it 'redirects to the budget_types list' do
       budget_type = BudgetType.create! valid_attributes
-      delete :destroy, id: budget_type.id
+      delete :destroy, params: { id: budget_type.id }
       response.should redirect_to(budget_types_url)
     end
   end

data/spec/controllers/libraries_controller_spec.rb

@@ -42,7 +42,7 @@ describe LibrariesController do
       end
 
       it 'should get index with query' do
-        get :index, query: 'kamata'
+        get :index, params: { query: 'kamata' }
         response.should be_success
         assigns(:libraries).include?(Library.friendly.find('kamata')).should be_truthy
       end
@@ -54,7 +54,7 @@ describe LibrariesController do
       login_fixture_admin
 
       it 'assigns the requested library as @library' do
-        get :show, id: 1
+        get :show, params: { id: 1 }
         assigns(:library).should eq(libraries(:library_00001))
       end
     end
@@ -63,7 +63,7 @@ describe LibrariesController do
       login_fixture_librarian
 
       it 'assigns the requested library as @library' do
-        get :show, id: 1
+        get :show, params: { id: 1 }
         assigns(:library).should eq(libraries(:library_00001))
       end
     end
@@ -72,14 +72,14 @@ describe LibrariesController do
       login_fixture_user
 
       it 'assigns the requested library as @library' do
-        get :show, id: 1
+        get :show, params: { id: 1 }
         assigns(:library).should eq(libraries(:library_00001))
       end
     end
 
     describe 'When not logged in' do
       it 'assigns the requested library as @library' do
-        get :show, id: 1
+        get :show, params: { id: 1 }
         assigns(:library).should eq(libraries(:library_00001))
       end
     end
@@ -129,7 +129,7 @@ describe LibrariesController do
 
       it 'assigns the requested library as @library' do
         library = FactoryBot.create(:library)
-        get :edit, id: library.id
+        get :edit, params: { id: library.id }
         assigns(:library).should eq(library)
       end
     end
@@ -139,7 +139,7 @@ describe LibrariesController do
 
       it 'assigns the requested library as @library' do
         library = FactoryBot.create(:library)
-        get :edit, id: library.id
+        get :edit, params: { id: library.id }
         response.should be_forbidden
       end
     end
@@ -149,7 +149,7 @@ describe LibrariesController do
 
       it 'assigns the requested library as @library' do
         library = FactoryBot.create(:library)
-        get :edit, id: library.id
+        get :edit, params: { id: library.id }
         response.should be_forbidden
       end
     end
@@ -157,7 +157,7 @@ describe LibrariesController do
     describe 'When not logged in' do
       it 'should not assign the requested library as @library' do
         library = FactoryBot.create(:library)
-        get :edit, id: library.id
+        get :edit, params: { id: library.id }
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -174,29 +174,29 @@ describe LibrariesController do
 
       describe 'with valid params' do
         it 'assigns a newly created library as @library' do
-          post :create, library: @attrs
+          post :create, params: { library: @attrs }
           assigns(:library).should be_valid
         end
 
         it 'redirects to the created patron' do
-          post :create, library: @attrs
+          post :create, params: { library: @attrs }
           response.should redirect_to(assigns(:library))
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved library as @library' do
-          post :create, library: @invalid_attrs
+          post :create, params: { library: @invalid_attrs }
           assigns(:library).should_not be_valid
         end
 
         it 'should be successful' do
-          post :create, library: @invalid_attrs
+          post :create, params: { library: @invalid_attrs }
           response.should be_success
         end
 
         it 'should not create library without short_display_name' do
-          post :create, library: { name: 'fujisawa', short_display_name: '' }
+          post :create, params: { library: { name: 'fujisawa', short_display_name: '' } }
           response.should be_success
         end
       end
@@ -207,24 +207,24 @@ describe LibrariesController do
 
       describe 'with valid params' do
         it 'assigns a newly created library as @library' do
-          post :create, library: @attrs
+          post :create, params: { library: @attrs }
           assigns(:library).should be_nil
         end
 
         it 'should be forbidden' do
-          post :create, library: @attrs
+          post :create, params: { library: @attrs }
           response.should be_forbidden
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved library as @library' do
-          post :create, library: @invalid_attrs
+          post :create, params: { library: @invalid_attrs }
           assigns(:library).should be_nil
         end
 
         it 'should be forbidden' do
-          post :create, library: @invalid_attrs
+          post :create, params: { library: @invalid_attrs }
           response.should be_forbidden
         end
       end
@@ -235,24 +235,24 @@ describe LibrariesController do
 
       describe 'with valid params' do
         it 'assigns a newly created library as @library' do
-          post :create, library: @attrs
+          post :create, params: { library: @attrs }
           assigns(:library).should be_nil
         end
 
         it 'should be forbidden' do
-          post :create, library: @attrs
+          post :create, params: { library: @attrs }
           response.should be_forbidden
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved library as @library' do
-          post :create, library: @invalid_attrs
+          post :create, params: { library: @invalid_attrs }
           assigns(:library).should be_nil
         end
 
         it 'should be forbidden' do
-          post :create, library: @invalid_attrs
+          post :create, params: { library: @invalid_attrs }
           response.should be_forbidden
         end
       end
@@ -261,24 +261,24 @@ describe LibrariesController do
     describe 'When not logged in' do
       describe 'with valid params' do
         it 'assigns a newly created library as @library' do
-          post :create, library: @attrs
+          post :create, params: { library: @attrs }
           assigns(:library).should be_nil
         end
 
         it 'should be redirected to new session url' do
-          post :create, library: @attrs
+          post :create, params: { library: @attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved library as @library' do
-          post :create, library: @invalid_attrs
+          post :create, params: { library: @invalid_attrs }
           assigns(:library).should be_nil
         end
 
         it 'should be redirected to new session url' do
-          post :create, library: @invalid_attrs
+          post :create, params: { library: @invalid_attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
@@ -297,23 +297,23 @@ describe LibrariesController do
 
       describe 'with valid params' do
         it 'updates the requested library' do
-          put :update, id: @library.id, library: @attrs
+          put :update, params: { id: @library.id, library: @attrs }
         end
 
         it 'assigns the requested library as @library' do
-          put :update, id: @library.id, library: @attrs
+          put :update, params: { id: @library.id, library: @attrs }
           assigns(:library).should eq(@library)
         end
 
         it 'moves its position when specified' do
-          put :update, id: @library.id, library: @attrs, move: 'lower'
+          put :update, params: { id: @library.id, library: @attrs, move: 'lower' }
           response.should redirect_to(libraries_url)
         end
       end
 
       describe 'with invalid params' do
         it 'assigns the requested library as @library' do
-          put :update, id: @library.id, library: @invalid_attrs
+          put :update, params: { id: @library.id, library: @invalid_attrs }
           response.should render_template('edit')
         end
       end
@@ -324,18 +324,18 @@ describe LibrariesController do
 
       describe 'with valid params' do
         it 'updates the requested library' do
-          put :update, id: @library.id, library: @attrs
+          put :update, params: { id: @library.id, library: @attrs }
         end
 
         it 'should be forbidden' do
-          put :update, id: @library.id, library: @attrs
+          put :update, params: { id: @library.id, library: @attrs }
           response.should be_forbidden
         end
       end
 
       describe 'with invalid params' do
         it 'should be forbidden' do
-          put :update, id: @library.id, library: @invalid_attrs
+          put :update, params: { id: @library.id, library: @invalid_attrs }
           response.should be_forbidden
         end
       end
@@ -346,18 +346,18 @@ describe LibrariesController do
 
       describe 'with valid params' do
         it 'updates the requested library' do
-          put :update, id: @library.id, library: @attrs
+          put :update, params: { id: @library.id, library: @attrs }
         end
 
         it 'should be forbidden' do
-          put :update, id: @library.id, library: @attrs
+          put :update, params: { id: @library.id, library: @attrs }
           response.should be_forbidden
         end
       end
 
       describe 'with invalid params' do
         it 'should be forbidden' do
-          put :update, id: @library.id, library: @invalid_attrs
+          put :update, params: { id: @library.id, library: @invalid_attrs }
           response.should be_forbidden
         end
       end
@@ -366,18 +366,18 @@ describe LibrariesController do
     describe 'When not logged in' do
       describe 'with valid params' do
         it 'updates the requested library' do
-          put :update, id: @library.id, library: @attrs
+          put :update, params: { id: @library.id, library: @attrs }
         end
 
         it 'should be forbidden' do
-          put :update, id: @library.id, library: @attrs
+          put :update, params: { id: @library.id, library: @attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
 
       describe 'with invalid params' do
         it 'assigns the requested library as @library' do
-          put :update, id: @library.id, library: @invalid_attrs
+          put :update, params: { id: @library.id, library: @invalid_attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
@@ -394,21 +394,21 @@ describe LibrariesController do
         login_fixture_admin
 
         it 'destroys the requested library' do
-          delete :destroy, id: @library.id
+          delete :destroy, params: { id: @library.id }
         end
 
         it 'should be forbidden' do
-          delete :destroy, id: @library.id
+          delete :destroy, params: { id: @library.id }
           response.should be_forbidden
         end
 
         it 'should not destroy library_id 1' do
-          delete :destroy, id: 'web'
+          delete :destroy, params: { id: 'web' }
           response.should be_forbidden
         end
 
         it 'should not destroy library that contains shelves' do
-          delete :destroy, id: 'kamata'
+          delete :destroy, params: { id: 'kamata' }
           response.should be_forbidden
         end
       end
@@ -417,11 +417,11 @@ describe LibrariesController do
         login_fixture_librarian
 
         it 'destroys the requested library' do
-          delete :destroy, id: @library.id
+          delete :destroy, params: { id: @library.id }
         end
 
         it 'should be forbidden' do
-          delete :destroy, id: @library.id
+          delete :destroy, params: { id: @library.id }
           response.should be_forbidden
         end
       end
@@ -430,22 +430,22 @@ describe LibrariesController do
         login_fixture_user
 
         it 'destroys the requested library' do
-          delete :destroy, id: @library.id
+          delete :destroy, params: { id: @library.id }
         end
 
         it 'should be forbidden' do
-          delete :destroy, id: @library.id
+          delete :destroy, params: { id: @library.id }
           response.should be_forbidden
         end
       end
 
       describe 'When not logged in' do
         it 'destroys the requested library' do
-          delete :destroy, id: @library.id
+          delete :destroy, params: { id: @library.id }
         end
 
         it 'should be forbidden' do
-          delete :destroy, id: @library.id
+          delete :destroy, params: { id: @library.id }
           response.should redirect_to(new_user_session_url)
         end
       end
@@ -461,11 +461,11 @@ describe LibrariesController do
         login_fixture_admin
 
         it 'destroys the requested library' do
-          delete :destroy, id: @library.id
+          delete :destroy, params: { id: @library.id }
         end
 
         it 'redirects to the libraries list' do
-          delete :destroy, id: @library.id
+          delete :destroy, params: { id: @library.id }
           response.should redirect_to(libraries_url)
         end
       end
@@ -474,11 +474,11 @@ describe LibrariesController do
         login_fixture_librarian
 
         it 'destroys the requested library' do
-          delete :destroy, id: @library.id
+          delete :destroy, params: { id: @library.id }
         end
 
         it 'should be forbidden' do
-          delete :destroy, id: @library.id
+          delete :destroy, params: { id: @library.id }
           response.should be_forbidden
         end
       end
@@ -487,22 +487,22 @@ describe LibrariesController do
         login_fixture_user
 
         it 'destroys the requested library' do
-          delete :destroy, id: @library.id
+          delete :destroy, params: { id: @library.id }
         end
 
         it 'should be forbidden' do
-          delete :destroy, id: @library.id
+          delete :destroy, params: { id: @library.id }
           response.should be_forbidden
         end
       end
 
       describe 'When not logged in' do
         it 'destroys the requested library' do
-          delete :destroy, id: @library.id
+          delete :destroy, params: { id: @library.id }
         end
 
         it 'should be forbidden' do
-          delete :destroy, id: @library.id
+          delete :destroy, params: { id: @library.id }
           response.should redirect_to(new_user_session_url)
         end
       end