enju_circulation 0.3.11 → 0.4.0.beta.1

data/spec/models/checkout_type_spec.rb

@@ -9,11 +9,12 @@ end
 #
 # Table name: checkout_types
 #
-#  id           :integer          not null, primary key
-#  name         :string           not null
-#  display_name :text
-#  note         :text
-#  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  id                        :integer          not null, primary key
+#  name                      :string           not null
+#  display_name              :text
+#  note                      :text
+#  position                  :integer
+#  created_at                :datetime
+#  updated_at                :datetime
+#  display_name_translations :jsonb            not null
 #

data/spec/models/circulation_status_spec.rb

@@ -9,11 +9,12 @@ end
 #
 # Table name: circulation_statuses
 #
-#  id           :integer          not null, primary key
-#  name         :string           not null
-#  display_name :text
-#  note         :text
-#  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  id                        :integer          not null, primary key
+#  name                      :string           not null
+#  display_name              :text
+#  note                      :text
+#  position                  :integer
+#  created_at                :datetime
+#  updated_at                :datetime
+#  display_name_translations :jsonb            not null
 #

data/spec/models/item_spec.rb

@@ -33,15 +33,13 @@ describe Item do
     items(:item_00012).available_for_checkout?.should be_falsy
   end
 
-  it "should not be able to checkout a removed item" do
-    Item.for_checkout.include?(items(:item_00023)).should be_falsy
+  it "should not create item without manifestation_id" do
+    item = items(:item_00001)
+    item.manifestation_id = nil
+    item.valid?.should be_falsy
   end
 
-  it "should delete lending policies" do
-    item = items(:item_00001)
-    item.checkout_type = CheckoutType.find_by(name: 'serial')
-    item.save
-    item.reload
-    item.lending_policies.count.should eq 0
+  it "should not be able to checkout a removed item" do
+    Item.for_checkout.include?(items(:item_00023)).should be_falsy
   end
 end

data/spec/models/manifestation_spec.rb

@@ -1,7 +1,6 @@
 require 'rails_helper'
 
-describe Manifestation do
-  # pending "add some examples to (or delete) #{__FILE__}"
+describe Manifestation, solr: true do
   fixtures :all
 
   it "should be reserved" do
@@ -16,23 +15,21 @@ describe Manifestation do
     manifestations(:manifestation_00008).is_reservable_by?(users(:admin)).should be_falsy
   end
 
-  context ".export" do
-    it "should not export use_restriction for Guest" do
-      manifestation = FactoryBot.create(:manifestation)
-      use_restriction = UseRestriction.find(1)
-      item = FactoryBot.create(:item, manifestation: manifestation, use_restriction: use_restriction)
-      lines = Manifestation.export(role: "Guest")
-      csv = CSV.parse(lines, headers: true, col_sep: "\t")
-      expect(csv["use_restriction"].compact).to be_empty
+  it "should not export use_restriction for Guest" do
+    manifestation = FactoryBot.create(:manifestation)
+    use_restriction = UseRestriction.find(1)
+    item = FactoryBot.create(:item, manifestation: manifestation, use_restriction: use_restriction)
+    lines = Manifestation.export(format: :txt, role: "Guest")
+    csv = CSV.parse(lines, headers: true, col_sep: "\t")
+    expect(csv["use_restriction"].compact).to be_empty
 
-      lines = Manifestation.export(role: "Administrator")
-      csv = CSV.parse(lines, headers: true, col_sep: "\t")
-      expect(csv["use_restriction"].compact).not_to be_empty
-    end
+    lines = Manifestation.export(format: :txt, role: "Administrator")
+    csv = CSV.parse(lines, headers: true, col_sep: "\t")
+    expect(csv["use_restriction"].compact).not_to be_empty
+  end
 
-    it "should respond to is_checked_out_by?" do
-      manifestations(:manifestation_00001).is_checked_out_by?(users(:admin)).should be_truthy
-      manifestations(:manifestation_00001).is_checked_out_by?(users(:librarian2)).should be_falsy
-    end
+  it "should respond to is_checked_out_by?" do
+    manifestations(:manifestation_00001).is_checked_out_by?(users(:admin)).should be_truthy
+    manifestations(:manifestation_00001).is_checked_out_by?(users(:librarian2)).should be_falsy
   end
 end

