enju_circulation 0.4.0.beta.4 → 0.4.0.rc.1

data/spec/models/reserve_stat_has_manifestation_spec.rb

@@ -9,10 +9,10 @@ end
 #
 # Table name: reserve_stat_has_manifestations
 #
-#  id                            :integer          not null, primary key
-#  manifestation_reserve_stat_id :integer          not null
-#  manifestation_id              :integer          not null
+#  id                            :bigint           not null, primary key
+#  manifestation_reserve_stat_id :bigint           not null
+#  manifestation_id              :bigint           not null
 #  reserves_count                :integer
-#  created_at                    :datetime
-#  updated_at                    :datetime
+#  created_at                    :datetime         not null
+#  updated_at                    :datetime         not null
 #

data/spec/models/reserve_stat_has_user_spec.rb

@@ -9,10 +9,10 @@ end
 #
 # Table name: reserve_stat_has_users
 #
-#  id                   :integer          not null, primary key
-#  user_reserve_stat_id :integer          not null
-#  user_id              :integer          not null
+#  id                   :bigint           not null, primary key
+#  user_reserve_stat_id :bigint           not null
+#  user_id              :bigint           not null
 #  reserves_count       :integer
-#  created_at           :datetime
-#  updated_at           :datetime
+#  created_at           :datetime         not null
+#  updated_at           :datetime         not null
 #

data/spec/models/user_checkout_stat_spec.rb

@@ -19,13 +19,13 @@ end
 #
 # Table name: user_checkout_stats
 #
-#  id           :integer          not null, primary key
+#  id           :bigint           not null, primary key
 #  start_date   :datetime
 #  end_date     :datetime
 #  note         :text
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #  started_at   :datetime
 #  completed_at :datetime
-#  user_id      :integer
+#  user_id      :bigint
 #

data/spec/models/user_group_has_checkout_type_spec.rb

@@ -12,9 +12,9 @@ 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
+#  id                             :bigint           not null, primary key
+#  user_group_id                  :bigint           not null
+#  checkout_type_id               :bigint           not null
 #  checkout_limit                 :integer          default(0), not null
 #  checkout_period                :integer          default(0), not null
 #  checkout_renewal_limit         :integer          default(0), not null
@@ -24,7 +24,7 @@ end
 #  fixed_due_date                 :datetime
 #  note                           :text
 #  position                       :integer
-#  created_at                     :datetime
-#  updated_at                     :datetime
+#  created_at                     :datetime         not null
+#  updated_at                     :datetime         not null
 #  current_checkout_count         :integer
 #

data/spec/models/user_import_file_spec.rb

@@ -13,7 +13,7 @@ describe UserImportFile do
       old_users_count = User.count
       old_import_results_count = UserImportResult.count
       file.current_state.should eq 'pending'
-      file.import_start.should eq({user_imported: 5, user_found: 0, error: 3})
+      file.import_start.should eq({user_imported: 5, user_found: 0, failed: 0, error: 3})
       user003 = User.find_by(username: 'user003')
       user003.profile.checkout_icalendar_token.should eq 'secrettoken'
       user003.profile.save_checkout_history.should be_truthy

data/spec/models/user_reserve_stat_spec.rb

@@ -19,13 +19,13 @@ end
 #
 # Table name: user_reserve_stats
 #
-#  id           :integer          not null, primary key
+#  id           :bigint           not null, primary key
 #  start_date   :datetime
 #  end_date     :datetime
 #  note         :text
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #  started_at   :datetime
 #  completed_at :datetime
-#  user_id      :integer
+#  user_id      :bigint
 #

data/spec/models/withdraw_spec.rb

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

data/spec/policies/manifestation_policy_spec.rb

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

data/spec/rails_helper.rb

@@ -11,7 +11,7 @@ SimpleCov.start 'rails'
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
-require 'factory_bot'
+require 'factory_bot_rails'
 require 'rspec/active_model/mocks'
 require 'pundit/rspec'
 require "capybara/rspec"
@@ -48,6 +48,3 @@ RSpec.configure do |config|
     end
   end
 end
-
-FactoryBot.definition_file_paths << "#{::Rails.root}/../../spec/factories"
-FactoryBot.find_definitions

data/spec/system/items_spec.rb

