enju_circulation 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5455d6e85cabbc15d732b183f13c22605c19dc6
-  data.tar.gz: 8116c7f2b479d87f4e3703d15131bf9ecb5f2806
+  metadata.gz: 1c7dd7a5e75571acdc8dde4eaa51b41285669e9c
+  data.tar.gz: 1d925968dff36c5de25ece699685a5c5712034af
 SHA512:
-  metadata.gz: 9c75125044bfd06a8bbca14ba19a8b08b0d04074c4bd15bb522a59fe52ef9809663581343822bffc52bde932dac3739baef52406e52423d74eb3a6edef5061fc
-  data.tar.gz: d8b52b02a9e9ec183c76466b3dda0ba8502a01afde2c17bcc9d45d298eb1e2e97852afcffbb7a627b331ed6fb3e0d3401d4f9acf3ede118c7e710e7dc2c33842
+  metadata.gz: 4324c83b957e1fe7e6638aa069dbf76f3fc58ad723175bb552ed8db94af047ec02af8faed9581831b4627c6954002af5e0b595dc39edd308934c493e060c2874
+  data.tar.gz: 5a7f410f273fb3fcbe4281604b027f5a922cfaeae5e85da3554f7aeedd6d75841ec68c490477250279a03cbbfa28760fd3942a2395072bfe3e8cdfa7bb23a80f

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/generators/enju_circulation/update/update_generator.rb

@@ -2,7 +2,7 @@ class EnjuCirculation::UpdateGenerator < Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
   desc "Create files for updating Next-L Enju"
 
-  def copy_migration_files
+  def copy_statesman_migration_files
     generate('statesman:add_constraints_to_most_recent', 'Reserve', 'ReserveTransition')
   end
 end

data/lib/tasks/enju_circulation_tasks.rake

@@ -43,7 +43,7 @@ namespace :enju_circulation 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')
-    Rake::Task['statesman:backfill_most_recent'].invoke('UserCheckoutStat')
+    Rake::Task['statesman:backfill_most_recent'].invoke('UserReserveStat')
     Rake::Task['statesman:backfill_most_recent'].invoke('Reserve')
     puts 'enju_circulation: The upgrade completed successfully.'
   end

data/spec/concerns/enju_accept_spec.rb

@@ -7,7 +7,7 @@ end
 describe EnjuCirculation::EnjuAccept do
   fixtures :all
   it "should successfully accept" do
-    accept = MyAccept.new(FactoryGirl.attributes_for(:accept))
+    accept = MyAccept.new(FactoryBot.attributes_for(:accept))
     expect(accept.item).to be_truthy
     expect(accept.item.circulation_status.name).to eq "In Process"
     accept.save!
@@ -15,13 +15,13 @@ describe EnjuCirculation::EnjuAccept do
     expect(accept.item.use_restriction.name).to eq "Limited Circulation, Normal Loan Period"
   end
   it "should reflect to items list", solr: true do
-    FactoryGirl.create(:item)
-    FactoryGirl.create(:item)
-    FactoryGirl.create(:item)
+    FactoryBot.create(:item)
+    FactoryBot.create(:item)
+    FactoryBot.create(:item)
     result = Item.search.build { facet :circulation_status }.execute
     inprocess_count = result.facet(:circulation_status).rows.find{|e| e.value == "In Process" }.count
     onshelf_count = result.facet(:circulation_status).rows.find{|e| e.value == "Available On Shelf" }.try(:count) || 0
-    accept = MyAccept.new(FactoryGirl.attributes_for(:accept))
+    accept = MyAccept.new(FactoryBot.attributes_for(:accept))
     accept.save!
     result = Item.search.build { facet :circulation_status }.execute
     expect(result.facet(:circulation_status).rows.find{|e| e.value == "In Process" }.count).to eq inprocess_count

data/spec/controllers/carrier_type_has_checkout_types_controller_spec.rb

@@ -5,7 +5,7 @@ describe CarrierTypeHasCheckoutTypesController do
 
   describe 'GET index' do
     before(:each) do
