enju_library 0.2.5 → 0.3.0.beta.2

data/app/models/user_import_file_transition.rb

@@ -3,7 +3,6 @@ class UserImportFileTransition < ActiveRecord::Base
 
   
   belongs_to :user_import_file, inverse_of: :user_import_file_transitions
-  #attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

data/app/models/user_import_result.rb

@@ -3,7 +3,7 @@ class UserImportResult < ActiveRecord::Base
   scope :failed, -> { where(user_id: nil) }
 
   belongs_to :user_import_file
-  belongs_to :user
+  belongs_to :user, optional: true
 end
 
 # == Schema Information

data/db/migrate/059_create_libraries.rb

@@ -1,4 +1,4 @@
-class CreateLibraries < ActiveRecord::Migration
+class CreateLibraries < ActiveRecord::Migration[4.2]
   def change
     create_table :libraries do |t|
       t.string :name, index: true, null: false

data/db/migrate/069_create_shelves.rb

@@ -1,4 +1,4 @@
-class CreateShelves < ActiveRecord::Migration
+class CreateShelves < ActiveRecord::Migration[4.2]
   def change
     create_table :shelves do |t|
       t.string :name, null: false

data/db/migrate/077_create_user_groups.rb

@@ -1,7 +1,7 @@
-class CreateUserGroups < ActiveRecord::Migration
+class CreateUserGroups < ActiveRecord::Migration[4.2]
   def change
     create_table :user_groups do |t|
-      t.string :name, :not_null => true
+      t.string :name, not_null: true
       t.text :display_name
       t.text :note
       t.integer :position

data/db/migrate/080_create_library_groups.rb

@@ -1,4 +1,4 @@
-class CreateLibraryGroups < ActiveRecord::Migration
+class CreateLibraryGroups < ActiveRecord::Migration[4.2]
   def change
     create_table :library_groups do |t|
       t.string :name, null: false

data/db/migrate/120_create_baskets.rb

@@ -1,4 +1,4 @@
-class CreateBaskets < ActiveRecord::Migration
+class CreateBaskets < ActiveRecord::Migration[4.2]
   def change
     create_table :baskets do |t|
       t.references :user, index: true

data/db/migrate/124_create_bookstores.rb

@@ -1,7 +1,7 @@
-class CreateBookstores < ActiveRecord::Migration
+class CreateBookstores < ActiveRecord::Migration[4.2]
   def change
     create_table :bookstores do |t|
-      t.text :name, :null => false
+      t.text :name, null: false
       t.string :zip_code
       t.text :address
       t.text :note

data/db/migrate/130_create_request_status_types.rb

@@ -1,7 +1,7 @@
-class CreateRequestStatusTypes < ActiveRecord::Migration
+class CreateRequestStatusTypes < ActiveRecord::Migration[4.2]
   def change
     create_table :request_status_types do |t|
-      t.string :name, :null => false
+      t.string :name, null: false
       t.text :display_name
       t.text :note
       t.integer :position

data/db/migrate/131_create_request_types.rb

@@ -1,7 +1,7 @@
-class CreateRequestTypes < ActiveRecord::Migration
+class CreateRequestTypes < ActiveRecord::Migration[4.2]
   def change
     create_table :request_types do |t|
-      t.string :name, :null => false
+      t.string :name, null: false
       t.text :display_name
       t.text :note
       t.integer :position

data/db/migrate/20081006090811_create_subscriptions.rb

@@ -1,4 +1,4 @@
-class CreateSubscriptions < ActiveRecord::Migration
+class CreateSubscriptions < ActiveRecord::Migration[4.2]
   def change
     create_table :subscriptions do |t|
       t.text :title, null: false

data/db/migrate/20081006093246_create_subscribes.rb

@@ -1,4 +1,4 @@
-class CreateSubscribes < ActiveRecord::Migration
+class CreateSubscribes < ActiveRecord::Migration[4.2]
   def change
     create_table :subscribes do |t|
       t.references :subscription, index: true, null: false

data/db/migrate/20081023092436_create_search_engines.rb

@@ -1,12 +1,12 @@
-class CreateSearchEngines < ActiveRecord::Migration
+class CreateSearchEngines < ActiveRecord::Migration[4.2]
   def change
     create_table :search_engines do |t|