@@ -0,0 +1,21 @@
+require 'rails_helper'
+
+RSpec.describe 'Checkouts', type: :system do
+  include Devise::Test::IntegrationHelpers
+  fixtures :all
+
+  before(:each) do
+    CarrierType.find_by(name: 'volume').update(attachment: File.open("#{Rails.root.to_s}/app/assets/images/icons/book.png"))
+  end
+
+  describe 'When logged in as Librarian' do
+    it 'should not set "Removed" as circulation status if the item is reserved' do
+      item = FactoryBot.create(:reserve).item
+      sign_in users(:librarian1)
+      visit edit_item_path(item)
+      select('除籍済み', from: 'item_circulation_status_id')
+      click_button('更新する')
+      expect(page).to have_content 'この貸出状態には変更できません。資料が予約されています。'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.4.0.beta.4
+  version: 0.4.0.rc.1
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-11 00:00:00.000000000 Z
+date: 2020-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_biblio
@@ -16,70 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0.beta.2
+        version: 0.4.0.rc.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0.beta.2
-- !ruby/object:Gem::Dependency
-  name: enju_manifestation_viewer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0.beta.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0.beta.2
+        version: 0.4.0.rc.1
 - !ruby/object:Gem::Dependency
   name: enju_event
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0.beta.2
+        version: 0.4.0.rc.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0.beta.2
+        version: 0.4.0.rc.1
 - !ruby/object:Gem::Dependency
   name: enju_leaf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta.1
+        version: 2.0.0.rc.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta.1
+        version: 2.0.0.rc.1
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -759,6 +745,8 @@ files:
 - spec/dummy/db/migrate/20151201163718_add_place_id_to_event.rb
 - spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb
 - spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb
+- spec/dummy/db/migrate/20160319144230_create_issn_records.rb
+- spec/dummy/db/migrate/20160506144040_create_isbn_records.rb
 - spec/dummy/db/migrate/20160610093229_add_html_snippet_to_library_group.rb
 - spec/dummy/db/migrate/20160627232219_add_most_recent_to_user_import_file_transitions.rb
 - spec/dummy/db/migrate/20160627232316_add_most_recent_to_user_export_file_transitions.rb
@@ -778,6 +766,8 @@ files:
 - spec/dummy/db/migrate/20160813203039_add_user_id_to_library_group.rb
 - spec/dummy/db/migrate/20160814165332_add_most_recent_to_message_request_transitions.rb
 - spec/dummy/db/migrate/20160820004638_add_attachment_attachment_to_carrier_types.rb
+- spec/dummy/db/migrate/20170116134107_create_issn_record_and_manifestations.rb
+- spec/dummy/db/migrate/20170116134120_create_isbn_record_and_manifestations.rb
 - spec/dummy/db/migrate/20170305064014_add_csv_charset_conversion_to_library_group.rb
 - spec/dummy/db/migrate/20171014084528_add_header_logo_to_library_group.rb
 - spec/dummy/db/migrate/20171119051258_set_not_null_to_manifestation_id_on_items.rb
@@ -793,6 +783,9 @@ files:
 - spec/dummy/db/migrate/20180107164558_add_constraints_to_most_recent_for_event_import_file_transitions.rb
 - spec/dummy/db/migrate/20180107164617_add_constraints_to_most_recent_for_event_export_file_transitions.rb
 - spec/dummy/db/migrate/20181119170645_add_foreign_key_to_events_referencing_event_categories.rb
+- spec/dummy/db/migrate/20190102034126_create_doi_records.rb
+- spec/dummy/db/migrate/20190311154610_create_periodicals.rb
+- spec/dummy/db/migrate/20190312033839_create_periodical_and_manifestations.rb
 - spec/dummy/db/migrate/20190630113817_add_display_name_translations_to_library_group.rb
 - spec/dummy/db/migrate/20190630115523_add_login_banner_translations_to_library_group.rb
 - spec/dummy/db/migrate/20190630151446_add_display_name_translations_to_role.rb
@@ -802,8 +795,26 @@ files:
 - spec/dummy/db/migrate/20190713115451_add_full_name_translations_to_profile.rb
 - spec/dummy/db/migrate/20190818075603_add_memo_to_manifestation.rb
 - spec/dummy/db/migrate/20190818075628_add_memo_to_item.rb