-      FactoryGirl.create(:carrier_type_has_checkout_type)
+      FactoryBot.create(:carrier_type_has_checkout_type)
     end
 
     describe 'When logged in as Administrator' do
@@ -50,7 +50,7 @@ describe CarrierTypeHasCheckoutTypesController do
       login_fixture_admin
 
       it 'assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
-        carrier_type_has_checkout_type = FactoryGirl.create(:carrier_type_has_checkout_type)
+        carrier_type_has_checkout_type = FactoryBot.create(:carrier_type_has_checkout_type)
         get :show, id: carrier_type_has_checkout_type.id
         assigns(:carrier_type_has_checkout_type).should eq(carrier_type_has_checkout_type)
       end
@@ -60,7 +60,7 @@ describe CarrierTypeHasCheckoutTypesController do
       login_fixture_librarian
 
       it 'assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
-        carrier_type_has_checkout_type = FactoryGirl.create(:carrier_type_has_checkout_type)
+        carrier_type_has_checkout_type = FactoryBot.create(:carrier_type_has_checkout_type)
         get :show, id: carrier_type_has_checkout_type.id
         assigns(:carrier_type_has_checkout_type).should eq(carrier_type_has_checkout_type)
       end
@@ -70,7 +70,7 @@ describe CarrierTypeHasCheckoutTypesController do
       login_fixture_user
 
       it 'assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
-        carrier_type_has_checkout_type = FactoryGirl.create(:carrier_type_has_checkout_type)
+        carrier_type_has_checkout_type = FactoryBot.create(:carrier_type_has_checkout_type)
         get :show, id: carrier_type_has_checkout_type.id
         assigns(:carrier_type_has_checkout_type).should eq(carrier_type_has_checkout_type)
       end
@@ -78,7 +78,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 = FactoryGirl.create(:carrier_type_has_checkout_type)
+        carrier_type_has_checkout_type = FactoryBot.create(:carrier_type_has_checkout_type)
         get :show, id: carrier_type_has_checkout_type.id
         assigns(:carrier_type_has_checkout_type).should eq(carrier_type_has_checkout_type)
       end
@@ -130,7 +130,7 @@ describe CarrierTypeHasCheckoutTypesController do
       login_fixture_admin
 
       it 'assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
-        carrier_type_has_checkout_type = FactoryGirl.create(:carrier_type_has_checkout_type)
+        carrier_type_has_checkout_type = FactoryBot.create(:carrier_type_has_checkout_type)
         get :edit, id: carrier_type_has_checkout_type.id
         assigns(:carrier_type_has_checkout_type).should eq(carrier_type_has_checkout_type)
       end
@@ -140,7 +140,7 @@ describe CarrierTypeHasCheckoutTypesController do
       login_fixture_librarian
 
       it 'assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
-        carrier_type_has_checkout_type = FactoryGirl.create(:carrier_type_has_checkout_type)
+        carrier_type_has_checkout_type = FactoryBot.create(:carrier_type_has_checkout_type)
         get :edit, id: carrier_type_has_checkout_type.id
         assigns(:carrier_type_has_checkout_type).should eq(carrier_type_has_checkout_type)
       end
@@ -150,7 +150,7 @@ describe CarrierTypeHasCheckoutTypesController do
       login_fixture_user
 
       it 'assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type' do
-        carrier_type_has_checkout_type = FactoryGirl.create(:carrier_type_has_checkout_type)
+        carrier_type_has_checkout_type = FactoryBot.create(:carrier_type_has_checkout_type)
         get :edit, id: carrier_type_has_checkout_type.id
         response.should be_forbidden
       end
@@ -158,7 +158,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 = FactoryGirl.create(:carrier_type_has_checkout_type)
+        carrier_type_has_checkout_type = FactoryBot.create(:carrier_type_has_checkout_type)
         get :edit, id: carrier_type_has_checkout_type.id
         response.should redirect_to(new_user_session_url)
       end