-      t.string :name, :null => false
+      t.string :name, null: false
       t.text :display_name
-      t.string :url, :null => false
-      t.text :base_url, :null => false
-      t.text :http_method, :null => false
-      t.text :query_param, :null => false
+      t.string :url, null: false
+      t.text :base_url, null: false
+      t.text :http_method, null: false
+      t.text :query_param, null: false
       t.text :additional_param
       t.text :note
       t.integer :position

data/db/migrate/20100211105551_add_admin_networks_to_library_group.rb

@@ -1,4 +1,4 @@
-class AddAdminNetworksToLibraryGroup < ActiveRecord::Migration
+class AddAdminNetworksToLibraryGroup < ActiveRecord::Migration[4.2]
   def self.up
     add_column :library_groups, :admin_networks, :text
   end

data/db/migrate/20100314190054_add_opening_hour_to_library.rb

@@ -1,4 +1,4 @@
-class AddOpeningHourToLibrary < ActiveRecord::Migration
+class AddOpeningHourToLibrary < ActiveRecord::Migration[4.2]
   def self.up
     add_column :libraries, :opening_hour, :text
   end

data/db/migrate/20110222073537_add_url_to_library_group.rb

@@ -1,6 +1,6 @@
-class AddUrlToLibraryGroup < ActiveRecord::Migration
+class AddUrlToLibraryGroup < ActiveRecord::Migration[4.2]
   def self.up
-    add_column :library_groups, :url, :string, :default => 'http://localhost:3000/'
+    add_column :library_groups, :url, :string, default: 'http://localhost:3000/'
   end
 
   def self.down

data/db/migrate/20110318183304_add_valid_period_for_new_user_to_user_group.rb

@@ -1,6 +1,6 @@
-class AddValidPeriodForNewUserToUserGroup < ActiveRecord::Migration
+class AddValidPeriodForNewUserToUserGroup < ActiveRecord::Migration[4.2]
   def self.up
-    add_column :user_groups, :valid_period_for_new_user, :integer, :default => 0, :null => false
+    add_column :user_groups, :valid_period_for_new_user, :integer, default: 0, null: false
     add_column :user_groups, :expired_at, :timestamp
   end
 

data/db/migrate/20120105074911_add_isil_to_library.rb

@@ -1,4 +1,4 @@
-class AddIsilToLibrary < ActiveRecord::Migration
+class AddIsilToLibrary < ActiveRecord::Migration[4.2]
   def change
     add_column :libraries, :isil, :string
   end

data/db/migrate/20120129014038_create_budget_types.rb

@@ -1,4 +1,4 @@
-class CreateBudgetTypes < ActiveRecord::Migration
+class CreateBudgetTypes < ActiveRecord::Migration[4.2]
   def change
     create_table :budget_types do |t|
       t.string :name

data/db/migrate/20120319173203_create_accepts.rb

@@ -1,4 +1,4 @@
-class CreateAccepts < ActiveRecord::Migration
+class CreateAccepts < ActiveRecord::Migration[4.2]
   def change
     create_table :accepts do |t|
       t.references :basket, index: true

data/db/migrate/20120510140958_add_closed_to_shelf.rb

@@ -1,5 +1,5 @@
-class AddClosedToShelf < ActiveRecord::Migration
+class AddClosedToShelf < ActiveRecord::Migration[4.2]
   def change
-    add_column :shelves, :closed, :boolean, :default => false, :null => false
+    add_column :shelves, :closed, :boolean, default: false, null: false
   end
 end

data/db/migrate/20130412083556_add_latitude_and_longitude_to_library.rb

@@ -1,4 +1,4 @@
-class AddLatitudeAndLongitudeToLibrary < ActiveRecord::Migration
+class AddLatitudeAndLongitudeToLibrary < ActiveRecord::Migration[4.2]
   def change
     add_column :libraries, :latitude, :float
     add_column :libraries, :longitude, :float

data/db/migrate/20140110122216_create_user_import_files.rb

@@ -1,4 +1,4 @@
-class CreateUserImportFiles < ActiveRecord::Migration
+class CreateUserImportFiles < ActiveRecord::Migration[4.2]
   def change
     create_table :user_import_files do |t|
       t.references :user, index: true

data/db/migrate/20140110131010_create_user_import_results.rb

