enju_biblio 0.2.3 → 0.2.4

data/spec/models/resource_export_file_spec.rb

@@ -28,9 +28,9 @@ describe ResourceExportFile do
   end
 
   it "should export NCID value" do
-    manifestation = FactoryGirl.create(:manifestation)
+    manifestation = FactoryBot.create(:manifestation)
     ncid = IdentifierType.where(name: "ncid").first
-    identifier = FactoryGirl.create(:identifier, identifier_type: ncid, body: "BA91833159")
+    identifier = FactoryBot.create(:identifier, identifier_type: ncid, body: "BA91833159")
     manifestation.identifiers << identifier
     manifestation.save!
     export_file = ResourceExportFile.new
@@ -45,8 +45,8 @@ describe ResourceExportFile do
   end
 
   it "should export carrier_type" do
-    carrier_type = FactoryGirl.create(:carrier_type)
-    manifestation = FactoryGirl.create(:manifestation, carrier_type: carrier_type)
+    carrier_type = FactoryBot.create(:carrier_type)
+    manifestation = FactoryBot.create(:manifestation, carrier_type: carrier_type)
     manifestation.save!
     export_file = ResourceExportFile.new
     export_file.user = users(:admin)
@@ -67,9 +67,9 @@ describe ResourceExportFile do
   end
 
   it "should export total_checkouts" do
-    item1 = FactoryGirl.create(:item)
-    item2 = FactoryGirl.create(:item)
-    checkout = FactoryGirl.create(:checkout, item: item2)
+    item1 = FactoryBot.create(:item)
+    item2 = FactoryBot.create(:item)
+    checkout = FactoryBot.create(:checkout, item: item2)
     export_file = ResourceExportFile.new
     export_file.user = users(:admin)
     export_file.save!

data/spec/models/resource_import_file_spec.rb

@@ -278,6 +278,25 @@ resource_import_file_test_transcription	transcription
         expect(manifestation.title_transcription).to eq "transcription"
       end
     end
+
+    describe "when it contains escaped fields" do
+      it "should be imported as escaped" do
+        import_file = <<-EOF
+original_title	description	note	call_number	item_note
+resource_import_file_test_description	test\\ntest	test\\ntest	test_description	test\\ntest
+        EOF
+        file = ResourceImportFile.create(resource_import: StringIO.new(import_file))
+        file.user = users(:admin)
+        old_manifestations_count = Manifestation.count
+        result = file.import_start
+        expect(Manifestation.count).to eq old_manifestations_count + 1
+        manifestation = Manifestation.all.find{|m| m.original_title == "resource_import_file_test_description" }
+        expect(manifestation.description).to eq "test\ntest"
+        expect(manifestation.note).to eq "test\ntest"
+        p manifestation.items
+        expect(manifestation.items.first.note).to eq "test\ntest"
+      end
+    end
   end
 
   describe "when its mode is 'update'" do

data/spec/models/series_statement_spec.rb

@@ -4,7 +4,7 @@ describe SeriesStatement do
   fixtures :all
 
   it "should create manifestation" do
-    series_statement = FactoryGirl.create(:series_statement)
+    series_statement = FactoryBot.create(:series_statement)
     series_statement.root_manifestation.should be_nil
   end
 end

data/spec/policies/manifestation_policy_spec.rb

@@ -4,19 +4,19 @@ describe ManifestationPolicy do
   subject { described_class }
   permissions :destroy? do
     before(:each) do
-      @admin = FactoryGirl.create(:admin)
+      @admin = FactoryBot.create(:admin)
     end
     it "grants destroy if it is a simple record." do
-      record = FactoryGirl.create(:manifestation)
+      record = FactoryBot.create(:manifestation)
       expect(subject).to permit(@admin, record)
     end
     it "not grants destroy if it is reserved" do
-      record = FactoryGirl.create(:manifestation)
-      reserve = FactoryGirl.create(:reserve, manifestation_id: record.id)
+      record = FactoryBot.create(:manifestation)
+      reserve = FactoryBot.create(:reserve, manifestation_id: record.id)
       expect(subject).not_to permit(@admin, record)
     end
     it "grants destroy if it is a simple serial record." do
-      record = FactoryGirl.create(:manifestation_serial)
+      record = FactoryBot.create(:manifestation_serial)
       policy = Pundit.policy(@admin, record)
       expect(subject).to permit(@admin, record)
     end