@@ -167,7 +167,7 @@ describe CarrierTypeHasCheckoutTypesController do
 
   describe 'POST create' do
     before(:each) do
-      @attrs = FactoryGirl.attributes_for(:carrier_type_has_checkout_type)
+      @attrs = FactoryBot.attributes_for(:carrier_type_has_checkout_type)
       @invalid_attrs = { carrier_type_id: '' }
     end
 
@@ -284,8 +284,8 @@ describe CarrierTypeHasCheckoutTypesController do
 
   describe 'PUT update' do
     before(:each) do
-      @carrier_type_has_checkout_type = FactoryGirl.create(:carrier_type_has_checkout_type)
-      @attrs = FactoryGirl.attributes_for(:carrier_type_has_checkout_type)
+      @carrier_type_has_checkout_type = FactoryBot.create(:carrier_type_has_checkout_type)
+      @attrs = FactoryBot.attributes_for(:carrier_type_has_checkout_type)
       @invalid_attrs = { carrier_type_id: '' }
     end
 
@@ -385,7 +385,7 @@ describe CarrierTypeHasCheckoutTypesController do
 
   describe 'DELETE destroy' do
     before(:each) do
-      @carrier_type_has_checkout_type = FactoryGirl.create(:carrier_type_has_checkout_type)
+      @carrier_type_has_checkout_type = FactoryBot.create(:carrier_type_has_checkout_type)
     end
 
     describe 'When logged in as Administrator' do

data/spec/controllers/checkout_types_controller_spec.rb

@@ -5,7 +5,7 @@ describe CheckoutTypesController do
 
   describe 'GET index' do
     before(:each) do
-      FactoryGirl.create(:checkout_type)
+      FactoryBot.create(:checkout_type)
     end
 
     describe 'When logged in as Administrator' do
@@ -50,7 +50,7 @@ describe CheckoutTypesController do
       login_fixture_admin
 
       it 'assigns the requested checkout_type as @checkout_type' do
-        checkout_type = FactoryGirl.create(:checkout_type)
+        checkout_type = FactoryBot.create(:checkout_type)
         get :show, id: checkout_type.id
         assigns(:checkout_type).should eq(checkout_type)
       end
@@ -60,7 +60,7 @@ describe CheckoutTypesController do
       login_fixture_librarian
 
       it 'assigns the requested checkout_type as @checkout_type' do
-        checkout_type = FactoryGirl.create(:checkout_type)
+        checkout_type = FactoryBot.create(:checkout_type)
         get :show, id: checkout_type.id
         assigns(:checkout_type).should eq(checkout_type)
       end
@@ -70,7 +70,7 @@ describe CheckoutTypesController do
       login_fixture_user
 
       it 'assigns the requested checkout_type as @checkout_type' do
-        checkout_type = FactoryGirl.create(:checkout_type)
+        checkout_type = FactoryBot.create(:checkout_type)
         get :show, id: checkout_type.id
         assigns(:checkout_type).should eq(checkout_type)
       end
@@ -78,7 +78,7 @@ describe CheckoutTypesController do
 
     describe 'When not logged in' do
       it 'assigns the requested checkout_type as @checkout_type' do
-        checkout_type = FactoryGirl.create(:checkout_type)
+        checkout_type = FactoryBot.create(:checkout_type)
         get :show, id: checkout_type.id
         assigns(:checkout_type).should eq(checkout_type)
       end
@@ -130,7 +130,7 @@ describe CheckoutTypesController do
       login_fixture_admin
 
       it 'assigns the requested checkout_type as @checkout_type' do
-        checkout_type = FactoryGirl.create(:checkout_type)
+        checkout_type = FactoryBot.create(:checkout_type)
         get :edit, id: checkout_type.id
         assigns(:checkout_type).should eq(checkout_type)
       end
@@ -140,7 +140,7 @@ describe CheckoutTypesController do
       login_fixture_librarian
 
       it 'assigns the requested checkout_type as @checkout_type' do