@@ -1,4 +1,4 @@
-class CreateUserImportResults < ActiveRecord::Migration
+class CreateUserImportResults < ActiveRecord::Migration[4.2]
   def change
     create_table :user_import_results do |t|
       t.references :user_import_file, index: true

data/db/migrate/20140524074813_create_user_import_file_transitions.rb

@@ -1,4 +1,4 @@
-class CreateUserImportFileTransitions < ActiveRecord::Migration
+class CreateUserImportFileTransitions < ActiveRecord::Migration[4.2]
   def change
     create_table :user_import_file_transitions do |t|
       t.string :to_state

data/db/migrate/20140628072217_add_user_encoding_to_user_import_file.rb

@@ -1,4 +1,4 @@
-class AddUserEncodingToUserImportFile < ActiveRecord::Migration
+class AddUserEncodingToUserImportFile < ActiveRecord::Migration[4.2]
   def change
     add_column :user_import_files, :user_encoding, :string
   end

data/db/migrate/20140709113413_create_user_export_files.rb

@@ -1,4 +1,4 @@
-class CreateUserExportFiles < ActiveRecord::Migration
+class CreateUserExportFiles < ActiveRecord::Migration[4.2]
   def change
     create_table :user_export_files do |t|
       t.references :user, index: true

data/db/migrate/20140709113905_create_user_export_file_transitions.rb

@@ -1,4 +1,4 @@
-class CreateUserExportFileTransitions < ActiveRecord::Migration
+class CreateUserExportFileTransitions < ActiveRecord::Migration[4.2]
   def change
     create_table :user_export_file_transitions do |t|
       t.string :to_state

data/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb

@@ -1,4 +1,4 @@
-class AddDefaultLibraryIdToUserImportFile < ActiveRecord::Migration
+class AddDefaultLibraryIdToUserImportFile < ActiveRecord::Migration[4.2]
   def change
     add_reference :user_import_files, :default_library
   end

data/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb

@@ -1,4 +1,4 @@
-class AddDefaultUserGroupIdToUserImportFile < ActiveRecord::Migration
+class AddDefaultUserGroupIdToUserImportFile < ActiveRecord::Migration[4.2]
   def change
     add_reference :user_import_files, :default_user_group
   end

data/db/migrate/20140821151023_create_colors.rb

@@ -1,4 +1,4 @@
-class CreateColors < ActiveRecord::Migration
+class CreateColors < ActiveRecord::Migration[4.2]
   def change
     create_table :colors do |t|
       t.references :library_group, index: true

data/db/migrate/20150221063719_add_settings_to_library_group.rb

@@ -1,4 +1,4 @@
-class AddSettingsToLibraryGroup < ActiveRecord::Migration
+class AddSettingsToLibraryGroup < ActiveRecord::Migration[4.2]
   def change
     add_column :library_groups, :settings, :text
   end

data/db/migrate/20150506105356_add_error_message_to_user_import_result.rb

@@ -1,4 +1,4 @@
-class AddErrorMessageToUserImportResult < ActiveRecord::Migration
+class AddErrorMessageToUserImportResult < ActiveRecord::Migration[4.2]
   def change
     add_column :user_import_results, :error_message, :text
   end

data/db/migrate/20150924115059_create_withdraws.rb

@@ -1,4 +1,4 @@
-class CreateWithdraws < ActiveRecord::Migration
+class CreateWithdraws < ActiveRecord::Migration[4.2]
   def change
     create_table :withdraws do |t|
       t.references :basket, index: true

data/db/migrate/20151213070943_add_translation_table_to_library_group.rb

@@ -1,5 +1,5 @@
 # This migration comes from enju_library_engine (originally 20151213070943)
-class AddTranslationTableToLibraryGroup < ActiveRecord::Migration
+class AddTranslationTableToLibraryGroup < ActiveRecord::Migration[4.2]
   def up
     if defined?(Globalize)
       LibraryGroup.create_translation_table!({
@@ -8,19 +8,11 @@ class AddTranslationTableToLibraryGroup < ActiveRecord::Migration
         migrate_data: true
       })
     end
-
-    if defined?(AwesomeHstoreTranslate)
-      add_column :library_groups, :login_banner, :hstore
-    end
   end
 
   def down
     if defined?(Globalize)
       LibraryGroup.drop_translation_table! migrate_data: true
     end