data/spec/rails_helper.rb

@@ -12,7 +12,7 @@ require 'spec_helper'
 require 'rspec/rails'
 # Add additional requires below this line. Rails is not loaded until this point!
 require 'vcr'
-require 'factory_girl'
+require 'factory_bot'
 require 'sunspot-rails-tester'
 require 'rspec/active_model/mocks'
 require 'pundit/rspec'
@@ -77,6 +77,6 @@ RSpec.configure do |config|
   end
 end
 
-FactoryGirl.definition_file_paths << "#{::Rails.root}/../../spec/factories"
-FactoryGirl.find_definitions
+FactoryBot.definition_file_paths << "#{::Rails.root}/../../spec/factories"
+FactoryBot.find_definitions
 

data/spec/support/controller_macros.rb

@@ -2,21 +2,21 @@ module ControllerMacros
   def login_admin
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:admin]
-      sign_in FactoryGirl.create(:admin)
+      sign_in FactoryBot.create(:admin)
     end
   end
 
   def login_librarian
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:librarian]
-      sign_in FactoryGirl.create(:librarian)
+      sign_in FactoryBot.create(:librarian)
     end
   end
 
   def login_user
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:user]
-      sign_in FactoryGirl.create(:user)
+      sign_in FactoryBot.create(:user)
     end
   end
 

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

@@ -5,14 +5,14 @@ describe "items/index" do
   before(:each) do
     @items = assign(:items,
       Kaminari.paginate_array( [
-        FactoryGirl.create(:item),
+        FactoryBot.create(:item),
       ], total_count: 1).page(1)
     )
     facet1 = double("Facet for available on shelf")
     allow(facet1).to receive(:count).and_return(1)
     allow(facet1).to receive(:value).and_return("Available On Shelf")
     @circulation_status_facet = assign(:circulation_status_facet, [facet1])
-    user = FactoryGirl.create(:librarian)
+    user = FactoryBot.create(:librarian)
     allow(view).to receive(:policy) do |record|
       Pundit.policy(user, record)
     end

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

@@ -4,7 +4,7 @@ describe "manifestations/index" do
   before(:each) do
     @manifestations = assign(:manifestations,
       Kaminari.paginate_array( [
-        FactoryGirl.create(:manifestation),
+        FactoryBot.create(:manifestation),
       ], total_count: 1).page(1)
     )
     @index_agent = {}

data/spec/views/manifestations/index.rdf.builder_spec.rb

@@ -2,7 +2,7 @@ require "rails_helper.rb"
 
 describe "manifestations/index.rdf.builder" do
   before(:each) do
-    manifestation = FactoryGirl.create(:manifestation)
+    manifestation = FactoryBot.create(:manifestation)
     @manifestations = assign(:manifestations, [ manifestation ] )
     @library_group = LibraryGroup.first
     view.stub(:filtered_params).and_return(ActionController::Parameters.new(per_page: 50))

data/spec/views/manifestations/index.txt.erb_spec.rb

@@ -2,8 +2,8 @@ require "rails_helper.rb"
 
 describe "manifestations/index.txt.erb" do
   before(:each) do
-    manifestation = FactoryGirl.create(:manifestation)
-    manifestation.items << FactoryGirl.create(:item, bookstore_id: 1, budget_type_id: 1, price: 100)
+    manifestation = FactoryBot.create(:manifestation)
+    manifestation.items << FactoryBot.create(:item, bookstore_id: 1, budget_type_id: 1, price: 100)
     @manifestations = assign(:manifestations, [ manifestation ] )
   end
 

data/spec/views/manifestations/show.html.erb_spec.rb

@@ -4,7 +4,7 @@ describe "manifestations/show" do
   fixtures :all
 
   before(:each) do
-    assign(:manifestation, FactoryGirl.create(:manifestation))
+    assign(:manifestation, FactoryBot.create(:manifestation))
     allow(view).to receive(:policy).and_return double(create?: false, udpate?: false, destroy?: false)
   end
 
@@ -24,12 +24,12 @@ describe "manifestations/show" do
 
   describe "when logged in as Librarian" do
     before(:each) do
-      user = assign(:profile, FactoryGirl.create(:librarian))
+      user = assign(:profile, FactoryBot.create(:librarian))
       view.stub(:current_user).and_return(user)
       allow(view).to receive(:policy).and_return double(create?: true, update?: true, destroy?: true)
     end
     it "should have an ISBD separator for extent and dimensions" do
