enju_circulation 0.2.5 → 0.3.0.beta.1

data/db/migrate/20090321130448_add_completed_at_to_user_checkout_stat.rb

@@ -1,4 +1,4 @@
-class AddCompletedAtToUserCheckoutStat < ActiveRecord::Migration
+class AddCompletedAtToUserCheckoutStat < ActiveRecord::Migration[4.2]
   def self.up
     add_column :user_checkout_stats, :started_at, :datetime
     add_column :user_checkout_stats, :completed_at, :datetime

data/db/migrate/20090831220301_create_lending_policies.rb

@@ -1,4 +1,4 @@
-class CreateLendingPolicies < ActiveRecord::Migration
+class CreateLendingPolicies < ActiveRecord::Migration[4.2]
   def self.up
     create_table :lending_policies do |t|
       t.references :item, index: false, foreign_key: true, null: false
@@ -12,7 +12,7 @@ class CreateLendingPolicies < ActiveRecord::Migration
 
       t.timestamps
     end
-    add_index :lending_policies, [:item_id, :user_group_id], :unique => true
+    add_index :lending_policies, [:item_id, :user_group_id], unique: true
   end
 
   def self.down

data/db/migrate/20110301134521_add_expire_date_to_reserve.rb

@@ -1,4 +1,4 @@
-class AddExpireDateToReserve < ActiveRecord::Migration
+class AddExpireDateToReserve < ActiveRecord::Migration[4.2]
   def self.up
     add_column :reserves, :expire_date, :string
   end

data/db/migrate/20110328130826_add_current_checkout_count_to_user_group_has_checkout_type.rb

@@ -1,4 +1,4 @@
-class AddCurrentCheckoutCountToUserGroupHasCheckoutType < ActiveRecord::Migration
+class AddCurrentCheckoutCountToUserGroupHasCheckoutType < ActiveRecord::Migration[4.2]
   def self.up
     add_column :user_group_has_checkout_types, :current_checkout_count, :integer
   end

data/db/migrate/20110621093332_remove_expire_date_from_reserve.rb

@@ -1,4 +1,4 @@
-class RemoveExpireDateFromReserve < ActiveRecord::Migration
+class RemoveExpireDateFromReserve < ActiveRecord::Migration[4.2]
   def self.up
     remove_column :reserves, :expire_date
   end

data/db/migrate/20110627122938_add_number_of_day_to_notify_overdue_to_user_group.rb

@@ -1,8 +1,8 @@
-class AddNumberOfDayToNotifyOverdueToUserGroup < ActiveRecord::Migration
+class AddNumberOfDayToNotifyOverdueToUserGroup < ActiveRecord::Migration[4.2]
   def self.up
-    add_column :user_groups, :number_of_day_to_notify_overdue, :integer, :default => 1, :null => false
-    add_column :user_groups, :number_of_day_to_notify_due_date, :integer, :default => 7, :null => false
-    add_column :user_groups, :number_of_time_to_notify_overdue, :integer, :default => 3, :null => false
+    add_column :user_groups, :number_of_day_to_notify_overdue, :integer, default: 1, null: false
+    add_column :user_groups, :number_of_day_to_notify_due_date, :integer, default: 7, null: false
+    add_column :user_groups, :number_of_time_to_notify_overdue, :integer, default: 3, null: false
   end
 
   def self.down

data/db/migrate/20111129044509_add_pickup_location_to_reserve.rb

@@ -1,4 +1,4 @@
-class AddPickupLocationToReserve < ActiveRecord::Migration
+class AddPickupLocationToReserve < ActiveRecord::Migration[4.2]
   def change
     add_column :reserves, :pickup_location_id, :integer
     add_index :reserves, :pickup_location_id

data/db/migrate/20120424103932_add_librarian_id_to_checked_item.rb

@@ -1,4 +1,4 @@
-class AddLibrarianIdToCheckedItem < ActiveRecord::Migration
+class AddLibrarianIdToCheckedItem < ActiveRecord::Migration[4.2]
   def change
     add_reference :checked_items, :user, index: true, foreign_key: true, column_name: :librarian_id
   end

data/db/migrate/20130303124821_add_retained_at_to_reserve.rb