-
-    if defined?(AwesomeHstoreTranslate)
-      remove_column :library_groups, :login_banner
-    end
   end
 end

data/db/migrate/20151213072705_add_footer_banner_to_library_group.rb

@@ -1,5 +1,5 @@
 # This migration comes from enju_library_engine (originally 20151213072705)
-class AddFooterBannerToLibraryGroup < ActiveRecord::Migration
+class AddFooterBannerToLibraryGroup < ActiveRecord::Migration[4.2]
   def up
     if defined?(Globalize)
       LibraryGroup.add_translation_fields! footer_banner: :text

data/db/migrate/20160610093229_add_html_snippet_to_library_group.rb

@@ -1,4 +1,4 @@
-class AddHtmlSnippetToLibraryGroup < ActiveRecord::Migration
+class AddHtmlSnippetToLibraryGroup < ActiveRecord::Migration[4.2]
   def change
     add_column :library_groups, :html_snippet, :text
   end

data/db/migrate/20160627232219_add_most_recent_to_user_import_file_transitions.rb

@@ -1,4 +1,4 @@
-class AddMostRecentToUserImportFileTransitions < ActiveRecord::Migration
+class AddMostRecentToUserImportFileTransitions < ActiveRecord::Migration[4.2]
   def up
     add_column :user_import_file_transitions, :most_recent, :boolean, null: true
   end

data/db/migrate/20160627232316_add_most_recent_to_user_export_file_transitions.rb

@@ -1,4 +1,4 @@
-class AddMostRecentToUserExportFileTransitions < ActiveRecord::Migration
+class AddMostRecentToUserExportFileTransitions < ActiveRecord::Migration[4.2]
   def up
     add_column :user_export_file_transitions, :most_recent, :boolean, null: true
   end

data/db/migrate/20160813191647_add_max_number_of_results_to_library_group.rb

@@ -1,4 +1,4 @@
-class AddMaxNumberOfResultsToLibraryGroup < ActiveRecord::Migration
+class AddMaxNumberOfResultsToLibraryGroup < ActiveRecord::Migration[4.2]
   def change
     add_column :library_groups, :max_number_of_results, :integer, default: 500
   end

data/db/migrate/20160813191733_add_family_name_first_to_library_group.rb

@@ -1,4 +1,4 @@
-class AddFamilyNameFirstToLibraryGroup < ActiveRecord::Migration
+class AddFamilyNameFirstToLibraryGroup < ActiveRecord::Migration[4.2]
   def change
     add_column :library_groups, :family_name_first, :boolean, default: true
   end

data/db/migrate/20160813192542_add_pub_year_facet_range_interval_to_library_group.rb

@@ -1,4 +1,4 @@
-class AddPubYearFacetRangeIntervalToLibraryGroup < ActiveRecord::Migration
+class AddPubYearFacetRangeIntervalToLibraryGroup < ActiveRecord::Migration[4.2]
   def change
     add_column :library_groups, :pub_year_facet_range_interval, :integer, default: 10
   end

data/db/migrate/20160813203039_add_user_id_to_library_group.rb

@@ -1,4 +1,4 @@
-class AddUserIdToLibraryGroup < ActiveRecord::Migration
+class AddUserIdToLibraryGroup < ActiveRecord::Migration[4.2]
   def change
     add_reference :library_groups, :user, index: true, foreign_key: true
   end

data/db/migrate/20170305064014_add_csv_charset_conversion_to_library_group.rb

@@ -1,4 +1,4 @@
-class AddCsvCharsetConversionToLibraryGroup < ActiveRecord::Migration
+class AddCsvCharsetConversionToLibraryGroup < ActiveRecord::Migration[4.2]
   def change
     add_column :library_groups, :csv_charset_conversion, :boolean, null: false, default: false
   end

data/db/migrate/20171014084528_add_header_logo_to_library_group.rb

@@ -1,4 +1,4 @@
-class AddHeaderLogoToLibraryGroup < ActiveRecord::Migration
+class AddHeaderLogoToLibraryGroup < ActiveRecord::Migration[4.2]
   def change
     add_attachment :library_groups, :header_logo
   end

data/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb

