RubyGems - enju_biblio - Versions diffs - 0.2.5 → 0.3.0.beta.2 - Mend

enju_biblio 0.2.5 → 0.3.0.beta.2

Files changed (513) hide show

@@ -8,6 +8,6 @@ FactoryBot.define do
 end
 FactoryBot.define do
-  factory :invalid_agent, :class => Agent do |f|
+  factory :invalid_agent, class: Agent do |f|
   end
 end

data/spec/factories/{patron_relationship.rb → agent_relationship.rb} RENAMED

@@ -2,5 +2,6 @@ FactoryBot.define do
   factory :agent_relationship do |f|
     f.parent_id{FactoryBot.create(:agent).id}
     f.child_id{FactoryBot.create(:agent).id}
+    f.association :agent_relationship_type
   end
 end

data/spec/factories/{patron_relationship_type.rb → agent_relationship_type.rb} RENAMED

File without changes

data/spec/factories/{patron_type.rb → agent_type.rb} RENAMED

File without changes

data/spec/factories/bookstores.rb ADDED

@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :bookstore do
+    sequence(:name){|n| "bookstore_#{n}"}
+  end
+end

data/spec/factories/budget_types.rb ADDED

@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :budget_type do
+    sequence(:name){|n| "budget_type_#{n}"}
+  end
+end

data/spec/factories/checkout.rb CHANGED

@@ -1,5 +1,5 @@
 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

data/spec/factories/create.rb CHANGED

@@ -1,6 +1,7 @@
 FactoryBot.define do
-  factory :create do |f|
-    f.work_id{FactoryBot.create(:manifestation).id}
-    f.agent_id{FactoryBot.create(:agent).id}
+  factory :create do
+    work_id{FactoryBot.create(:manifestation).id}
+    agent_id{FactoryBot.create(:agent).id}
+    association :create_type
   end
 end

data/spec/factories/identifier.rb CHANGED

@@ -1,6 +1,6 @@
 FactoryBot.define do
-  factory :identifier do |f|
-    f.sequence(:body){|n| "identifier_body_#{n}"}
-    f.identifier_type_id{FactoryBot.create(:identifier_type).id}
+  factory :identifier do
+    sequence(:body){|n| "identifier_body_#{n}"}
+    identifier_type_id{FactoryBot.create(:identifier_type).id}
   end
 end

data/spec/factories/import_request.rb CHANGED

@@ -1,5 +1,6 @@
 FactoryBot.define do
-  factory :import_request do |f|
-    f.sequence(:isbn){|n| "isbn_#{n}"}
+  factory :import_request do
+    sequence(:isbn){|n| "isbn_#{n}"}
+    association :user, factory: :librarian
   end
 end

data/spec/factories/item.rb CHANGED

@@ -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}
-    f.manifestation_id{FactoryBot.create(:manifestation).id}
+  factory :item do
+    sequence(:item_identifier){|n| "item_#{n}"}
+    circulation_status_id{CirculationStatus.find(1).id}
+    manifestation_id{FactoryBot.create(:manifestation).id}
+    association :bookstore
+    association :budget_type
   end
 end

data/spec/factories/library.rb CHANGED

@@ -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_relationship.rb CHANGED

@@ -1,6 +1,7 @@
 FactoryBot.define do
-  factory :manifestation_relationship do |f|
-    f.parent_id{FactoryBot.create(:manifestation).id}
-    f.child_id{FactoryBot.create(:manifestation).id}
+  factory :manifestation_relationship do
+    parent_id{FactoryBot.create(:manifestation).id}
+    child_id{FactoryBot.create(:manifestation).id}
+    association :manifestation_relationship_type
   end
 end

data/spec/factories/manifestation_relationship_type.rb CHANGED

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :manifestation_relationship_type do |f|
-    f.sequence(:name){|n| "manifestation_relationship_type_#{n}"}
+  factory :manifestation_relationship_type do
+    sequence(:name){|n| "manifestation_relationship_type_#{n}"}
   end
 end

data/spec/factories/profile.rb CHANGED

@@ -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/models/agent_import_file_spec.rb CHANGED

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 describe AgentImportFile do
@@ -6,14 +5,14 @@ describe AgentImportFile do
   describe "when its mode is 'create'" do
     before(:each) do
-      @file = AgentImportFile.create! :agent_import => File.new("#{Rails.root.to_s}/../../examples/agent_import_file_sample1.tsv")
+      @file = AgentImportFile.create! agent_import: File.new("#{Rails.root}/../../examples/agent_import_file_sample1.tsv"), user: users(:admin)
     end
     it "should be imported" do
       old_agents_count = Agent.count
       old_import_results_count = AgentImportResult.count
       @file.current_state.should eq 'pending'