@@ -1,4 +1,4 @@
-class AddRetainedAtToReserve < ActiveRecord::Migration
+class AddRetainedAtToReserve < ActiveRecord::Migration[4.2]
   def change
     add_column :reserves, :retained_at, :datetime
   end

data/db/migrate/20130304015019_add_postponed_at_to_reserve.rb

@@ -1,4 +1,4 @@
-class AddPostponedAtToReserve < ActiveRecord::Migration
+class AddPostponedAtToReserve < ActiveRecord::Migration[4.2]
   def change
     add_column :reserves, :postponed_at, :datetime
   end

data/db/migrate/20130416054135_add_circulation_status_id_to_item.rb

@@ -1,4 +1,4 @@
-class AddCirculationStatusIdToItem < ActiveRecord::Migration
+class AddCirculationStatusIdToItem < ActiveRecord::Migration[4.2]
   def change
     add_column :items, :circulation_status_id, :integer, default: 5, null: false
     add_column :items, :checkout_type_id, :integer, default: 1, null: false

data/db/migrate/20130519065638_add_lock_version_to_reserve.rb

@@ -1,5 +1,5 @@
-class AddLockVersionToReserve < ActiveRecord::Migration
+class AddLockVersionToReserve < ActiveRecord::Migration[4.2]
   def change
-    add_column :reserves, :lock_version, :integer, :default => 0, :null => false
+    add_column :reserves, :lock_version, :integer, default: 0, null: false
   end
 end

data/db/migrate/20130519065837_add_lock_version_to_checkin.rb

@@ -1,5 +1,5 @@
-class AddLockVersionToCheckin < ActiveRecord::Migration
+class AddLockVersionToCheckin < ActiveRecord::Migration[4.2]
   def change
-    add_column :checkins, :lock_version, :integer, :default => 0, :null => false
+    add_column :checkins, :lock_version, :integer, default: 0, null: false
   end
 end

data/db/migrate/20140518050147_create_reserve_transitions.rb

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

data/db/migrate/20140528045518_create_user_checkout_stat_transitions.rb

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

data/db/migrate/20140528045539_create_user_reserve_stat_transitions.rb

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

data/db/migrate/20140528045600_create_manifestation_checkout_stat_transitions.rb

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

data/db/migrate/20140528045617_create_manifestation_reserve_stat_transitions.rb

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

data/db/migrate/20140810061942_add_user_id_to_user_checkout_stat.rb

@@ -1,4 +1,4 @@
-class AddUserIdToUserCheckoutStat < ActiveRecord::Migration
+class AddUserIdToUserCheckoutStat < ActiveRecord::Migration[4.2]
   def change
     add_reference :user_checkout_stats, :user, index: true, foreign_key: true
     add_reference :user_reserve_stats, :user, index: true, foreign_key: true

data/db/migrate/20140810091231_add_checkout_icalendar_token_to_profile.rb

@@ -1,6 +1,6 @@
-class AddCheckoutIcalendarTokenToProfile < ActiveRecord::Migration
+class AddCheckoutIcalendarTokenToProfile < ActiveRecord::Migration[4.2]
   def change
     add_column :profiles, :checkout_icalendar_token, :string
-    add_index :profiles, :checkout_icalendar_token, :unique => true
+    add_index :profiles, :checkout_icalendar_token, unique: true
   end
 end

data/db/migrate/20140810091417_add_save_checkout_history_to_profile.rb

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

data/db/migrate/20141014065831_add_shelf_id_to_checkout.rb

@@ -1,4 +1,4 @@
-class AddShelfIdToCheckout < ActiveRecord::Migration
+class AddShelfIdToCheckout < ActiveRecord::Migration[4.2]
   def change
     add_reference :checkouts, :shelf, index: true, foreign_key: true
   end

data/db/migrate/20141020120523_add_library_id_to_checkout.rb

@@ -1,4 +1,4 @@
-class AddLibraryIdToCheckout < ActiveRecord::Migration
+class AddLibraryIdToCheckout < ActiveRecord::Migration[4.2]
   def change
     add_reference :checkouts, :library, index: true, foreign_key: true
   end

data/db/migrate/20150106001709_create_demands.rb

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

data/db/migrate/20160703184619_add_most_recent_to_reserve_transitions.rb

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

data/db/migrate/20160703184650_add_most_recent_to_manifestation_checkout_stat_transitions.rb

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