@@ -1,4 +1,4 @@
-class RenameLoginBannerToOldLoginBanner < ActiveRecord::Migration
+class RenameLoginBannerToOldLoginBanner < ActiveRecord::Migration[4.2]
   def change
     rename_column :library_groups, :login_banner, :old_login_banner
   end

data/db/migrate/20171126135238_add_foreign_key_to_library_group_id_on_library.rb

@@ -1,4 +1,4 @@
-class AddForeignKeyToLibraryGroupIdOnLibrary < ActiveRecord::Migration
+class AddForeignKeyToLibraryGroupIdOnLibrary < ActiveRecord::Migration[4.2]
   def change
     add_foreign_key :libraries, :library_groups, null: false
   end

data/db/migrate/20180102162311_add_header_logo_meta_to_library_group.rb

@@ -1,4 +1,4 @@
-class AddHeaderLogoMetaToLibraryGroup < ActiveRecord::Migration
+class AddHeaderLogoMetaToLibraryGroup < ActiveRecord::Migration[4.2]
   def change
     add_column :library_groups, :header_logo_meta, :text
   end

data/db/migrate/20180107160726_add_constraints_to_most_recent_for_user_import_file_transitions.rb

@@ -1,4 +1,4 @@
-class AddConstraintsToMostRecentForUserImportFileTransitions < ActiveRecord::Migration
+class AddConstraintsToMostRecentForUserImportFileTransitions < ActiveRecord::Migration[4.2]
   disable_ddl_transaction!
 
   def up

data/db/migrate/20180107160740_add_constraints_to_most_recent_for_user_export_file_transitions.rb

@@ -1,4 +1,4 @@
-class AddConstraintsToMostRecentForUserExportFileTransitions < ActiveRecord::Migration
+class AddConstraintsToMostRecentForUserExportFileTransitions < ActiveRecord::Migration[4.2]
   disable_ddl_transaction!
 
   def up

data/lib/enju_library/version.rb

@@ -1,3 +1,3 @@
 module EnjuLibrary
-  VERSION = "0.2.5"
+  VERSION = "0.3.0.beta.2"
 end

data/spec/controllers/accepts_controller_spec.rb

@@ -21,7 +21,7 @@ describe AcceptsController do
 
       describe 'When basket_id is specified' do
         it 'assigns all accepts as @accepts' do
-          get :index, basket_id: 10
+          get :index, params: { basket_id: 10 }
           assigns(:accepts).should eq baskets(:basket_00010).accepts.order('accepts.created_at DESC').page(1)
           response.should be_success
         end
@@ -39,7 +39,7 @@ describe AcceptsController do
 
       describe 'When basket_id is specified' do
         it 'assigns all accepts as @accepts' do
-          get :index, basket_id: 9
+          get :index, params: { basket_id: 9 }
           assigns(:accepts).should eq baskets(:basket_00009).accepts.order('accepts.created_at DESC').page(1)
           response.should be_success
         end
@@ -63,7 +63,7 @@ describe AcceptsController do
 
       it 'assigns the requested accept as @accept' do
         accept = FactoryBot.create(:accept)
-        get :show, id: accept.id
+        get :show, params: { id: accept.id }
         assigns(:accept).should eq(accept)
       end
     end
@@ -73,7 +73,7 @@ describe AcceptsController do
 
       it 'assigns the requested accept as @accept' do
         accept = FactoryBot.create(:accept)
-        get :show, id: accept.id
+        get :show, params: { id: accept.id }
         assigns(:accept).should eq(accept)
       end
     end
@@ -83,7 +83,7 @@ describe AcceptsController do
 
       it 'assigns the requested accept as @accept' do
         accept = FactoryBot.create(:accept)
-        get :show, id: accept.id
+        get :show, params: { id: accept.id }
         assigns(:accept).should eq(accept)
         response.should be_forbidden
       end
@@ -92,7 +92,7 @@ describe AcceptsController do
     describe 'When not logged in' do
       it 'assigns the requested accept as @accept' do
         accept = FactoryBot.create(:accept)
-        get :show, id: accept.id
+        get :show, params: { id: accept.id }
         assigns(:accept).should eq(accept)
         response.should redirect_to new_user_session_url
       end
@@ -148,18 +148,18 @@ describe AcceptsController do
 
       describe 'with valid params' do
         it 'assigns a newly created accept as @accept' do