-      assign(:manifestation, FactoryGirl.create(:manifestation, extent: "extent value", dimensions: "dimensions value"))
+      assign(:manifestation, FactoryBot.create(:manifestation, extent: "extent value", dimensions: "dimensions value"))
       render
       expect(rendered).to match /\s+;\s+/
     end
@@ -41,11 +41,11 @@ describe "manifestations/show" do
   end
   describe "when logged in as User" do
     before(:each) do
-      user = assign(:profile, FactoryGirl.create(:user))
+      user = assign(:profile, FactoryBot.create(:user))
       view.stub(:current_user).and_return(user)
     end
     it "should have an ISBD separator for extent and dimensions" do
-      assign(:manifestation, FactoryGirl.create(:manifestation, extent: "extent value", dimensions: "dimensions value"))
+      assign(:manifestation, FactoryBot.create(:manifestation, extent: "extent value", dimensions: "dimensions value"))
       render
       expect(rendered).to match /\s+;\s+/
     end

data/spec/views/manifestations/show.txt.erb_spec.rb

@@ -4,7 +4,7 @@ describe "manifestations/show.txt.erb" do
   fixtures :all
 
   before(:each) do
-    assign(:manifestation, FactoryGirl.create(:manifestation))
+    assign(:manifestation, FactoryBot.create(:manifestation))
   end
 
   it "renders info" do

data/spec/views/series_statement_merges/show.html.erb_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 describe "series_statement_merges/show" do
   before(:each) do
-    @series_statement_merge = assign(:series_statement_merge, FactoryGirl.create(:series_statement_merge))
+    @series_statement_merge = assign(:series_statement_merge, FactoryBot.create(:series_statement_merge))
   end
 
   it "renders attributes in <p>" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_biblio
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-12 00:00:00.000000000 Z
+date: 2018-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_library
@@ -128,28 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: enju_subject
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: enju_inventory
   requirement: !ruby/object:Gem::Requirement
@@ -170,42 +170,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: enju_event
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: enju_circulation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: enju_ndl
   requirement: !ruby/object:Gem::Requirement
@@ -291,7 +291,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -310,14 +310,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
@@ -985,6 +985,7 @@ files:
 - db/migrate/20160801080643_add_most_recent_to_agent_import_file_transitions.rb
 - db/migrate/20160811102604_add_picture_width_to_picture_file.rb
 - db/migrate/20160820004638_add_attachment_attachment_to_carrier_types.rb
+- db/migrate/20171119051258_set_not_null_to_manifestation_id_on_items.rb
 - lib/enju_biblio.rb
 - lib/enju_biblio/biblio_helper.rb
 - lib/enju_biblio/engine.rb
@@ -1247,6 +1248,9 @@ files:
 - spec/dummy/db/migrate/20160813192542_add_pub_year_facet_range_interval_to_library_group.rb
 - 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/20171014084528_add_header_logo_to_library_group.rb
+- spec/dummy/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb
+- spec/dummy/db/migrate/20171126135238_add_foreign_key_to_library_group_id_on_library.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -1530,7 +1534,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: enju_biblio plugin
@@ -1595,7 +1599,9 @@ test_files:
 - 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/20081030023412_create_checkout_types.rb
+- spec/dummy/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb
 - spec/dummy/db/migrate/20140810091231_add_checkout_icalendar_token_to_profile.rb
+- spec/dummy/db/migrate/20171014084528_add_header_logo_to_library_group.rb
 - spec/dummy/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb
 - spec/dummy/db/migrate/20130504143515_add_manifestation_id_to_classification.rb
 - spec/dummy/db/migrate/20160703190209_add_foreign_key_on_manifestation_id_to_reserve.rb
@@ -1666,6 +1672,7 @@ test_files:
 - spec/dummy/db/migrate/20140811031145_add_expired_at_to_profile.rb
 - spec/dummy/db/migrate/20081028093607_create_event_import_files.rb
 - spec/dummy/db/migrate/041_create_roles.rb
+- spec/dummy/db/migrate/20171126135238_add_foreign_key_to_library_group_id_on_library.rb
 - spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb
 - spec/dummy/db/migrate/20140528045518_create_user_checkout_stat_transitions.rb
 - spec/dummy/db/migrate/20160703184747_add_most_recent_to_user_checkout_stat_transitions.rb