data/db/migrate/20160703184723_add_most_recent_to_manifestation_reserve_stat_transitions.rb

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

data/db/migrate/20160703184747_add_most_recent_to_user_checkout_stat_transitions.rb

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

data/db/migrate/20160703184805_add_most_recent_to_user_reserve_stat_transitions.rb

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

data/db/migrate/20160703190209_add_foreign_key_on_manifestation_id_to_reserve.rb

@@ -1,4 +1,4 @@
-class AddForeignKeyOnManifestationIdToReserve < ActiveRecord::Migration
+class AddForeignKeyOnManifestationIdToReserve < ActiveRecord::Migration[4.2]
   def change
     add_foreign_key :reserves, :manifestations
   end

data/db/migrate/20180107161035_add_constraints_to_most_recent_for_reserve_transitions.rb

@@ -1,8 +1,8 @@
-class AddConstraintsToMostRecentForReserveTransitions < ActiveRecord::Migration
+class AddConstraintsToMostRecentForReserveTransitions < ActiveRecord::Migration[4.2]
   disable_ddl_transaction!
 
   def up
-    add_index :reserve_transitions, [:reserve_id, :most_recent], unique: true, where: "most_recent", name: "index_reserve_transitions_parent_most_recent" #, algorithm: :concurrently
+    add_index :reserve_transitions, [:reserve_id, :most_recent], unique: true, where: "most_recent", name: "index_reserve_transitions_parent_most_recent" # , algorithm: :concurrently
     change_column_null :reserve_transitions, :most_recent, false
   end
 

data/db/migrate/20180107161951_add_constraints_to_most_recent_for_user_checkout_stat_transitions.rb

@@ -1,8 +1,8 @@
-class AddConstraintsToMostRecentForUserCheckoutStatTransitions < ActiveRecord::Migration
+class AddConstraintsToMostRecentForUserCheckoutStatTransitions < ActiveRecord::Migration[4.2]
   disable_ddl_transaction!
 
   def up
-    add_index :user_checkout_stat_transitions, [:user_checkout_stat_id, :most_recent], unique: true, where: "most_recent", name: "index_user_checkout_stat_transitions_parent_most_recent" #, algorithm: :concurrently
+    add_index :user_checkout_stat_transitions, [:user_checkout_stat_id, :most_recent], unique: true, where: "most_recent", name: "index_user_checkout_stat_transitions_parent_most_recent" # , algorithm: :concurrently
     change_column_null :user_checkout_stat_transitions, :most_recent, false
   end
 

data/db/migrate/20180107162009_add_constraints_to_most_recent_for_user_reserve_stat_transitions.rb

@@ -1,8 +1,8 @@
-class AddConstraintsToMostRecentForUserReserveStatTransitions < ActiveRecord::Migration
+class AddConstraintsToMostRecentForUserReserveStatTransitions < ActiveRecord::Migration[4.2]
   disable_ddl_transaction!
 
   def up
-    add_index :user_reserve_stat_transitions, [:user_reserve_stat_id, :most_recent], unique: true, where: "most_recent", name: "index_user_reserve_stat_transitions_parent_most_recent" #, algorithm: :concurrently
+    add_index :user_reserve_stat_transitions, [:user_reserve_stat_id, :most_recent], unique: true, where: "most_recent", name: "index_user_reserve_stat_transitions_parent_most_recent" # , algorithm: :concurrently
     change_column_null :user_reserve_stat_transitions, :most_recent, false
   end
 

data/db/migrate/20180107162029_add_constraints_to_most_recent_for_manifestation_checkout_stat_transitions.rb

@@ -1,8 +1,8 @@
-class AddConstraintsToMostRecentForManifestationCheckoutStatTransitions < ActiveRecord::Migration
+class AddConstraintsToMostRecentForManifestationCheckoutStatTransitions < ActiveRecord::Migration[4.2]
   disable_ddl_transaction!
 
   def up
-    add_index :manifestation_checkout_stat_transitions, [:manifestation_checkout_stat_id, :most_recent], unique: true, where: "most_recent", name: "index_manifestation_checkout_stat_transitions_parent_most_rece" #, algorithm: :concurrently
+    add_index :manifestation_checkout_stat_transitions, [:manifestation_checkout_stat_id, :most_recent], unique: true, where: "most_recent", name: "index_manifestation_checkout_stat_transitions_parent_most_rece" # , algorithm: :concurrently
     change_column_null :manifestation_checkout_stat_transitions, :most_recent, false
   end
 