-      @file.import_start.should eq({:agent_imported => 3, :user_imported => 0, :failed => 0})
+      @file.import_start.should eq({agent_imported: 3, user_imported: 0, failed: 0})
       Agent.order('id DESC')[0].full_name.should eq '原田 ushi 隆史'
       Agent.order('id DESC')[1].full_name.should eq '田辺浩介'
       Agent.order('id DESC')[2].date_of_birth.should eq Time.zone.parse('1978-01-01')
@@ -28,14 +27,17 @@ describe AgentImportFile do
   describe "when it is written in shift_jis" do
     before(:each) do
-      @file = AgentImportFile.create! :agent_import => File.new("#{Rails.root.to_s}/../../examples/agent_import_file_sample3.tsv")
+      @file = AgentImportFile.create!(
+        agent_import: File.new("#{Rails.root}/../../examples/agent_import_file_sample3.tsv"),
+        user: users(:admin)
+      )
     end
     it "should be imported" do
       old_agents_count = Agent.count
       old_import_results_count = AgentImportResult.count
       @file.current_state.should eq 'pending'
-      @file.import_start.should eq({:agent_imported => 4, :user_imported => 0, :failed => 0})
+      @file.import_start.should eq({agent_imported: 4, user_imported: 0, failed: 0})
       Agent.count.should eq old_agents_count + 4
       Agent.order('id DESC')[0].full_name.should eq '原田 ushi 隆史'
       Agent.order('id DESC')[1].full_name.should eq '田辺浩介'
@@ -48,8 +50,11 @@ describe AgentImportFile do
   describe "when its mode is 'update'" do
     it "should update users" do
-      @file = AgentImportFile.create :agent_import => File.new("#{Rails.root.to_s}/../../examples/agent_update_file.tsv")
-      @file.modify
+      file = AgentImportFile.create!(
+        agent_import: File.new("#{Rails.root}/../../examples/agent_update_file.tsv"),
+        user: users(:admin)
+      )
+      file.modify
       agent_1 = Agent.find(1)
       agent_1.full_name.should eq 'たなべこうすけ'
       agent_1.address_1.should eq '東京都'
@@ -62,14 +67,17 @@ describe AgentImportFile do
   describe "when its mode is 'destroy'" do
     it "should remove users" do
       old_count = Agent.count
-      @file = AgentImportFile.create :agent_import => File.new("#{Rails.root.to_s}/../../examples/agent_delete_file.tsv")
-      @file.remove
+      file = AgentImportFile.create!(
+        agent_import: File.new("#{Rails.root}/../../examples/agent_delete_file.tsv"),
+        user: users(:admin)
+      )
+      file.remove
       Agent.count.should eq old_count - 7
     end
   end
   it "should import in background" do
-    file = AgentImportFile.create :agent_import => File.new("#{Rails.root.to_s}/../../examples/agent_import_file_sample1.tsv")
+    file = AgentImportFile.create agent_import: File.new("#{Rails.root}/../../examples/agent_import_file_sample1.tsv")
     file.user = users(:admin)
     file.save
     AgentImportFileJob.perform_later(file).should be_truthy

data/spec/models/agent_import_result_spec.rb CHANGED

@@ -1,8 +1,7 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 describe AgentImportResult do
-  #pending "add some examples to (or delete) #{__FILE__}"
+  # pending "add some examples to (or delete) #{__FILE__}"
 end

data/spec/models/agent_merge_list_spec.rb CHANGED

@@ -1,8 +1,7 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 describe AgentMergeList do
-  #pending "add some examples to (or delete) #{__FILE__}"
+  # pending "add some examples to (or delete) #{__FILE__}"
 end

data/spec/models/agent_merge_spec.rb CHANGED

@@ -1,8 +1,7 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 describe AgentMerge do
-  #pending "add some examples to (or delete) #{__FILE__}"
+  # pending "add some examples to (or delete) #{__FILE__}"
 end

data/spec/models/agent_relationship_spec.rb CHANGED

@@ -1,8 +1,7 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 describe AgentRelationship do
-  #pending "add some examples to (or delete) #{__FILE__}"
+  # pending "add some examples to (or delete) #{__FILE__}"
 end

data/spec/models/agent_relationship_type_spec.rb CHANGED

@@ -1,8 +1,7 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 describe AgentRelationshipType do
-  #pending "add some examples to (or delete) #{__FILE__}"
+  # pending "add some examples to (or delete) #{__FILE__}"
 end

data/spec/models/agent_spec.rb CHANGED

@@ -1,8 +1,7 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 describe Agent do
-  #pending "add some examples to (or delete) #{__FILE__}"
+  # pending "add some examples to (or delete) #{__FILE__}"
   fixtures :all
   it "should set a default required_role to Guest" do
