enju_biblio 0.3.13 → 0.4.0.beta.1

data/spec/models/realize_type_spec.rb

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

data/spec/models/resource_export_file_spec.rb

@@ -26,10 +26,10 @@ describe ResourceExportFile do
     expect(columns).to include "item_price"
   end
 
-  it "should export custom identifier's value" do
+  it "should export NCID value" do
     manifestation = FactoryBot.create(:manifestation)
-    custom = IdentifierType.find_by(name: "custom")
-    identifier = FactoryBot.create(:identifier, identifier_type: custom, body: "a11223344")
+    ncid = IdentifierType.find_by(name: "ncid")
+    identifier = FactoryBot.create(:identifier, identifier_type: ncid, body: "BA91833159")
     export_file = ResourceExportFile.new
     export_file.user = users(:admin)
     export_file.save!
@@ -37,8 +37,8 @@ describe ResourceExportFile do
     file = export_file.resource_export
     expect(file).to be_truthy
     lines = File.open(file.path).readlines.map(&:chomp)
-    expect(lines.first.split(/\t/)).to include "identifier:custom"
-    expect(lines.last.split(/\t/)).to include "a11223344"
+    expect(lines.first.split(/\t/)).to include "ncid"
+    expect(lines.last.split(/\t/)).to include "BA91833159"
   end
 
   it "should export carrier_type" do
@@ -50,7 +50,9 @@ describe ResourceExportFile do
     export_file.save!
     export_file.export!
     file = export_file.resource_export
-    CSV.open(file.path, {headers: true, col_sep: "\t"}).each do |row|
+    expect(file).to be_truthy
+    csv = CSV.open(file.path, {headers: true, col_sep: "\t"})
+    csv.each do |row|
       expect(row).to have_key "carrier_type"
       case row["manifestation_id"].to_i
       when 1
@@ -60,61 +62,6 @@ describe ResourceExportFile do
       end
     end
   end
-
-  it "should export create_type, realize_type and produce_type" do
-    export_file = ResourceExportFile.new
-    export_file.user = users(:admin)
-    export_file.save!
-    export_file.export!
-    file = export_file.resource_export
-    CSV.open(file.path, {headers: true, col_sep: "\t"}).each do |row|
-      manifestation = Manifestation.find(row['manifestation_id'])
-      manifestation.creates.each do |create|
-        if create.create_type
-          expect(row['creator']).to match "#{create.agent.full_name}||#{create.create_type.name}"
-        end
-      end
-
-      manifestation.realizes.each do |realize|
-        if realize.realize_type
-          expect(row['contributor']).to match "#{realize.agent.full_name}||#{realize.realize_type.name}"
-        end
-      end
-
-      manifestation.produces.each do |produce|
-        if produce.produce_type
-          expect(row['publisher']).to match "#{produce.agent.full_name}||#{produce.produce_type.name}"
-        end
-      end
-    end
-  end
-
-  it "should export custom properties" do
-    item = FactoryBot.create(:item)
-    3.times do
-      item.manifestation.manifestation_custom_values << FactoryBot.build(:manifestation_custom_value)
-    end
-    3.times do
-      item.item_custom_values << FactoryBot.build(:item_custom_value)
-    end
-    export_file = ResourceExportFile.new
-    export_file.user = users(:admin)
-    export_file.save!
-    export_file.export!
-    file = export_file.resource_export
-    CSV.open(file.path, {headers: true, col_sep: "\t"}).each do |row|
-      if row['manifestation_id'] == item.manifestation.id
-        item.manifestation_custom_values.each do |value|
-          expect(row).to have_key "manifestation:#{value.manifestation_custom_property.name}"
-          expect(row["manifestation:#{value.manifestation_custom_property.name}"]).to eq value
-        end
-        item.item_custom_values.each do |value|
-          expect(row).to have_key "item:#{value.item_custom_property.name}"
-          expect(row["item:#{value.item_custom_property.name}"]).to eq value
-        end
-      end
-    end
-  end
 end
 
 # == Schema Information
@@ -125,7 +72,7 @@ end
 #  user_id                      :integer
 #  resource_export_file_name    :string
 #  resource_export_content_type :string