data/db/migrate/20180107162048_add_constraints_to_most_recent_for_manifestation_reserve_stat_transitions.rb

@@ -1,8 +1,8 @@
-class AddConstraintsToMostRecentForManifestationReserveStatTransitions < ActiveRecord::Migration
+class AddConstraintsToMostRecentForManifestationReserveStatTransitions < ActiveRecord::Migration[4.2]
   disable_ddl_transaction!
 
   def up
-    add_index :manifestation_reserve_stat_transitions, [:manifestation_reserve_stat_id, :most_recent], unique: true, where: "most_recent", name: "index_manifestation_reserve_stat_transitions_parent_most_recen" #, algorithm: :concurrently
+    add_index :manifestation_reserve_stat_transitions, [:manifestation_reserve_stat_id, :most_recent], unique: true, where: "most_recent", name: "index_manifestation_reserve_stat_transitions_parent_most_recen" # , algorithm: :concurrently
     change_column_null :manifestation_reserve_stat_transitions, :most_recent, false
   end
 

data/lib/enju_circulation/helper.rb

@@ -1,24 +1,24 @@
 module EnjuCirculation
   module ManifestationsHelper
     def link_to_reservation(manifestation, reserve)
-      unless current_user
-        unless manifestation.items.for_checkout.empty?
-          link_to t('manifestation.reserve_this'), new_reserve_path(:manifestation_id => manifestation.id)
-        end
-      else
+      if current_user
         if current_user.has_role?('Librarian')
-          link_to t('manifestation.reserve_this'), new_reserve_path(:manifestation_id => manifestation.id)
+          link_to t('manifestation.reserve_this'), new_reserve_path(manifestation_id: manifestation.id)
         else
           if manifestation.is_checked_out_by?(current_user)
             I18n.t('manifestation.currently_checked_out')
           else
             if manifestation.is_reserved_by?(current_user)
-              link_to t('manifestation.cancel_reservation'), reserve, :confirm => t('page.are_you_sure'), :method => :delete 
+              link_to t('manifestation.cancel_reservation'), reserve, confirm: t('page.are_you_sure'), method: :delete 
             else
-              link_to t('manifestation.reserve_this'), new_reserve_path(:manifestation_id => manifestation.id)
+              link_to t('manifestation.reserve_this'), new_reserve_path(manifestation_id: manifestation.id)
             end
           end
         end
+      else
+        unless manifestation.items.for_checkout.empty?
+          link_to t('manifestation.reserve_this'), new_reserve_path(manifestation_id: manifestation.id)
+        end
       end
     end
   end

data/lib/enju_circulation/version.rb

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

data/lib/generators/enju_circulation/setup/setup_generator.rb

@@ -1,6 +1,6 @@
 class EnjuCirculation::SetupGenerator < Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
-  argument :file, :type => :string, :default => "all"
+  argument :file, type: :string, default: "all"
 
   def copy_setup_files
     directory("db/fixtures", "db/fixtures/enju_circulation")

data/lib/generators/enju_circulation/setup/templates/config/schedule.rb

@@ -3,11 +3,11 @@ every 5.minute do
   rake "enju_message:send"
 end
 
-every 1.day, :at => '0:00 am' do
+every 1.day, at: '0:00 am' do
   rake "enju_circulation:expire"
   runner "User.lock_expired_users"
 end
 
-every 1.day, :at => '5:00 am' do
+every 1.day, at: '5:00 am' do
   rake "enju_circulation:send_notification"
 end

data/lib/tasks/enju_circulation_tasks.rake

@@ -19,27 +19,27 @@ namespace :enju_circulation do
   end
 
   desc 'Calculate stats'
-  task :stat => :environment do
+  task stat: :environment do
     UserCheckoutStat.calculate_stat
     UserReserveStat.calculate_stat
-    #ManifestationCheckoutStat.calculate_stat
+    # ManifestationCheckoutStat.calculate_stat
     ManifestationReserveStat.calculate_stat
   end
 
   desc 'Expire circulations and reservations'
