enju_library 0.2.5 → 0.3.0.beta.2

data/spec/factories/checkout.rb

@@ -1,9 +1,11 @@
 FactoryBot.define do
-  factory :checkout, :class => Checkout do |f|
+  factory :checkout, class: Checkout do |f|
     f.due_date Time.zone.now.next_week
     f.association :item, factory: :item
     f.association :user, factory: :user
     f.association :librarian, factory: :librarian
     f.association :basket, factory: :basket
+    f.association :library
+    f.association :shelf
   end
 end

data/spec/factories/item.rb

@@ -1,7 +1,9 @@
 FactoryBot.define do
-  factory :item do |f|
-    f.sequence(:item_identifier){|n| "item_#{n}"}
-    f.circulation_status_id{CirculationStatus.find(1).id} if defined?(EnjuCircuation)
-    f.manifestation_id{FactoryBot.create(:manifestation).id}
+  factory :item do
+    sequence(:item_identifier){|n| "item_#{n}"}
+    circulation_status_id{CirculationStatus.find(1).id} if defined?(EnjuCircuation)
+    manifestation_id{FactoryBot.create(:manifestation).id}
+    bookstore_id 1
+    budget_type_id 1
   end
 end

data/spec/factories/library.rb

@@ -7,7 +7,7 @@ FactoryBot.define do
 end
 
 FactoryBot.define do
-  factory :invalid_library, :class => Library do |f|
+  factory :invalid_library, class: Library do |f|
     f.library_group_id{LibraryGroup.first.id}
   end
 end

data/spec/factories/manifestation.rb

@@ -1,6 +1,8 @@
 FactoryBot.define do
-  factory :manifestation do |f|
-    f.sequence(:original_title){|n| "manifestation_title_#{n}"}
-    f.carrier_type_id{CarrierType.find(1).id}
+  factory :manifestation do
+    sequence(:original_title){|n| "manifestation_title_#{n}"}
+    carrier_type_id 1
+    content_type_id 1
+    frequency_id 1
   end
 end

data/spec/factories/profile.rb

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :profile, :class => Profile do |f|
+  factory :profile, class: Profile do |f|
     f.user_group_id {UserGroup.first.id}
     f.required_role_id {Role.where(name: 'User').first.id}
     f.sequence(:user_number){|n| "user_number_#{n}"}

data/spec/fixtures/content_types.yml

@@ -0,0 +1,98 @@
+--- 
+content_type_00001:
+  id: 1
+  name: text
+  display_name: "en: text\r\n\
+    ja: 文字"
+  note: 
+  position: 1
+content_type_00002:
+  id: 2
+  name: performed_music
+  display_name: "en: Performed music\r\n\
+    ja: 音楽"
+  note: 曲の演奏など
+  position: 2
+content_type_00003:
+  id: 3
+  name: two_dimensional_moving_image
+  display_name: "en: Two-dimensional moving image\r\n\
+    ja: 動画"
+  note: 
+  position: 3
+content_type_00004:
+  id: 4
+  name: tactile_text
+  display_name: "en: Tactile text\r\n\
+    ja: 点字など"
+  note: 触ることのできる文字
+  position: 4
+content_type_00005:
+  id: 5
+  name: still_image
+  display_name: "en: Still image\r\n\
+    ja: 画像"
+  note: 静止画像
+  position: 5
+content_type_00006:
+  id: 6
+  name: cartographic_image
+  display_name: "en: Cartographic image\r\n\
+    ja: 地図"
+  note: 
+  position: 6
+content_type_00007:
+  id: 7
+  name: spoken_word
+  display_name: "en: Spoken word\r\n\
+    ja: 音声"
+  note: 読み上げ音声など
+  position: 7
+content_type_00008:
+  id: 8
+  name: sounds
+  display_name: "en: Sounds\r\n\
+    ja: 音"
+  note: 波音など
+  position: 8
+content_type_00009:
+  id: 9
+  name: notated_music
+  display_name: "en: Notated music\r\n\
+    ja: 楽譜"
+  note: 
+  position: 9
+content_type_00010:
+  id: 10
+  name: three_dimensional_moving_image
+  display_name: "en: Three-dimensional moving image\r\n\
+    ja: 3D動画"
+  note: 
+  position: 10
+content_type_00011:
+  id: 11
+  name: other
+  display_name: "en: Other\r\n\
+    ja: その他"
+  note: LCMARCに由来
+  position: 11
+content_type_00012:
+  id: 12
+  name: unspecified
+  display_name: "en: Unspecified\r\n\
+    ja: 不明"
+  note: LCMARCに由来
+  position: 12
+
+# == Schema Information
+#
+# Table name: content_types
+#
+#  id           :integer          not null, primary key
+#  name         :string           not null
+#  display_name :text
+#  note         :text
+#  position     :integer
+#  created_at   :datetime
+#  updated_at   :datetime
+#