-#  resource_export_file_size    :integer
+#  resource_export_file_size    :bigint
 #  resource_export_updated_at   :datetime
 #  executed_at                  :datetime
 #  created_at                   :datetime

data/spec/models/resource_import_file_spec.rb

@@ -9,8 +9,7 @@ describe ResourceImportFile do
         @file = ResourceImportFile.create(
           resource_import: File.new("#{Rails.root}/../../examples/resource_import_file_sample1.tsv"),
           default_shelf_id: 3,
-          user: users(:admin),
-          edit_mode: 'create'
+          user: users(:admin)
         )
       end
 
@@ -30,7 +29,7 @@ describe ResourceImportFile do
         Manifestation.count.should eq old_manifestations_count + 10
         Item.count.should eq old_items_count + 10
         Agent.count.should eq old_agents_count + 9
-        @file.resource_import_results.order(:id).first.body.split("\t").first.should eq 'imported_manifestation_id'
+        @file.resource_import_results.order(:id).first.body.split("\t").first.should eq 'manifestation_identifier'
         ResourceImportResult.count.should eq old_import_results_count + 23
 
         manifestation_101 = Manifestation.find_by(manifestation_identifier: '101')
@@ -157,16 +156,6 @@ describe ResourceImportFile do
         expect(manifestation.identifier_contents(:isbn)).to include("9784840239219")
         expect(manifestation.identifier_contents(:isbn)).to include("9784043898039")
       end
-
-      it "should import custom values", vcr: true do
-        @file.import_start
-        item_10102 = Item.find_by(item_identifier: '10102')
-        expect(item_10102.manifestation.manifestation_custom_values.pluck(:value)).to eq ['カスタム項目テスト1', 'カスタム項目テスト2']
-        expect(item_10102.item_custom_values.pluck(:value)).to eq []
-        item_10103 = Item.find_by(item_identifier: '10103')
-        expect(item_10103.manifestation.manifestation_custom_values.pluck(:value)).to eq ["カスタム項目テスト1", "カスタム項目テスト2"]
-        expect(item_10103.item_custom_values.pluck(:value)).to eq ['カスタム項目テスト3', 'カスタム項目テスト4']
-      end
     end
 
     describe "ISBN import" do
@@ -227,15 +216,15 @@ describe ResourceImportFile do
         old_items_count = Item.count
         old_agents_count = Agent.count
         old_import_results_count = ResourceImportResult.count
-        @file.import_start.should eq({manifestation_imported: 10, item_imported: 10, manifestation_found: 6, item_found: 3, failed: 7})
+        @file.import_start.should eq({manifestation_imported: 9, item_imported: 8, manifestation_found: 5, item_found: 3, failed: 7})
         manifestation = Item.find_by(item_identifier: '11111').manifestation
         manifestation.publishers.first.full_name.should eq 'test4'
         manifestation.publishers.first.full_name_transcription.should eq 'てすと4'
         manifestation.publishers.second.full_name_transcription.should eq 'てすと5'
-        Manifestation.count.should eq old_manifestations_count + 10
-        Item.count.should eq old_items_count + 10
+        Manifestation.count.should eq old_manifestations_count + 9
+        Item.count.should eq old_items_count + 8
         Agent.count.should eq old_agents_count + 9
-        ResourceImportResult.count.should eq old_import_results_count + 23
+        ResourceImportResult.count.should eq old_import_results_count + 21
         Item.find_by(item_identifier: '10101').manifestation.creators.size.should eq 2
         Item.find_by(item_identifier: '10101').manifestation.date_of_publication.should eq Time.zone.parse('2001-01-01')
         Item.find_by(item_identifier: '10102').manifestation.date_of_publication.should eq Time.zone.parse('2001-01-01')
@@ -346,28 +335,20 @@ resource_import_file_test_description	test\\ntest	test\\ntest	test_description	t
         expect(manifestation.items.first.note).to eq "test\ntest"
       end
     end
-
-    describe "when it contains custom properties" do
-      xit "should be imported" do
-      end
-    end
   end
 
   describe "when its mode is 'update'" do