-  task :expire => :environment do
+  task expire: :environment do
     Reserve.expire
     Basket.expire
   end
 
   desc 'Sending due date notifications'
-  task :send_notification => :environment do
+  task send_notification: :environment do
     Checkout.send_due_date_notification
     Checkout.send_overdue_notification
   end
 
   desc "upgrade enju_circulation"
-  task :upgrade => :environment do
+  task upgrade: :environment do
     Rake::Task['statesman:backfill_most_recent'].invoke('ManifestationCheckoutStat')
     Rake::Task['statesman:backfill_most_recent'].invoke('ManifestationReserveStat')
     Rake::Task['statesman:backfill_most_recent'].invoke('UserCheckoutStat')
@@ -49,9 +49,33 @@ namespace :enju_circulation do
   end
 
   desc "migrate old checkout records"
-  task :migrate_old_checkout => :environment do
+  task migrate_old_checkout: :environment do
     Checkout.transaction do
       update_checkout
     end
   end
+
+  namespace :export do
+    desc 'Export checkouts'
+    task checkout: :environment do
+      puts ['checked_out_at', 'due_date', 'item_identifier', 'call_number', 'shelf', 'carrier_type', 'title', 'username', 'full_name', 'user_number'].join("\t")
+      Checkout.where(checkin_id: nil).find_each do |c|
+        if c.item
+          shelf = c.shelf || c.item.shelf
+          puts [
+            c.created_at,
+            c.due_date,
+            c.item.item_identifier,
+            c.item.call_number,
+            shelf.try(:name),
+            c.item.manifestation.carrier_type.name,
+            c.item.manifestation.original_title,
+            c.user.try(:username),
+            c.user.try(:profile).try(:full_name),
+            c.user.try(:profile).try(:user_number),
+          ].join("\t")
+	end
+      end
+    end
+  end
 end

data/spec/controllers/carrier_type_has_checkout_types_controller_spec.rb

@@ -51,7 +51,7 @@ describe CarrierTypeHasCheckoutTypesController do
 
       it 'assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
         carrier_type_has_checkout_type = FactoryBot.create(:carrier_type_has_checkout_type)
-        get :show, id: carrier_type_has_checkout_type.id
+        get :show, params: { id: carrier_type_has_checkout_type.id }
         assigns(:carrier_type_has_checkout_type).should eq(carrier_type_has_checkout_type)
       end
     end
@@ -61,7 +61,7 @@ describe CarrierTypeHasCheckoutTypesController do
 
       it 'assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
         carrier_type_has_checkout_type = FactoryBot.create(:carrier_type_has_checkout_type)
-        get :show, id: carrier_type_has_checkout_type.id
+        get :show, params: { id: carrier_type_has_checkout_type.id }
         assigns(:carrier_type_has_checkout_type).should eq(carrier_type_has_checkout_type)
       end
     end
@@ -71,7 +71,7 @@ describe CarrierTypeHasCheckoutTypesController do
 
       it 'assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
         carrier_type_has_checkout_type = FactoryBot.create(:carrier_type_has_checkout_type)
-        get :show, id: carrier_type_has_checkout_type.id
+        get :show, params: { id: carrier_type_has_checkout_type.id }
         assigns(:carrier_type_has_checkout_type).should eq(carrier_type_has_checkout_type)
       end
     end
@@ -79,7 +79,7 @@ describe CarrierTypeHasCheckoutTypesController do
     describe 'When not logged in' do
       it 'assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
         carrier_type_has_checkout_type = FactoryBot.create(:carrier_type_has_checkout_type)
-        get :show, id: carrier_type_has_checkout_type.id
+        get :show, params: { id: carrier_type_has_checkout_type.id }
         assigns(:carrier_type_has_checkout_type).should eq(carrier_type_has_checkout_type)
       end
     end
@@ -131,7 +131,7 @@ describe CarrierTypeHasCheckoutTypesController do
 
       it 'assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
         carrier_type_has_checkout_type = FactoryBot.create(:carrier_type_has_checkout_type)
-        get :edit, id: carrier_type_has_checkout_type.id
+        get :edit, params: { id: carrier_type_has_checkout_type.id }
         assigns(:carrier_type_has_checkout_type).should eq(carrier_type_has_checkout_type)
       end
     end