-        checkout_type = FactoryGirl.create(:checkout_type)
+        checkout_type = FactoryBot.create(:checkout_type)
         get :edit, id: checkout_type.id
         response.should be_forbidden
       end
@@ -150,7 +150,7 @@ describe CheckoutTypesController do
       login_fixture_user
 
       it 'assigns the requested checkout_type as @checkout_type' do
-        checkout_type = FactoryGirl.create(:checkout_type)
+        checkout_type = FactoryBot.create(:checkout_type)
         get :edit, id: checkout_type.id
         response.should be_forbidden
       end
@@ -158,7 +158,7 @@ describe CheckoutTypesController do
 
     describe 'When not logged in' do
       it 'should not assign the requested checkout_type as @checkout_type' do
-        checkout_type = FactoryGirl.create(:checkout_type)
+        checkout_type = FactoryBot.create(:checkout_type)
         get :edit, id: checkout_type.id
         response.should redirect_to(new_user_session_url)
       end
@@ -167,7 +167,7 @@ describe CheckoutTypesController do
 
   describe 'POST create' do
     before(:each) do
-      @attrs = FactoryGirl.attributes_for(:checkout_type)
+      @attrs = FactoryBot.attributes_for(:checkout_type)
       @invalid_attrs = { name: '' }
     end
 
@@ -284,8 +284,8 @@ describe CheckoutTypesController do
 
   describe 'PUT update' do
     before(:each) do
-      @checkout_type = FactoryGirl.create(:checkout_type)
-      @attrs = FactoryGirl.attributes_for(:checkout_type)
+      @checkout_type = FactoryBot.create(:checkout_type)
+      @attrs = FactoryBot.attributes_for(:checkout_type)
       @invalid_attrs = { name: '' }
     end
 
@@ -385,7 +385,7 @@ describe CheckoutTypesController do
 
   describe 'DELETE destroy' do
     before(:each) do
-      @checkout_type = FactoryGirl.create(:checkout_type)
+      @checkout_type = FactoryBot.create(:checkout_type)
     end
 
     describe 'When logged in as Administrator' do

data/spec/controllers/checkouts_controller_spec.rb

@@ -9,7 +9,7 @@ describe CheckoutsController do
     end
 
     before(:each) do
-      FactoryGirl.create(:profile)
+      FactoryBot.create(:profile)
     end
 
     describe 'When logged in as Administrator' do

data/spec/controllers/circulation_statuses_controller_spec.rb

@@ -6,12 +6,12 @@ describe CirculationStatusesController do
   disconnect_sunspot
 
   def valid_attributes
-    FactoryGirl.attributes_for(:circulation_status)
+    FactoryBot.attributes_for(:circulation_status)
   end
 
   describe 'GET index' do
     before(:each) do
-      FactoryGirl.create(:circulation_status)
+      FactoryBot.create(:circulation_status)
     end
 
     describe 'When logged in as Administrator' do
@@ -54,7 +54,7 @@ describe CirculationStatusesController do
       login_fixture_admin
 
       it 'assigns the requested circulation_status as @circulation_status' do
-        circulation_status = FactoryGirl.create(:circulation_status)
+        circulation_status = FactoryBot.create(:circulation_status)
         get :show, id: circulation_status.id
         assigns(:circulation_status).should eq(circulation_status)
       end
@@ -64,7 +64,7 @@ describe CirculationStatusesController do
       login_fixture_librarian
 
       it 'assigns the requested circulation_status as @circulation_status' do
-        circulation_status = FactoryGirl.create(:circulation_status)
+        circulation_status = FactoryBot.create(:circulation_status)
         get :show, id: circulation_status.id
         assigns(:circulation_status).should eq(circulation_status)
       end
@@ -74,7 +74,7 @@ describe CirculationStatusesController do
       login_fixture_user
 
       it 'assigns the requested circulation_status as @circulation_status' do
-        circulation_status = FactoryGirl.create(:circulation_status)
+        circulation_status = FactoryBot.create(:circulation_status)
         get :show, id: circulation_status.id
         assigns(:circulation_status).should eq(circulation_status)
       end