data/spec/models/reserve_spec.rb

@@ -147,10 +147,10 @@ end
 #  canceled_at                  :datetime
 #  expired_at                   :datetime
 #  deleted_at                   :datetime
-#  expiration_notice_to_patron  :boolean          default("0")
-#  expiration_notice_to_library :boolean          default("0")
+#  expiration_notice_to_patron  :boolean          default(FALSE)
+#  expiration_notice_to_library :boolean          default(FALSE)
 #  pickup_location_id           :integer
 #  retained_at                  :datetime
 #  postponed_at                 :datetime
-#  lock_version                 :integer          default("0"), not null
+#  lock_version                 :integer          default(0), not null
 #

data/spec/models/resource_export_file_spec.rb

@@ -25,18 +25,3 @@ describe ResourceExportFile do
     end
   end
 end
-
-# == Schema Information
-#
-# Table name: resource_export_files
-#
-#  id                           :integer          not null, primary key
-#  user_id                      :integer
-#  resource_export_file_name    :string
-#  resource_export_content_type :string
-#  resource_export_file_size    :integer
-#  resource_export_updated_at   :datetime
-#  executed_at                  :datetime
-#  created_at                   :datetime
-#  updated_at                   :datetime
-#

data/spec/models/retain_spec.rb

@@ -0,0 +1,16 @@
+require 'rails_helper'
+
+RSpec.describe Retain, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
+
+# == Schema Information
+#
+# Table name: retains
+#
+#  id         :bigint           not null, primary key
+#  reserve_id :bigint           not null
+#  item_id    :bigint           not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#

data/spec/models/user_group_has_checkout_type_spec.rb

@@ -3,23 +3,6 @@ require 'rails_helper'
 describe UserGroupHasCheckoutType do
   fixtures :all
 
-  it "should create lending_policy" do
-    old_count = LendingPolicy.count
-    user_group_has_checkout_types(:user_group_has_checkout_type_00005).create_lending_policy
-    (user_group_has_checkout_types(:user_group_has_checkout_type_00005).checkout_type.items.count + old_count).should eq LendingPolicy.count
-  end
-
-  it "should update lending_policy" do
-    old_updated_at = lending_policies(:lending_policy_00004).updated_at
-    user_group_has_checkout_types(:user_group_has_checkout_type_00002).checkout_period = 100
-    user_group_has_checkout_types(:user_group_has_checkout_type_00002).checkout_renewal_limit = 5
-    user_group_has_checkout_types(:user_group_has_checkout_type_00002).update_lending_policy.should be_truthy
-    lending_policies(:lending_policy_00004).reload
-    lending_policies(:lending_policy_00004).updated_at.should > old_updated_at
-    lending_policies(:lending_policy_00004).loan_period.should eq 100
-    lending_policies(:lending_policy_00004).renewal.should eq 5
-  end
-
   it "should respond to update_current_checkout_count" do
     UserGroupHasCheckoutType.update_current_checkout_count.should be_truthy
   end
@@ -29,19 +12,19 @@ end
 #
 # Table name: user_group_has_checkout_types
 #
-#  id                              :integer          not null, primary key
-#  user_group_id                   :integer          not null
-#  checkout_type_id                :integer          not null
-#  checkout_limit                  :integer          default("0"), not null
-#  checkout_period                 :integer          default("0"), not null
-#  checkout_renewal_limit          :integer          default("0"), not null
-#  reservation_limit               :integer          default("0"), not null
-#  reservation_expired_period      :integer          default("7"), not null
-#  set_due_date_before_closing_day :boolean          default("0"), not null
-#  fixed_due_date                  :datetime
-#  note                            :text
-#  position                        :integer
-#  created_at                      :datetime
-#  updated_at                      :datetime
-#  current_checkout_count          :integer
+#  id                             :integer          not null, primary key
+#  user_group_id                  :integer          not null
+#  checkout_type_id               :integer          not null
+#  checkout_limit                 :integer          default(0), not null
+#  checkout_period                :integer          default(0), not null
+#  checkout_renewal_limit         :integer          default(0), not null
+#  reservation_limit              :integer          default(0), not null
+#  reservation_expired_period     :integer          default(7), not null
+#  set_due_date_after_closing_day :boolean          default(FALSE), not null
+#  fixed_due_date                 :datetime
+#  note                           :text
+#  position                       :integer
+#  created_at                     :datetime
+#  updated_at                     :datetime
+#  current_checkout_count         :integer
 #