-    before(:each) do
-      @file = ResourceImportFile.create!(
+    it "should update items", vcr: true do
+      file = ResourceImportFile.create!(
         resource_import: File.new("#{Rails.root}/../../examples/item_update_file.tsv"),
         user: users(:admin),
         edit_mode: 'update'
       )
-    end
-
-    it "should update items", vcr: true do
-      @file.modify
-      expect(@file.resource_import_results.first).to be_truthy
-      expect(@file.resource_import_results.first.body).to match /item_identifier/
+      file.modify
+      expect(file.resource_import_results.first).to be_truthy
+      expect(file.resource_import_results.first.body).to match /item_identifier/
       item_00001 = Item.find_by(item_identifier: '00001')
-      item_00001.manifestation.creators.order('agents.id').pluck(:full_name).should eq ['たなべ', 'こうすけ']
+      item_00001.manifestation.creators.order('agents.id').collect(&:full_name).should eq ['たなべ', 'こうすけ']
       item_00001.binding_item_identifier.should eq '900001'
       item_00001.binding_call_number.should eq '336|A'
       item_00001.binded_at.should eq Time.zone.parse('2014-08-16')
@@ -380,18 +361,7 @@ resource_import_file_test_description	test\\ntest	test\\ntest	test_description	t
       item_00003.include_supplements.should be_truthy
 
       Item.find_by(item_identifier: '00004').include_supplements.should be_falsy
-
-      item_00025 = Item.find_by(item_identifier: '00025')
-      expect(item_00025.manifestation.original_title).to eq "テスト4"
-      expect(item_00025.manifestation.subjects.pluck(:term)).to eq ['test2', 'test3']
-      expect(item_00025.call_number).to eq "547|ヤ"
-    end
-
-    it "should update custom values", vcr: true do
-      @file.import_start
-      item_00001 = Item.find_by(item_identifier: '00001')
-      expect(item_00001.manifestation.manifestation_custom_values.pluck(:manifestation_custom_property_id, :value)).to eq [[2, "カスタム項目5"]]
-      expect(item_00001.item_custom_values.order(:item_custom_property_id).first.value).to eq "カスタム項目6"
+      Item.find_by(item_identifier: '00025').call_number.should eq "547|ヤ"
     end
 
     # it "should update series_statement", vcr: true do
@@ -426,7 +396,7 @@ resource_import_file_test_description	test\\ntest	test\\ntest	test_description	t
         edit_mode: 'destroy'
       )
       file.remove
-      Item.count.should eq old_count - 10
+      Item.count.should eq old_count - 11
     end
   end
 

data/spec/rails_helper.rb

@@ -1,7 +1,11 @@
 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'
@@ -12,7 +16,7 @@ require 'spec_helper'
 require 'rspec/rails'
 # Add additional requires below this line. Rails is not loaded until this point!
 require 'vcr'
-require 'factory_bot_rails'
+require 'factory_bot'
 require 'rspec/active_model/mocks'
 require 'pundit/rspec'
 require "capybara/rspec"
@@ -70,5 +74,5 @@ RSpec.configure do |config|
   end
 end
 
-#FactoryBot.definition_file_paths << "#{::Rails.root}/../../spec/factories"
-#FactoryBot.find_definitions
+FactoryBot.definition_file_paths << "#{::Rails.root}/../../spec/factories"
+FactoryBot.find_definitions

data/spec/system/manifestations_spec.rb

@@ -18,18 +18,6 @@ RSpec.describe 'Manifestations', type: :system do
       visit manifestation_path(@item.manifestation.id, locale: :ja)
       expect(page).to have_content @item.item_identifier
     end
-
-    it 'should show memo' do
-      @item.manifestation.update(memo: 'memo')
-      visit manifestation_path(@item.manifestation.id, locale: :ja)
-      expect(page).to have_content @item.manifestation.memo
-    end
-
-    it 'should show custom properties' do
-      @item.manifestation.manifestation_custom_values << FactoryBot.build(:manifestation_custom_value)
-      visit manifestation_path(@item.manifestation.id, locale: :ja)
-      expect(page).to have_content @item.manifestation.manifestation_custom_values.first.value
-    end
   end
 
   describe 'When logged in as User' do