@@ -82,7 +82,7 @@ describe CirculationStatusesController do
 
     describe 'When not logged in' do
       it 'assigns the requested circulation_status as @circulation_status' do
-        circulation_status = FactoryGirl.create(:circulation_status)
+        circulation_status = FactoryBot.create(:circulation_status)
         get :show, id: circulation_status.id
         assigns(:circulation_status).should eq(circulation_status)
       end
@@ -134,7 +134,7 @@ describe CirculationStatusesController do
       login_fixture_admin
 
       it 'assigns the requested circulation_status as @circulation_status' do
-        circulation_status = FactoryGirl.create(:circulation_status)
+        circulation_status = FactoryBot.create(:circulation_status)
         get :edit, id: circulation_status.id
         assigns(:circulation_status).should eq(circulation_status)
       end
@@ -144,7 +144,7 @@ describe CirculationStatusesController do
       login_fixture_librarian
 
       it 'assigns the requested circulation_status as @circulation_status' do
-        circulation_status = FactoryGirl.create(:circulation_status)
+        circulation_status = FactoryBot.create(:circulation_status)
         get :edit, id: circulation_status.id
         response.should be_forbidden
       end
@@ -154,7 +154,7 @@ describe CirculationStatusesController do
       login_fixture_user
 
       it 'assigns the requested circulation_status as @circulation_status' do
-        circulation_status = FactoryGirl.create(:circulation_status)
+        circulation_status = FactoryBot.create(:circulation_status)
         get :edit, id: circulation_status.id
         response.should be_forbidden
       end
@@ -162,7 +162,7 @@ describe CirculationStatusesController do
 
     describe 'When not logged in' do
       it 'should not assign the requested circulation_status as @circulation_status' do
-        circulation_status = FactoryGirl.create(:circulation_status)
+        circulation_status = FactoryBot.create(:circulation_status)
         get :edit, id: circulation_status.id
         response.should redirect_to(new_user_session_url)
       end
@@ -288,7 +288,7 @@ describe CirculationStatusesController do
 
   describe 'PUT update' do
     before(:each) do
-      @circulation_status = FactoryGirl.create(:circulation_status)
+      @circulation_status = FactoryBot.create(:circulation_status)
       @attrs = valid_attributes
       @invalid_attrs = { display_name: '' }
     end
@@ -389,7 +389,7 @@ describe CirculationStatusesController do
 
   describe 'DELETE destroy' do
     before(:each) do
-      @circulation_status = FactoryGirl.create(:circulation_status)
+      @circulation_status = FactoryBot.create(:circulation_status)
     end
 
     describe 'When logged in as Administrator' do

data/spec/controllers/item_has_use_restrictions_controller_spec.rb

@@ -6,12 +6,12 @@ describe ItemHasUseRestrictionsController do
   disconnect_sunspot
 
   def valid_attributes
-    FactoryGirl.attributes_for(:item_has_use_restriction)
+    FactoryBot.attributes_for(:item_has_use_restriction)
   end
 
   describe 'GET index' do
     before(:each) do
-      FactoryGirl.create(:item_has_use_restriction)
+      FactoryBot.create(:item_has_use_restriction)
     end
 
     describe 'When logged in as Administrator' do
@@ -56,7 +56,7 @@ describe ItemHasUseRestrictionsController do
       login_fixture_admin
 
       it 'assigns the requested item_has_use_restriction as @item_has_use_restriction' do
-        item_has_use_restriction = FactoryGirl.create(:item_has_use_restriction)
+        item_has_use_restriction = FactoryBot.create(:item_has_use_restriction)
         get :show, id: item_has_use_restriction.id
         assigns(:item_has_use_restriction).should eq(item_has_use_restriction)
       end
@@ -66,7 +66,7 @@ describe ItemHasUseRestrictionsController do
       login_fixture_librarian
 
       it 'assigns the requested item_has_use_restriction as @item_has_use_restriction' do