-          post :create, accept: @attrs
+          post :create, params: { accept: @attrs }
           assigns(:accept).should be_nil
         end
 
         it 'should not create a new accept without basket_id' do
-          post :create, accept: @attrs
+          post :create, params: { accept: @attrs }
           response.should be_forbidden
         end
 
         describe 'When basket_id is specified' do
           it 'redirects to the created accept' do
-            post :create, accept: @attrs, basket_id: 9
+            post :create, params: { accept: @attrs, basket_id: 9 }
             response.should redirect_to(accepts_url(basket_id: assigns(:accept).basket.id))
             assigns(:accept).item.circulation_status.name.should eq 'Available On Shelf'
           end
@@ -168,18 +168,18 @@ describe AcceptsController do
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved accept as @accept' do
-          post :create, accept: @invalid_attrs
+          post :create, params: { accept: @invalid_attrs }
           assigns(:accept).should be_nil
         end
 
         it 'should be forbidden' do
-          post :create, accept: @invalid_attrs
+          post :create, params: { accept: @invalid_attrs }
           response.should be_forbidden
         end
       end
 
       it 'should not create accept without item_id' do
-        post :create, accept: { item_identifier: nil }, basket_id: 9
+        post :create, params: { accept: { item_identifier: nil }, basket_id: 9 }
         assigns(:accept).should_not be_valid
         response.should be_success
       end
@@ -190,12 +190,12 @@ describe AcceptsController do
 
       describe 'with valid params' do
         it 'assigns a newly created accept as @accept' do
-          post :create, accept: @attrs
+          post :create, params: { accept: @attrs }
           assigns(:accept).should be_nil
         end
 
         it 'should not create a new accept without basket_id' do
-          post :create, accept: @attrs
+          post :create, params: { accept: @attrs }
           response.should be_forbidden
         end
       end
@@ -206,12 +206,12 @@ describe AcceptsController do
 
       describe 'with valid params' do
         it 'assigns a newly created accept as @accept' do
-          post :create, accept: @attrs
+          post :create, params: { accept: @attrs }
           assigns(:accept).should be_nil
         end
 
         it 'should be forbidden' do
-          post :create, accept: @attrs
+          post :create, params: { accept: @attrs }
           response.should be_forbidden
         end
       end
@@ -225,11 +225,11 @@ describe AcceptsController do
 
       describe 'with valid params' do
         it 'assigns a newly created accept as @accept' do
-          post :create, accept: @attrs
+          post :create, params: { accept: @attrs }
         end
 
         it 'should redirect to new session url' do
-          post :create, accept: @attrs
+          post :create, params: { accept: @attrs }
           response.should redirect_to new_user_session_url
         end
       end
@@ -245,11 +245,11 @@ describe AcceptsController do
       login_fixture_admin
 
       it 'destroys the requested accept' do
-        delete :destroy, id: @accept.id
+        delete :destroy, params: { id: @accept.id }
       end
 
       it 'redirects to the accepts list' do
-        delete :destroy, id: @accept.id
+        delete :destroy, params: { id: @accept.id }
         response.should redirect_to(accepts_url)
       end
     end
@@ -258,11 +258,11 @@ describe AcceptsController do
       login_fixture_librarian
 
       it 'destroys the requested accept' do
-        delete :destroy, id: @accept.id
+        delete :destroy, params: { id: @accept.id }
       end
 
       it 'redirects to the accepts list' do
-        delete :destroy, id: @accept.id
+        delete :destroy, params: { id: @accept.id }
         response.should redirect_to(accepts_url)
       end
     end
@@ -271,22 +271,22 @@ describe AcceptsController do
       login_fixture_user
 
       it 'destroys the requested accept' do
-        delete :destroy, id: @accept.id
+        delete :destroy, params: { id: @accept.id }
       end
 
       it 'should be forbidden' do
-        delete :destroy, id: @accept.id
+        delete :destroy, params: { id: @accept.id }
         response.should be_forbidden
       end
     end
 
     describe 'When not logged in' do
       it 'destroys the requested accept' do
-        delete :destroy, id: @accept.id
+        delete :destroy, params: { id: @accept.id }
       end
 
       it 'should be forbidden' do
-        delete :destroy, id: @accept.id
+        delete :destroy, params: { id: @accept.id }
         response.should redirect_to(new_user_session_url)
       end
     end