@@ -41,18 +29,6 @@ RSpec.describe 'Manifestations', type: :system do
       visit manifestation_path(@item.manifestation.id, locale: :ja)
       expect(page).to have_content @item.item_identifier
     end
-
-    it 'should not show memo' do
-      @item.manifestation.update(memo: 'memo')
-      visit manifestation_path(@item.manifestation.id, locale: :ja)
-      expect(page).not_to have_content @item.manifestation.memo
-    end
-
-    it 'should not show custom properties' do
-      @item.manifestation.manifestation_custom_values << FactoryBot.build(:manifestation_custom_value)
-      visit manifestation_path(@item.manifestation.id, locale: :ja)
-      expect(page).not_to have_content @item.manifestation.manifestation_custom_values.first.value
-    end
   end
 
   describe 'When not logged in' do
@@ -60,11 +36,5 @@ RSpec.describe 'Manifestations', type: :system do
       visit manifestation_path(@item.manifestation.id, locale: :ja)
       expect(page).to have_content @item.item_identifier
     end
-
-    it 'should not show memo' do
-      @item.manifestation.update(memo: 'memo')
-      visit manifestation_path(@item.manifestation.id, locale: :ja)
-      expect(page).not_to have_content @item.manifestation.memo
-    end
   end
 end

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

@@ -8,19 +8,18 @@ describe "items/index" do
         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 = FactoryBot.create(:librarian)
     allow(view).to receive(:policy) do |record|
       Pundit.policy(user, record)
     end
   end
 
-  it "renders a list of realizes" do
-    allow(view).to receive(:policy).and_return double(create?: true, destroy?: true)
-    render
+  describe "item index" do
+    it "should render index" do
+      view.stub(:filtered_params).and_return(ActionController::Parameters.new().permit)
+      render
+      expect(rendered).to have_selector "div#submenu ul"
+    end
   end
 end
 

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

@@ -12,11 +12,11 @@ describe "manifestations/index" do
     @reservable_facet = @carrier_type_facet = @language_facet = @library_facet = @pub_year_facet = []
     @seconds = 0
     @max_number_of_results = 500
+    view.stub(:filtered_params).and_return(ActionController::Parameters.new(per_page: 50).permit(:per_page))
   end
 
   describe "sort_by menu" do
     it "should reflect per_page params for views" do
-      params[:per_page] = 50
       render
       expect(rendered).to have_selector "select#per_page option[value='50'][selected='selected']"
     end

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

@@ -5,6 +5,7 @@ describe "manifestations/index.rdf.builder" do
     manifestation = FactoryBot.create(:manifestation)
     @manifestations = assign(:manifestations, [manifestation] )
     @library_group = LibraryGroup.first
+    view.stub(:filtered_params).and_return(ActionController::Parameters.new(per_page: 50).permit([:per_page]))
   end
 
   it "should export RDF format" do

data/spec/views/manifestations/{index.txt.ruby_spec.rb → index.txt.erb_spec.rb}

@@ -1,6 +1,6 @@
 require "rails_helper.rb"
 
-describe "manifestations/index.txt.ruby" do
+describe "manifestations/index.txt.erb" do
   before(:each) do
     manifestation = FactoryBot.create(:manifestation)
     manifestation.items << FactoryBot.create(:item, bookstore_id: 1, budget_type_id: 1, price: 100)

data/spec/views/manifestations/{show.txt.ruby_spec.rb → show.txt.erb_spec.rb}

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe "manifestations/show.txt.ruby" do
+describe "manifestations/show.txt.erb" do
   fixtures :all
 
   before(:each) do
@@ -11,6 +11,6 @@ describe "manifestations/show.txt.ruby" do
     allow(view).to receive(:policy).and_return double(create?: true)
     render
     # Run the generator again with the --webrat flag if you want to use webrat matchers
-    rendered.should match(/text/)
+    rendered.should match(/1/)
   end
 end

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

@@ -19,6 +19,6 @@ describe "resource_import_results/show" do
     @resource_import_result.resource_import_file.delete
     @resource_import_result.resource_import_file = nil
     render
-    expect(rendered).to match /original_title/
+    expect(rendered).to match /MyText/
   end
 end