@@ -11,17 +10,17 @@ describe Agent do
   end
   it "should set birth_date" do
-    agent = FactoryBot.create(:agent, :birth_date => '2000')
+    agent = FactoryBot.create(:agent, birth_date: '2000')
     agent.date_of_birth.should eq Time.zone.parse('2000-01-01')
   end
   it "should set death_date" do
-    agent = FactoryBot.create(:agent, :death_date => '2000')
+    agent = FactoryBot.create(:agent, death_date: '2000')
     agent.date_of_death.should eq Time.zone.parse('2000-01-01')
   end
   it "should not set death_date earlier than birth_date" do
-    agent = FactoryBot.create(:agent, :birth_date => '2010', :death_date => '2000')
+    agent = FactoryBot.create(:agent, birth_date: '2010', death_date: '2000')
     agent.should_not be_valid
   end

data/spec/models/agent_type_spec.rb CHANGED

@@ -1,8 +1,7 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 describe AgentType do
-  #pending "add some examples to (or delete) #{__FILE__}"
+  # pending "add some examples to (or delete) #{__FILE__}"
 end

data/spec/models/carrier_type_spec.rb CHANGED

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 describe CarrierType do

data/spec/models/content_type_spec.rb CHANGED

@@ -1,8 +1,7 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 describe ContentType do
-  #pending "add some examples to (or delete) #{__FILE__}"
+  # pending "add some examples to (or delete) #{__FILE__}"
 end

data/spec/models/country_spec.rb CHANGED

@@ -1,8 +1,7 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 describe Country do
-  #pending "add some examples to (or delete) #{__FILE__}"
+  # pending "add some examples to (or delete) #{__FILE__}"
 end

data/spec/models/create_spec.rb CHANGED

@@ -1,8 +1,7 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 describe Create do
-  #pending "add some examples to (or delete) #{__FILE__}"
+  # pending "add some examples to (or delete) #{__FILE__}"
 end

data/spec/models/donate_spec.rb CHANGED

@@ -1,8 +1,7 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 describe Donate do
-  #pending "add some examples to (or delete) #{__FILE__}"
+  # pending "add some examples to (or delete) #{__FILE__}"
 end

data/spec/models/form_of_work_spec.rb CHANGED

@@ -1,8 +1,7 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 describe FormOfWork do
-  #pending "add some examples to (or delete) #{__FILE__}"
+  # pending "add some examples to (or delete) #{__FILE__}"
 end

data/spec/models/frequency_spec.rb CHANGED

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 describe Frequency do

data/spec/models/identifier_spec.rb CHANGED

@@ -1,8 +1,7 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 describe Identifier do
-  #pending "add some examples to (or delete) #{__FILE__}"
+  # pending "add some examples to (or delete) #{__FILE__}"
 end

data/spec/models/identifier_type_spec.rb CHANGED

@@ -1,8 +1,7 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 describe IdentifierType do
-  #pending "add some examples to (or delete) #{__FILE__}"
+  # pending "add some examples to (or delete) #{__FILE__}"
 end

data/spec/models/import_request_spec.rb CHANGED

@@ -1,13 +1,12 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 describe ImportRequest do
   fixtures :all
   context "import" do
-    it "should import bibliographic record", :vcr => true do
+    it "should import bibliographic record", vcr: true do
       old_count = Manifestation.count
-      import_request = ImportRequest.create(:isbn => '9784797350999')
+      import_request = ImportRequest.create(isbn: '9784797350999')
       import_request.import!
       Manifestation.count.should eq old_count + 1
     end

data/spec/models/item_spec.rb CHANGED

@@ -1,8 +1,7 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 describe Item do
-  #pending "add some examples to (or delete) #{__FILE__}"
+  # pending "add some examples to (or delete) #{__FILE__}"
   fixtures :all
   it "should be rent" do
@@ -44,7 +43,7 @@ describe Item do
   it "should delete lending policies" do
     item = items(:item_00001)
-    item.checkout_type = CheckoutType.where(:name => 'serial').first
+    item.checkout_type = CheckoutType.where(name: 'serial').first
     item.save
     item.reload
     item.lending_policies.count.should eq 0

data/spec/models/language_spec.rb CHANGED

@@ -1,8 +1,7 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 describe Language do
-  #pending "add some examples to (or delete) #{__FILE__}"
+  # pending "add some examples to (or delete) #{__FILE__}"
 end

data/spec/models/license_spec.rb CHANGED

@@ -1,8 +1,7 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 describe License do
-  #pending "add some examples to (or delete) #{__FILE__}"
+  # pending "add some examples to (or delete) #{__FILE__}"
 end