+- spec/dummy/db/migrate/20191216131755_add_email_to_library_group.rb
+- spec/dummy/db/migrate/20191219122214_create_custom_properties.rb
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
+- spec/dummy/private/system/carrier_types/attachments/000/000/001/original/book.png
+- spec/dummy/private/system/carrier_types/attachments/000/000/001/thumb/book.png
+- spec/dummy/private/system/resource_export_files/resource_exports/000/000/001/original/data
+- spec/dummy/private/system/resource_export_files/resource_exports/000/000/002/original/data
+- spec/dummy/private/system/resource_export_files/resource_exports/000/000/003/original/data
+- spec/dummy/private/system/user_import_files/user_imports/000/000/001/original/user_import_file_sample.tsv
+- spec/dummy/private/system/user_import_files/user_imports/000/000/002/original/user_delete_file.tsv
+- spec/dummy/private/system/user_import_files/user_imports/000/000/003/original/user_import_file_sample.tsv
+- spec/dummy/private/system/user_import_files/user_imports/000/000/004/original/user_delete_file.tsv
+- spec/dummy/private/system/user_import_files/user_imports/000/000/005/original/user_import_file_sample.tsv
+- spec/dummy/private/system/user_import_files/user_imports/000/000/006/original/user_delete_file.tsv
+- spec/dummy/private/system/user_import_files/user_imports/000/000/007/original/user_import_file_sample.tsv
+- spec/dummy/private/system/user_import_files/user_imports/000/000/008/original/user_delete_file.tsv
+- spec/dummy/private/system/user_import_files/user_imports/000/000/009/original/user_import_file_sample.tsv
+- spec/dummy/private/system/user_import_files/user_imports/000/000/010/original/user_delete_file.tsv
+- spec/dummy/private/system/user_import_files/user_imports/000/000/011/original/user_import_file_sample.tsv
+- spec/dummy/private/system/user_import_files/user_imports/000/000/012/original/user_delete_file.tsv
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -840,6 +851,8 @@ files:
 - spec/fixtures/agent_types.yml
 - spec/fixtures/agents.yml
 - spec/fixtures/baskets.yml
+- spec/fixtures/bookstores.yml
+- spec/fixtures/budget_types.yml
 - spec/fixtures/carrier_type_has_checkout_types.yml
 - spec/fixtures/carrier_types.yml
 - spec/fixtures/checked_items.yml
@@ -916,6 +929,7 @@ files:
 - spec/support/devise.rb
 - spec/support/tasks.rb
 - spec/system/checkouts_spec.rb
+- spec/system/items_spec.rb
 - spec/system/manifestations_spec.rb
 - spec/system/reserves_spec.rb
 - spec/system/user_group_has_checkout_types.rb
@@ -1013,14 +1027,31 @@ test_files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/404.html
+- spec/dummy/private/system/resource_export_files/resource_exports/000/000/001/original/data
+- spec/dummy/private/system/resource_export_files/resource_exports/000/000/003/original/data
+- spec/dummy/private/system/resource_export_files/resource_exports/000/000/002/original/data
+- spec/dummy/private/system/user_import_files/user_imports/000/000/012/original/user_delete_file.tsv
+- spec/dummy/private/system/user_import_files/user_imports/000/000/007/original/user_import_file_sample.tsv
+- spec/dummy/private/system/user_import_files/user_imports/000/000/009/original/user_import_file_sample.tsv
+- spec/dummy/private/system/user_import_files/user_imports/000/000/008/original/user_delete_file.tsv
+- spec/dummy/private/system/user_import_files/user_imports/000/000/001/original/user_import_file_sample.tsv
+- spec/dummy/private/system/user_import_files/user_imports/000/000/006/original/user_delete_file.tsv
+- spec/dummy/private/system/user_import_files/user_imports/000/000/011/original/user_import_file_sample.tsv
+- spec/dummy/private/system/user_import_files/user_imports/000/000/010/original/user_delete_file.tsv
+- spec/dummy/private/system/user_import_files/user_imports/000/000/003/original/user_import_file_sample.tsv
+- spec/dummy/private/system/user_import_files/user_imports/000/000/004/original/user_delete_file.tsv
+- spec/dummy/private/system/user_import_files/user_imports/000/000/005/original/user_import_file_sample.tsv
+- spec/dummy/private/system/user_import_files/user_imports/000/000/002/original/user_delete_file.tsv
+- spec/dummy/private/system/carrier_types/attachments/000/000/001/original/book.png
+- spec/dummy/private/system/carrier_types/attachments/000/000/001/thumb/book.png
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/db/migrate/20170305064014_add_csv_charset_conversion_to_library_group.rb
 - spec/dummy/db/migrate/20180107161347_add_constraints_to_most_recent_for_resource_export_file_transitions.rb
 - spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb
 - spec/dummy/db/migrate/20090720091429_create_content_types.rb
 - spec/dummy/db/migrate/20140709113413_create_user_export_files.rb
 - spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb
+- spec/dummy/db/migrate/20170116134107_create_issn_record_and_manifestations.rb
 - spec/dummy/db/migrate/047_create_produces.rb
 - spec/dummy/db/migrate/20090720091106_create_medium_of_performances.rb
 - spec/dummy/db/migrate/20090519203307_create_participates.rb
@@ -1035,7 +1066,9 @@ test_files:
 - spec/dummy/db/migrate/20140518111006_create_message_transitions.rb
 - spec/dummy/db/migrate/124_create_bookstores.rb
 - spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb
+- spec/dummy/db/migrate/20190102034126_create_doi_records.rb
 - spec/dummy/db/migrate/20110318183304_add_valid_period_for_new_user_to_user_group.rb