data/spec/models/withdraw_spec.rb

@@ -5,22 +5,20 @@ RSpec.describe Withdraw, type: :model do
 
   it "should change circulation_status" do
     withdraw = FactoryBot.create(:withdraw)
-    expect(withdraw.item.circulation_status.name).to eq 'Removed'
-    expect(withdraw.item.use_restriction.name).to eq 'Not For Loan'
+    withdraw.item.circulation_status.name.should eq 'Removed'
+    withdraw.item.use_restriction.name.should eq 'Not For Loan'
   end
 
   it "should not withdraw rented item" do
     withdraw = Withdraw.new(librarian: users(:librarian1))
     withdraw.item = items(:item_00013)
-    expect(withdraw.valid?).to be_falsy
-    expect(withdraw.errors.messages[:item_id]).to include('is rented.')
+    withdraw.valid?.should be_falsy
   end
 
   it "should not withdraw reserved item" do
     reserve = FactoryBot.create(:reserve)
     withdraw = FactoryBot.build(:withdraw, item: reserve.manifestation.items.first)
-    expect(withdraw.valid?).to be_falsy
-    expect(withdraw.errors.messages[:item_id]).to include('is reserved.')
+    withdraw.valid?.should be_falsy
   end
 end
 

data/spec/policies/manifestation_policy_spec.rb

@@ -8,7 +8,8 @@ describe ManifestationPolicy do
     end
 
     it "not grants destroy if it is reserved" do
-      record = FactoryBot.create(:reserve).manifestation
+      record = FactoryBot.create(:manifestation)
+      reserve = FactoryBot.create(:reserve, manifestation_id: record.id)
       expect(subject).not_to permit(@admin, record)
     end
   end

data/spec/rails_helper.rb

@@ -1,16 +1,20 @@
 require 'simplecov'
 require 'coveralls'
+
+SimpleCov.formatters = SimpleCov::Formatter::MultiFormatter.new([
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+])
 SimpleCov.start 'rails'
-Coveralls.wear!
 
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
-require 'factory_bot_rails'
+require 'factory_bot'
 require 'rspec/active_model/mocks'
+require 'pundit/rspec'
 require "capybara/rspec"
-require "pundit/rspec"
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -44,3 +48,6 @@ RSpec.configure do |config|
     end
   end
 end
+
+FactoryBot.definition_file_paths << "#{::Rails.root}/../../spec/factories"
+FactoryBot.find_definitions

data/spec/system/reserves_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe 'Reserves', type: :system do
   describe 'When logged in as Librarian' do
     it 'should contain user information' do
       sign_in users(:librarian1)
-      visit reserves_path(format: :text)
+      visit reserves_path(format: :txt)
       expect(page).to have_content reserves(:reserve_00001).user.username
       expect(page).to have_content reserves(:reserve_00001).manifestation.original_title
     end

data/spec/views/items/index.html.erb_spec.rb

@@ -16,11 +16,9 @@ describe "items/index" do
     allow(view).to receive(:policy) do |record|
       Pundit.policy(user, record)
     end
-
-    Item.reindex
   end
 
-  describe "circulation_status facet", solr: true do
+  describe "circulation_status facet" do
     it "should work with searching acquired_at fields" do
       view.stub(:filtered_params).and_return(ActionController::Parameters.new().permit)
       render
@@ -32,4 +30,3 @@ describe "items/index" do
     end
   end
 end
-