@@ -141,7 +141,7 @@ describe CarrierTypeHasCheckoutTypesController do
 
       it 'assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
         carrier_type_has_checkout_type = FactoryBot.create(:carrier_type_has_checkout_type)
-        get :edit, id: carrier_type_has_checkout_type.id
+        get :edit, params: { id: carrier_type_has_checkout_type.id }
         assigns(:carrier_type_has_checkout_type).should eq(carrier_type_has_checkout_type)
       end
     end
@@ -151,7 +151,7 @@ describe CarrierTypeHasCheckoutTypesController do
 
       it 'assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
         carrier_type_has_checkout_type = FactoryBot.create(:carrier_type_has_checkout_type)
-        get :edit, id: carrier_type_has_checkout_type.id
+        get :edit, params: { id: carrier_type_has_checkout_type.id }
         response.should be_forbidden
       end
     end
@@ -159,7 +159,7 @@ describe CarrierTypeHasCheckoutTypesController do
     describe 'When not logged in' do
       it 'should not assign the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
         carrier_type_has_checkout_type = FactoryBot.create(:carrier_type_has_checkout_type)
-        get :edit, id: carrier_type_has_checkout_type.id
+        get :edit, params: { id: carrier_type_has_checkout_type.id }
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -176,24 +176,24 @@ describe CarrierTypeHasCheckoutTypesController do
 
       describe 'with valid params' do
         it 'assigns a newly created carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
-          post :create, carrier_type_has_checkout_type: @attrs
+          post :create, params: { carrier_type_has_checkout_type: @attrs }
           assigns(:carrier_type_has_checkout_type).should be_valid
         end
 
         it 'redirects to the created patron' do
-          post :create, carrier_type_has_checkout_type: @attrs
+          post :create, params: { carrier_type_has_checkout_type: @attrs }
           response.should redirect_to(assigns(:carrier_type_has_checkout_type))
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
-          post :create, carrier_type_has_checkout_type: @invalid_attrs
+          post :create, params: { carrier_type_has_checkout_type: @invalid_attrs }
           assigns(:carrier_type_has_checkout_type).should_not be_valid
         end
 
         it "re-renders the 'new' template" do
-          post :create, carrier_type_has_checkout_type: @invalid_attrs
+          post :create, params: { carrier_type_has_checkout_type: @invalid_attrs }
           response.should render_template('new')
         end
       end
@@ -204,24 +204,24 @@ describe CarrierTypeHasCheckoutTypesController do
 
       describe 'with valid params' do
         it 'assigns a newly created carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
-          post :create, carrier_type_has_checkout_type: @attrs
+          post :create, params: { carrier_type_has_checkout_type: @attrs }
           assigns(:carrier_type_has_checkout_type).should be_nil
         end
 
         it 'should be forbidden' do
-          post :create, carrier_type_has_checkout_type: @attrs
+          post :create, params: { carrier_type_has_checkout_type: @attrs }
           response.should be_forbidden
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
-          post :create, carrier_type_has_checkout_type: @invalid_attrs
+          post :create, params: { carrier_type_has_checkout_type: @invalid_attrs }
           assigns(:carrier_type_has_checkout_type).should be_nil
         end
 
         it 'should be forbidden' do
-          post :create, carrier_type_has_checkout_type: @invalid_attrs
+          post :create, params: { carrier_type_has_checkout_type: @invalid_attrs }
           response.should be_forbidden
         end
       end
@@ -232,24 +232,24 @@ describe CarrierTypeHasCheckoutTypesController do
 
       describe 'with valid params' do
         it 'assigns a newly created carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
-          post :create, carrier_type_has_checkout_type: @attrs
+          post :create, params: { carrier_type_has_checkout_type: @attrs }
           assigns(:carrier_type_has_checkout_type).should be_nil
         end
 
         it 'should be forbidden' do
-          post :create, carrier_type_has_checkout_type: @attrs
+          post :create, params: { carrier_type_has_checkout_type: @attrs }
           response.should be_forbidden
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
-          post :create, carrier_type_has_checkout_type: @invalid_attrs
+          post :create, params: { carrier_type_has_checkout_type: @invalid_attrs }
           assigns(:carrier_type_has_checkout_type).should be_nil
         end
 
         it 'should be forbidden' do