+- spec/dummy/db/migrate/20160506144040_create_isbn_records.rb
 - spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb
 - spec/dummy/db/migrate/20160813203039_add_user_id_to_library_group.rb
 - spec/dummy/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb
@@ -1096,6 +1129,7 @@ test_files:
 - spec/dummy/db/migrate/20120105074911_add_isil_to_library.rb
 - spec/dummy/db/migrate/20080905191442_create_agent_types.rb
 - spec/dummy/db/migrate/20190712163038_add_display_name_translations_to_carrier_type.rb
+- spec/dummy/db/migrate/20170116134120_create_isbn_record_and_manifestations.rb
 - spec/dummy/db/migrate/006_create_items.rb
 - spec/dummy/db/migrate/069_create_shelves.rb
 - spec/dummy/db/migrate/20140802082007_add_manifestation_id_to_item.rb
@@ -1107,6 +1141,7 @@ test_files:
 - spec/dummy/db/migrate/20160627232316_add_most_recent_to_user_export_file_transitions.rb
 - spec/dummy/db/migrate/20180107161311_add_constraints_to_most_recent_for_agent_import_file_transitions.rb
 - spec/dummy/db/migrate/20081006090811_create_subscriptions.rb
+- spec/dummy/db/migrate/20190311154610_create_periodicals.rb
 - spec/dummy/db/migrate/077_create_user_groups.rb
 - spec/dummy/db/migrate/134_create_agent_merge_lists.rb
 - spec/dummy/db/migrate/20140122054321_create_profiles.rb
@@ -1139,6 +1174,7 @@ test_files:
 - spec/dummy/db/migrate/20110301035123_add_pub_date_to_manifestation.rb
 - spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb
 - spec/dummy/db/migrate/20140812152348_create_event_export_files.rb
+- spec/dummy/db/migrate/20191216131755_add_email_to_library_group.rb
 - spec/dummy/db/migrate/20120129014038_create_budget_types.rb
 - spec/dummy/db/migrate/20160801080612_add_most_recent_to_import_request_transitions.rb
 - spec/dummy/db/migrate/112_create_frequencies.rb
@@ -1164,11 +1200,13 @@ test_files:
 - spec/dummy/db/migrate/20190630115523_add_login_banner_translations_to_library_group.rb
 - spec/dummy/db/migrate/20180107160726_add_constraints_to_most_recent_for_user_import_file_transitions.rb
 - spec/dummy/db/migrate/20080830172106_create_exemplifies.rb
+- spec/dummy/db/migrate/20160319144230_create_issn_records.rb
 - spec/dummy/db/migrate/20120602141129_add_edit_mode_to_agent_import_file.rb
 - spec/dummy/db/migrate/20160801080643_add_most_recent_to_agent_import_file_transitions.rb
 - spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb
 - spec/dummy/db/migrate/20190630153136_add_display_name_translations_to_event.rb
 - spec/dummy/db/migrate/20100814091104_add_position_to_agent_relationship.rb
+- spec/dummy/db/migrate/20191219122214_create_custom_properties.rb
 - spec/dummy/db/migrate/117_create_form_of_works.rb
 - spec/dummy/db/migrate/20080819181903_create_message_requests.rb
 - spec/dummy/db/migrate/20130506175834_create_identifiers.rb
@@ -1189,6 +1227,7 @@ test_files:
 - spec/dummy/db/migrate/20160813191533_add_book_jacket_source_to_library_group.rb
 - spec/dummy/db/migrate/20160820004638_add_attachment_attachment_to_carrier_types.rb
 - spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb
+- spec/dummy/db/migrate/20190312033839_create_periodical_and_manifestations.rb
 - spec/dummy/db/migrate/002_devise_create_users.rb
 - spec/dummy/db/migrate/20110619064807_add_edition_string_to_manifestation.rb
 - spec/dummy/db/migrate/20160813191647_add_max_number_of_results_to_library_group.rb
@@ -1250,6 +1289,7 @@ test_files:
 - spec/system/manifestations_spec.rb
 - spec/system/checkouts_spec.rb
 - spec/system/reserves_spec.rb
+- spec/system/items_spec.rb
 - spec/support/controller_macros.rb
 - spec/support/devise.rb
 - spec/support/tasks.rb
@@ -1294,9 +1334,11 @@ test_files:
 - spec/fixtures/agent_types.yml
 - spec/fixtures/users.yml
 - spec/fixtures/circulation_statuses.yml
+- spec/fixtures/budget_types.yml
 - spec/fixtures/user_reserve_stats.yml
 - spec/fixtures/manifestations.yml
 - spec/fixtures/request_types.yml
+- spec/fixtures/bookstores.yml
 - spec/fixtures/checkins.yml
 - spec/fixtures/user_checkout_stats.yml
 - spec/fixtures/item_has_use_restrictions.yml