data/spec/fixtures/frequencies.yml

@@ -0,0 +1,68 @@
+--- 
+frequency_00001: 
+  name: unknown
+  display_name: "en: unknown\r\n\
+    ja: 不明・不定期刊"
+  id: 1
+  position: 1
+frequency_00002: 
+  name: daily
+  display_name: "en: daily\r\n\
+    ja: 日刊"
+  id: 2
+  position: 2
+frequency_00003: 
+  name: weekly
+  display_name: "en: weekly\r\n\
+    ja: 週刊"
+  id: 3
+  position: 3
+frequency_00004: 
+  name: biweekly
+  display_name: "en: biweekly\r\n\
+    ja: 隔週刊"
+  id: 4
+  position: 4
+frequency_00005: 
+  name: monthly
+  display_name: "en: monthly\r\n\
+    ja: 月刊"
+  id: 5
+  position: 5
+frequency_00006: 
+  name: bimonthly
+  display_name: "en: bimonthly\r\n\
+    ja: 隔月刊"
+  id: 6
+  position: 6
+frequency_00007: 
+  name: quarterly
+  display_name: "en: quarterly\r\n\
+    ja: 季刊"
+  id: 7
+  position: 7
+frequency_00008: 
+  name: yearly
+  display_name: "en: yearly\r\n\
+    ja: 年刊"
+  id: 8
+  position: 8
+frequency_00009: 
+  name: biyearly
+  display_name: "en: biyearly\r\n\
+    ja: 隔年刊"
+  id: 9
+  position: 9
+
+# == Schema Information
+#
+# Table name: frequencies
+#
+#  id           :integer          not null, primary key
+#  name         :string           not null
+#  display_name :text
+#  note         :text
+#  position     :integer
+#  created_at   :datetime
+#  updated_at   :datetime
+#

data/spec/fixtures/items.yml

@@ -130,6 +130,8 @@ item_00012:
   manifestation_id: 2
   id: 12
   include_supplements: false
+  bookstore_id: 1
+  budget_type_id: 1
   created_at: 2007-08-24 23:46:11.484813 +09:00
 item_00013: 
   updated_at: 2007-08-24 23:46:12.484813 +09:00

data/spec/models/search_engine_spec.rb

@@ -5,7 +5,7 @@ describe SearchEngine do
   fixtures :search_engines
 
   it "should respond to search_params" do
-    search_engines(:search_engine_00001).search_params('test').should eq({:submit => 'Search', :locale => 'ja', :keyword => 'test'})
+    search_engines(:search_engine_00001).search_params('test').should eq({submit: 'Search', locale: 'ja', keyword: 'test'})
   end
 end
 

data/spec/models/user_export_file_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
   
 describe UserExportFile do
@@ -6,9 +5,7 @@ describe UserExportFile do
   
   it "should export users" do
     message_count = Message.count
-    file = UserExportFile.new
-    file.user = users(:admin)
-    file.save
+    file = UserExportFile.create(user: users(:admin))
     file.export!
     #UserExportFileJob.perform_later(file).should be_truthy
     Message.count.should eq message_count + 1

data/spec/models/user_import_file_spec.rb

@@ -13,10 +13,15 @@ describe UserImportFile do
     end
 
     it "should be imported" do
+      file = UserImportFile.new user_import: File.new("#{Rails.root}/../../examples/user_import_file_sample.tsv")
+      file.default_user_group = UserGroup.find(2)
+      file.default_library = Library.find(3)
+      file.user = users(:admin)
+      file.save
       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, :failed => 0, error: 3})