-          post :create, carrier_type_has_checkout_type: @invalid_attrs
+          post :create, params: { carrier_type_has_checkout_type: @invalid_attrs }
           response.should be_forbidden
         end
       end
@@ -258,24 +258,24 @@ describe CarrierTypeHasCheckoutTypesController do
     describe 'When not logged in' do
       describe 'with valid params' do
         it 'assigns a newly created carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
-          post :create, carrier_type_has_checkout_type: @attrs
+          post :create, params: { carrier_type_has_checkout_type: @attrs }
           assigns(:carrier_type_has_checkout_type).should be_nil
         end
 
         it 'should be forbidden' do
-          post :create, carrier_type_has_checkout_type: @attrs
+          post :create, params: { carrier_type_has_checkout_type: @attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
-          post :create, carrier_type_has_checkout_type: @invalid_attrs
+          post :create, params: { carrier_type_has_checkout_type: @invalid_attrs }
           assigns(:carrier_type_has_checkout_type).should be_nil
         end
 
         it 'should be forbidden' do
-          post :create, carrier_type_has_checkout_type: @invalid_attrs
+          post :create, params: { carrier_type_has_checkout_type: @invalid_attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
@@ -294,11 +294,11 @@ describe CarrierTypeHasCheckoutTypesController do
 
       describe 'with valid params' do
         it 'updates the requested carrier_type_has_checkout_type' do
-          put :update, id: @carrier_type_has_checkout_type.id, carrier_type_has_checkout_type: @attrs
+          put :update, params: { id: @carrier_type_has_checkout_type.id, carrier_type_has_checkout_type: @attrs }
         end
 
         it 'assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
-          put :update, id: @carrier_type_has_checkout_type.id, carrier_type_has_checkout_type: @attrs
+          put :update, params: { id: @carrier_type_has_checkout_type.id, carrier_type_has_checkout_type: @attrs }
           assigns(:carrier_type_has_checkout_type).should eq(@carrier_type_has_checkout_type)
           response.should redirect_to(@carrier_type_has_checkout_type)
         end
@@ -306,7 +306,7 @@ describe CarrierTypeHasCheckoutTypesController do
 
       describe 'with invalid params' do
         it 'assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
-          put :update, id: @carrier_type_has_checkout_type.id, carrier_type_has_checkout_type: @invalid_attrs
+          put :update, params: { id: @carrier_type_has_checkout_type.id, carrier_type_has_checkout_type: @invalid_attrs }
           response.should render_template('edit')
         end
       end
@@ -317,23 +317,23 @@ describe CarrierTypeHasCheckoutTypesController do
 
       describe 'with valid params' do
         it 'assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
-          put :update, id: @carrier_type_has_checkout_type.id, carrier_type_has_checkout_type: @attrs
+          put :update, params: { id: @carrier_type_has_checkout_type.id, carrier_type_has_checkout_type: @attrs }
         end
 
         it 'should be forbidden' do
-          put :update, id: @carrier_type_has_checkout_type.id, carrier_type_has_checkout_type: @attrs
+          put :update, params: { id: @carrier_type_has_checkout_type.id, carrier_type_has_checkout_type: @attrs }
           response.should be_forbidden
         end
       end
 
       describe 'with invalid params' do
         it 'assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
-          put :update, id: @carrier_type_has_checkout_type.id, carrier_type_has_checkout_type: @invalid_attrs
+          put :update, params: { id: @carrier_type_has_checkout_type.id, carrier_type_has_checkout_type: @invalid_attrs }
           assigns(:carrier_type_has_checkout_type).should eq(@carrier_type_has_checkout_type)
         end
 
         it 'should be forbidden' do
-          put :update, id: @carrier_type_has_checkout_type.id, carrier_type_has_checkout_type: @invalid_attrs
+          put :update, params: { id: @carrier_type_has_checkout_type.id, carrier_type_has_checkout_type: @invalid_attrs }
           response.should be_forbidden
         end
       end
@@ -344,11 +344,11 @@ describe CarrierTypeHasCheckoutTypesController do
 
       describe 'with valid params' do
         it 'updates the requested carrier_type_has_checkout_type' do
-          put :update, id: @carrier_type_has_checkout_type.id, carrier_type_has_checkout_type: @attrs
+          put :update, params: { id: @carrier_type_has_checkout_type.id, carrier_type_has_checkout_type: @attrs }
         end
 
         it 'should be forbidden' do
-          put :update, id: @carrier_type_has_checkout_type.id, carrier_type_has_checkout_type: @attrs
+          put :update, params: { id: @carrier_type_has_checkout_type.id, carrier_type_has_checkout_type: @attrs }
           assigns(:carrier_type_has_checkout_type).should eq(@carrier_type_has_checkout_type)
           response.should be_forbidden
         end
@@ -356,7 +356,7 @@ describe CarrierTypeHasCheckoutTypesController do
 
       describe 'with invalid params' do
         it 'assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
-          put :update, id: @carrier_type_has_checkout_type.id, carrier_type_has_checkout_type: @invalid_attrs
+          put :update, params: { id: @carrier_type_has_checkout_type.id, carrier_type_has_checkout_type: @invalid_attrs }
           response.should be_forbidden
         end
       end
@@ -365,18 +365,18 @@ describe CarrierTypeHasCheckoutTypesController do
     describe 'When not logged in' do
       describe 'with valid params' do
         it 'updates the requested carrier_type_has_checkout_type' do
-          put :update, id: @carrier_type_has_checkout_type.id, carrier_type_has_checkout_type: @attrs
+          put :update, params: { id: @carrier_type_has_checkout_type.id, carrier_type_has_checkout_type: @attrs }
         end
 
         it 'should be forbidden' do
-          put :update, id: @carrier_type_has_checkout_type.id, carrier_type_has_checkout_type: @attrs
+          put :update, params: { id: @carrier_type_has_checkout_type.id, carrier_type_has_checkout_type: @attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
 
       describe 'with invalid params' do
         it 'assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
-          put :update, id: @carrier_type_has_checkout_type.id, carrier_type_has_checkout_type: @invalid_attrs
+          put :update, params: { id: @carrier_type_has_checkout_type.id, carrier_type_has_checkout_type: @invalid_attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
@@ -392,11 +392,11 @@ describe CarrierTypeHasCheckoutTypesController do
       login_fixture_admin
 
       it 'destroys the requested carrier_type_has_checkout_type' do
-        delete :destroy, id: @carrier_type_has_checkout_type.id
+        delete :destroy, params: { id: @carrier_type_has_checkout_type.id }
       end
 
       it 'redirects to the carrier_type_has_checkout_types list' do
-        delete :destroy, id: @carrier_type_has_checkout_type.id
+        delete :destroy, params: { id: @carrier_type_has_checkout_type.id }
         response.should redirect_to(carrier_type_has_checkout_types_url)
       end
     end
@@ -405,11 +405,11 @@ describe CarrierTypeHasCheckoutTypesController do
       login_fixture_librarian
 
       it 'destroys the requested carrier_type_has_checkout_type' do
-        delete :destroy, id: @carrier_type_has_checkout_type.id
+        delete :destroy, params: { id: @carrier_type_has_checkout_type.id }
       end
 
       it 'redirects to the carrier_type_has_checkout_types list' do
-        delete :destroy, id: @carrier_type_has_checkout_type.id
+        delete :destroy, params: { id: @carrier_type_has_checkout_type.id }
         response.should be_forbidden
       end
     end
@@ -418,22 +418,22 @@ describe CarrierTypeHasCheckoutTypesController do
       login_fixture_user
 
       it 'destroys the requested carrier_type_has_checkout_type' do
-        delete :destroy, id: @carrier_type_has_checkout_type.id
+        delete :destroy, params: { id: @carrier_type_has_checkout_type.id }
       end
 
       it 'should be forbidden' do
-        delete :destroy, id: @carrier_type_has_checkout_type.id
+        delete :destroy, params: { id: @carrier_type_has_checkout_type.id }
         response.should be_forbidden
       end
     end
 
     describe 'When not logged in' do
       it 'destroys the requested carrier_type_has_checkout_type' do
-        delete :destroy, id: @carrier_type_has_checkout_type.id
+        delete :destroy, params: { id: @carrier_type_has_checkout_type.id }
       end
 
       it 'should be forbidden' do
-        delete :destroy, id: @carrier_type_has_checkout_type.id
+        delete :destroy, params: { id: @carrier_type_has_checkout_type.id }
         response.should redirect_to(new_user_session_url)
       end
     end