-        item_has_use_restriction = FactoryGirl.create(:item_has_use_restriction)
+        item_has_use_restriction = FactoryBot.create(:item_has_use_restriction)
         get :show, id: item_has_use_restriction.id
         assigns(:item_has_use_restriction).should eq(item_has_use_restriction)
       end
@@ -76,7 +76,7 @@ describe ItemHasUseRestrictionsController do
       login_fixture_user
 
       it 'assigns the requested item_has_use_restriction as @item_has_use_restriction' do
-        item_has_use_restriction = FactoryGirl.create(:item_has_use_restriction)
+        item_has_use_restriction = FactoryBot.create(:item_has_use_restriction)
         get :show, id: item_has_use_restriction.id
         assigns(:item_has_use_restriction).should eq(item_has_use_restriction)
       end
@@ -84,7 +84,7 @@ describe ItemHasUseRestrictionsController do
 
     describe 'When not logged in' do
       it 'assigns the requested item_has_use_restriction as @item_has_use_restriction' do
-        item_has_use_restriction = FactoryGirl.create(:item_has_use_restriction)
+        item_has_use_restriction = FactoryBot.create(:item_has_use_restriction)
         get :show, id: item_has_use_restriction.id
         assigns(:item_has_use_restriction).should eq(item_has_use_restriction)
       end
@@ -136,7 +136,7 @@ describe ItemHasUseRestrictionsController do
       login_fixture_admin
 
       it 'assigns the requested item_has_use_restriction as @item_has_use_restriction' do
-        item_has_use_restriction = FactoryGirl.create(:item_has_use_restriction)
+        item_has_use_restriction = FactoryBot.create(:item_has_use_restriction)
         get :edit, id: item_has_use_restriction.id
         assigns(:item_has_use_restriction).should eq(item_has_use_restriction)
       end
@@ -146,7 +146,7 @@ describe ItemHasUseRestrictionsController do
       login_fixture_librarian
 
       it 'assigns the requested item_has_use_restriction as @item_has_use_restriction' do
-        item_has_use_restriction = FactoryGirl.create(:item_has_use_restriction)
+        item_has_use_restriction = FactoryBot.create(:item_has_use_restriction)
         get :edit, id: item_has_use_restriction.id
         assigns(:item_has_use_restriction).should eq(item_has_use_restriction)
       end
@@ -156,7 +156,7 @@ describe ItemHasUseRestrictionsController do
       login_fixture_user
 
       it 'assigns the requested item_has_use_restriction as @item_has_use_restriction' do
-        item_has_use_restriction = FactoryGirl.create(:item_has_use_restriction)
+        item_has_use_restriction = FactoryBot.create(:item_has_use_restriction)
         get :edit, id: item_has_use_restriction.id
         response.should be_forbidden
       end
@@ -164,7 +164,7 @@ describe ItemHasUseRestrictionsController do
 
     describe 'When not logged in' do
       it 'should not assign the requested item_has_use_restriction as @item_has_use_restriction' do
-        item_has_use_restriction = FactoryGirl.create(:item_has_use_restriction)
+        item_has_use_restriction = FactoryBot.create(:item_has_use_restriction)
         get :edit, id: item_has_use_restriction.id
         response.should redirect_to(new_user_session_url)
       end
@@ -290,7 +290,7 @@ describe ItemHasUseRestrictionsController do
 
   describe 'PUT update' do
     before(:each) do
-      @item_has_use_restriction = FactoryGirl.create(:item_has_use_restriction)
+      @item_has_use_restriction = FactoryBot.create(:item_has_use_restriction)
       @attrs = valid_attributes
       @invalid_attrs = { item_id: '' }
     end
@@ -391,7 +391,7 @@ describe ItemHasUseRestrictionsController do
 
   describe 'DELETE destroy' do
     before(:each) do
-      @item_has_use_restriction = FactoryGirl.create(:item_has_use_restriction)
+      @item_has_use_restriction = FactoryBot.create(:item_has_use_restriction)
     end
 
     describe 'When logged in as Administrator' do