+      file.current_state.should eq 'pending'
+      file.import_start.should eq({user_imported: 5, user_found: 0, failed: 0, error: 3})
       User.order('id DESC')[1].username.should eq 'user005'
       User.order('id DESC')[2].username.should eq 'user003'
       User.count.should eq old_users_count + 5
@@ -68,12 +73,12 @@ describe UserImportFile do
       user006.profile.user_number.should be_nil
       user006.profile.user_group.name.should eq UserGroup.find(2).name
 
-      @file.user_import_fingerprint.should be_truthy
-      @file.executed_at.should be_truthy
+      file.user_import_fingerprint.should be_truthy
+      file.executed_at.should be_truthy
 
-      @file.reload
-      @file.error_message.should eq "次の列は無視されました。 save_search_history, share_bookmarks, invalid\nline 8: パスワードは6文字以上で入力してください。\nline 9: 利用者番号は不正な値です。\nline 10: 利用者番号はすでに存在します。"
-      @file.current_state.should eq 'failed'
+      file.reload
+      file.error_message.should eq "次の列は無視されました。 save_search_history, share_bookmarks, invalid\nline 8: パスワードは6文字以上で入力してください。\nline 9: 利用者番号は不正な値です。\nline 10: 利用者番号はすでに存在します。"
+      file.current_state.should eq 'failed'
     end
 
     it "should send message when import is completed" do
@@ -88,7 +93,7 @@ describe UserImportFile do
       old_users_count = User.count
       old_import_results_count = UserImportResult.count
       @file.user = User.where(username: 'librarian1').first
-      @file.import_start.should eq({:user_imported => 4, :user_found => 0, :failed => 1, error: 3})
+      @file.import_start.should eq({user_imported: 4, user_found: 0, failed: 1, error: 3})
       User.order('id DESC')[1].username.should eq 'user005'
       User.count.should eq old_users_count + 4
       UserImportResult.count.should eq old_import_results_count + 10
@@ -103,7 +108,12 @@ describe UserImportFile do
       )
     end
     it "should update users" do
-      @file = UserImportFile.create user_import: File.new("#{Rails.root}/../../examples/user_update_file.tsv"), user: users(:admin)
+      @file = UserImportFile.create!(
+        user_import: File.new("#{Rails.root}/../../examples/user_update_file.tsv"),
+        user: users(:admin),
+        default_library: libraries(:library_00001),
+        default_user_group: user_groups(:user_group_00001)
+      )
       old_message_count = Message.count
       result = @file.modify
       result.should have_key(:user_updated)
@@ -127,8 +137,13 @@ describe UserImportFile do
         note: 'Note',
         keyword_list: 'keyword1 keyword2',
         date_of_birth: 10.years.ago)
-      @file = UserImportFile.create user_import: File.new("#{Rails.root}/../../examples/user_update_file2.tsv"), user: users(:admin)
-      result = @file.modify
+      file = UserImportFile.create!(
+        user_import: File.new("#{Rails.root}/../../examples/user_update_file2.tsv"),
+        user: users(:admin),
+        default_user_group: UserGroup.find(2),
+        default_library: Library.find(3)
+      )
+      result = file.modify
       result.should have_key(:user_updated)
       user001 = User.friendly.find('user001')
       user001.email.should eq 'user001@example.jp'
@@ -138,15 +153,25 @@ describe UserImportFile do
       user001.profile.keyword_list.should eq 'keyword1 keyword2'
     end
     it "should update user_number" do
-      @file = UserImportFile.create user_import: File.new("#{Rails.root}/../../examples/user_update_file3.tsv"), user: users(:admin)
-      result = @file.modify
+      file = UserImportFile.create!(
+        user_import: File.new("#{Rails.root}/../../examples/user_update_file3.tsv"),
+        user: users(:admin),
+        default_user_group: UserGroup.find(2),
+        default_library: Library.find(3)
+      )
+      result = file.modify
       result.should have_key(:user_updated)
       user001 = User.where(username: 'user001').first
       user001.profile.user_number.should eq '0001'
     end
     it "should update user's lock status" do
-      @file = UserImportFile.create user_import: File.new("#{Rails.root}/../../examples/user_update_file4.tsv"), user: users(:admin)
-      result = @file.modify
+      file = UserImportFile.create!(
+        user_import: File.new("#{Rails.root}/../../examples/user_update_file4.tsv"),
+        user: users(:admin),
+        default_user_group: UserGroup.find(2),
+        default_library: Library.find(3)
+      )
+      result = file.modify
       result.should have_key(:user_updated)
       user001 = User.where(username: 'user001').first
       user001.access_locked?.should be_truthy
@@ -155,20 +180,25 @@ describe UserImportFile do
 
   describe "when its mode is 'destroy'" do
     before(:each) do
-      @file = UserImportFile.new user_import: File.new("#{Rails.root}/../../examples/user_import_file_sample.tsv"), user: users(:admin)
-      @file.user = users(:admin)
-      @file.default_user_group = UserGroup.find(2)
-      @file.default_library = Library.find(3)
-      @file.save
-      @file.import_start
+      file = UserImportFile.create!(
+        user_import: File.new("#{Rails.root}/../../examples/user_import_file_sample.tsv"),
+        user: users(:admin),
+        default_user_group: UserGroup.find(2),
+        default_library: Library.find(3)
+      )
+      file.import_start
     end
 
     it "should remove users" do
       old_count = User.count
-      @file = UserImportFile.create user_import: File.new("#{Rails.root}/../../examples/user_delete_file.tsv"), user: users(:admin)
-      @file.user = users(:admin)
+      file = UserImportFile.create!(
+        user_import: File.new("#{Rails.root}/../../examples/user_delete_file.tsv"),
+        user: users(:admin),
+        default_user_group: UserGroup.find(2),
+        default_library: Library.find(3)
+      )
       old_message_count = Message.count
-      @file.remove
+      file.remove
       User.count.should eq old_count - 2
       Message.count.should eq old_message_count + 1
     end
@@ -177,8 +207,13 @@ describe UserImportFile do
       user001 = User.where(username: 'user001').first
       FactoryBot.create(:checkout, user: user001, item: FactoryBot.create(:item))
       old_count = User.count
-      @file = UserImportFile.create user_import: File.new("#{Rails.root}/../../examples/user_delete_file.tsv"), user: users(:admin)
-      @file.remove
+      file = UserImportFile.create!(
+        user_import: File.new("#{Rails.root}/../../examples/user_delete_file.tsv"),
+        user: users(:admin),
+        default_user_group: UserGroup.find(2),
+        default_library: Library.find(3)
+      )
+      file.remove
       User.where(username: 'user001').should_not be_blank
       User.count.should eq old_count - 2
     end

data/spec/rails_helper.rb

@@ -12,7 +12,6 @@ require 'spec_helper'
 require 'rspec/rails'
 # Add additional requires below this line. Rails is not loaded until this point!
 require 'factory_bot'
-require 'sunspot-rails-tester'
 require 'rspec/active_model/mocks'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
@@ -59,20 +58,7 @@ RSpec.configure do |config|
   # https://relishapp.com/rspec/rspec-rails/docs
   config.infer_spec_type_from_file_location!
 
-  config.extend ControllerMacros, :type => :controller
-
-  $original_sunspot_session = Sunspot.session
-
-  config.before do
-    Sunspot.session = Sunspot::Rails::StubSessionProxy.new($original_sunspot_session)
-  end
-
-  config.before :each, :solr => true do
-    Sunspot::Rails::Tester.start_original_sunspot_session
-    Sunspot.session = $original_sunspot_session
-    Sunspot.config.solr.url = 'http://127.0.0.1:8981/solr/test'
-    Sunspot.remove_all!
-  end
+  config.extend ControllerMacros, type: :controller
 end
 
 FactoryBot.definition_file_paths << "#{::Rails.root}/../../spec/factories"

data/spec/routing/accepts_routing_spec.rb

@@ -12,7 +12,7 @@ describe AcceptsController do
     end
 
     it "routes to #show" do
-      get("/accepts/1").should route_to("accepts#show", :id => "1")
+      get("/accepts/1").should route_to("accepts#show", id: "1")
     end
 
     it "routes to #create" do
@@ -20,7 +20,7 @@ describe AcceptsController do
     end
 
     it "routes to #destroy" do
-      delete("/accepts/1").should route_to("accepts#destroy", :id => "1")
+      delete("/accepts/1").should route_to("accepts#destroy", id: "1")
     end
 
   end