enju_library 0.3.11 → 0.4.0.beta.1

data/spec/models/library_group_spec.rb

@@ -7,20 +7,11 @@ describe LibraryGroup do
     LibraryGroup.site_config.should be_truthy
   end
 
-  it "should set 1000 as max_number_of_results" do
-    expect(LibraryGroup.site_config.max_number_of_results).to eq 1000
-  end
-
   it "should allow access from allowed networks" do
     library_group = LibraryGroup.find(1)
     library_group.my_networks = "127.0.0.1"
     library_group.network_access_allowed?("192.168.0.1").should be_falsy
   end
-
-  it "should accept 0 as max_number_of_results" do
-    library_group = LibraryGroup.find(1)
-    library_group.update(max_number_of_results: 0).should be_truthy
-  end
 end
 
 # == Schema Information
@@ -44,7 +35,7 @@ end
 #  settings                      :text
 #  html_snippet                  :text
 #  book_jacket_source            :string
-#  max_number_of_results         :integer          default(1000)
+#  max_number_of_results         :integer          default(500)
 #  family_name_first             :boolean          default(TRUE)
 #  screenshot_generator          :string
 #  pub_year_facet_range_interval :integer          default(10)
@@ -52,10 +43,10 @@ end
 #  csv_charset_conversion        :boolean          default(FALSE), not null
 #  header_logo_file_name         :string
 #  header_logo_content_type      :string
-#  header_logo_file_size         :integer
+#  header_logo_file_size         :bigint
 #  header_logo_updated_at        :datetime
 #  header_logo_meta              :text
-#  library_group_id              :integer          not null
-#  login_banner                  :text
-#  footer_banner                 :text
+#  display_name_translations     :jsonb            not null
+#  login_banner_translations     :jsonb            not null
+#  footer_banner_translations    :jsonb            not null
 #

data/spec/models/library_spec.rb

@@ -17,29 +17,30 @@ end
 #
 # Table name: libraries
 #
-#  id                    :integer          not null, primary key
-#  name                  :string           not null
-#  display_name          :text
-#  short_display_name    :string           not null
-#  zip_code              :string
-#  street                :text
-#  locality              :text
-#  region                :text
-#  telephone_number_1    :string
-#  telephone_number_2    :string
-#  fax_number            :string
-#  note                  :text
-#  call_number_rows      :integer          default(1), not null
-#  call_number_delimiter :string           default("|"), not null
-#  library_group_id      :integer          not null
-#  users_count           :integer          default(0), not null
-#  position              :integer
-#  country_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  deleted_at            :datetime
-#  opening_hour          :text
-#  isil                  :string
-#  latitude              :float
-#  longitude             :float
+#  id                        :integer          not null, primary key
+#  name                      :string           not null
+#  display_name              :text
+#  short_display_name        :string           not null
+#  zip_code                  :string
+#  street                    :text
+#  locality                  :text
+#  region                    :text
+#  telephone_number_1        :string
+#  telephone_number_2        :string
+#  fax_number                :string
+#  note                      :text
+#  call_number_rows          :integer          default(1), not null
+#  call_number_delimiter     :string           default("|"), not null
+#  library_group_id          :integer          not null
+#  users_count               :integer          default(0), not null
+#  position                  :integer
+#  country_id                :integer
+#  created_at                :datetime
+#  updated_at                :datetime
+#  deleted_at                :datetime
+#  opening_hour              :text
+#  isil                      :string
+#  latitude                  :float
+#  longitude                 :float
+#  display_name_translations :jsonb            not null
 #

data/spec/models/request_status_type_spec.rb

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

data/spec/models/request_type_spec.rb

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

data/spec/models/search_engine_spec.rb

@@ -12,16 +12,17 @@ end
 #
 # Table name: search_engines
 #
-#  id               :integer          not null, primary key
-#  name             :string           not null
-#  display_name     :text
-#  url              :string           not null
-#  base_url         :text             not null
-#  http_method      :text             not null
-#  query_param      :text             not null
-#  additional_param :text
-#  note             :text
-#  position         :integer
-#  created_at       :datetime
-#  updated_at       :datetime
+#  id                        :integer          not null, primary key
+#  name                      :string           not null
+#  display_name              :text
+#  url                       :string           not null
+#  base_url                  :text             not null
+#  http_method               :text             not null
+#  query_param               :text             not null
+#  additional_param          :text
+#  note                      :text
+#  position                  :integer
+#  created_at                :datetime
+#  updated_at                :datetime
+#  display_name_translations :jsonb            not null
 #

data/spec/models/shelf_spec.rb

@@ -13,15 +13,16 @@ end
 #
 # Table name: shelves
 #
-#  id           :integer          not null, primary key
-#  name         :string           not null
-#  display_name :text
-#  note         :text
-#  library_id   :integer          not null
-#  items_count  :integer          default(0), not null
-#  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
-#  deleted_at   :datetime
-#  closed       :boolean          default(FALSE), not null
+#  id                        :integer          not null, primary key
+#  name                      :string           not null
+#  display_name              :text
+#  note                      :text
+#  library_id                :integer          not null
+#  items_count               :integer          default(0), not null
+#  position                  :integer
+#  created_at                :datetime
+#  updated_at                :datetime
+#  deleted_at                :datetime
+#  closed                    :boolean          default(FALSE), not null
+#  display_name_translations :jsonb            not null
 #

data/spec/models/user_export_file_spec.rb

@@ -9,7 +9,7 @@ describe UserExportFile do
     file.export!
     #UserExportFileJob.perform_later(file).should be_truthy
     Message.count.should eq message_count + 1
-    Message.order(:created_at).last.subject.should eq "エクスポートが完了しました: #{file.id}"
+    Message.order(:created_at).last.subject.should eq "Export completed: #{file.id}"
   end
 end
 
@@ -21,7 +21,7 @@ end
 #  user_id                  :integer
 #  user_export_file_name    :string
 #  user_export_content_type :string
-#  user_export_file_size    :integer
+#  user_export_file_size    :bigint
 #  user_export_updated_at   :datetime
 #  executed_at              :datetime
 #  created_at               :datetime

data/spec/models/user_group_spec.rb

@@ -8,12 +8,6 @@ describe UserGroup do
     user_group.display_name = "en:test"
     user_group.valid?.should be_truthy
   end
-
-  it "should not contain invalid yaml in its display_name" do
-    user_group = user_groups(:user_group_00001)
-    user_group.display_name = "en:test\r\nja: テスト"
-    user_group.valid?.should be_falsy
-  end
 end
 
 # == Schema Information
@@ -33,4 +27,5 @@ end
 #  number_of_day_to_notify_overdue  :integer          default(7), not null
 #  number_of_day_to_notify_due_date :integer          default(3), not null
 #  number_of_time_to_notify_overdue :integer          default(3), not null
+#  display_name_translations        :jsonb            not null
 #

data/spec/models/user_import_file_spec.rb

@@ -21,19 +21,19 @@ 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, failed: 0, error: 3})
+      file.import_start.should eq({user_imported: 5, user_found: 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
 
-      user001 = User.where(username: 'user001').first
+      user001 = User.find_by(username: 'user001')
       user001.profile.keyword_list.should eq "日本史\n地理"
       user001.profile.full_name.should eq '田辺 浩介'
       user001.profile.full_name_transcription.should eq 'たなべ こうすけ'
       user001.profile.required_role.name.should eq 'User'
       user001.locked_at.should be_truthy
 
-      user002 = User.where(username: 'user002').first
+      user002 = User.find_by(username: 'user002')
       user002.profile.user_group.name.should eq 'faculty'
       user002.profile.expired_at.to_i.should eq Time.zone.parse('2013-12-01').end_of_day.to_i
       user002.valid_password?('4NsxXPLy')
@@ -43,7 +43,7 @@ describe UserImportFile do
       user002.profile.required_role.name.should eq 'Librarian'
       user002.locked_at.should be_nil
 
-      user003 = User.where(username: 'user003').first
+      user003 = User.find_by(username: 'user003')
       user003.profile.note.should eq 'テストユーザ'
       user003.role.name.should eq 'Librarian'
       user003.profile.user_number.should eq '001003'
@@ -53,20 +53,20 @@ describe UserImportFile do
       user003.profile.save_checkout_history.should be_truthy
       user003.profile.save_search_history.should be_falsy
       user003.profile.share_bookmarks.should be_falsy
-      User.where(username: 'user000').first.should be_nil
+      User.find_by(username: 'user000').should be_nil
       UserImportResult.count.should eq old_import_results_count + 10
-      UserImportResult.order('id DESC')[0].error_message.should eq 'line 10: 利用者番号はすでに存在します'
-      UserImportResult.order('id DESC')[1].error_message.should eq 'line 9: 利用者番号は不正な値です'
-      UserImportResult.order('id DESC')[2].error_message.should eq 'line 8: パスワードは6文字以上で入力してください'
+      UserImportResult.order('id DESC')[0].error_message.should eq 'line 10: User number has already been taken'
+      UserImportResult.order('id DESC')[1].error_message.should eq 'line 9: User number is invalid'
+      UserImportResult.order('id DESC')[2].error_message.should eq 'line 8: Password is too short (minimum is 6 characters)'
 
-      user005 = User.where(username: 'user005').first
+      user005 = User.find_by(username: 'user005')
       user005.role.name.should eq 'User'
       user005.profile.library.name.should eq 'hachioji'
       user005.profile.locale.should eq 'en'
       user005.profile.user_number.should eq '001005'
       user005.profile.user_group.name.should eq 'faculty'
 
-      user006 = User.where(username: 'user006').first
+      user006 = User.find_by(username: 'user006')
       user006.role.name.should eq 'User'
       user006.profile.library.name.should eq 'hachioji'
       user006.profile.locale.should eq 'en'
@@ -77,25 +77,25 @@ describe UserImportFile do
       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.error_message.should eq "The following column(s) were ignored: save_search_history, share_bookmarks, invalid\nline 8: Password is too short (minimum is 6 characters)\nline 9: User number is invalid\nline 10: User number has already been taken"
       file.current_state.should eq 'failed'
     end
 
     it "should send message when import is completed" do
       old_message_count = Message.count
-      @file.user = User.where(username: 'librarian1').first
+      @file.user = User.find_by(username: 'librarian1')
       @file.import_start
       Message.count.should eq old_message_count + 1
-      Message.order(:created_at).last.subject.should eq "インポートが完了しました: #{@file.id}"
+      Message.order(:created_at).last.subject.should eq "Import completed: #{@file.id}"
     end
 
     it "should not import users that have higher roles than current user's role" 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.user = User.find_by(username: 'librarian1')
+      @file.import_start.should eq({user_imported: 5, user_found: 0, error: 3})
       User.order('id DESC')[1].username.should eq 'user005'
-      User.count.should eq old_users_count + 4
+      User.count.should eq old_users_count + 5
       UserImportResult.count.should eq old_import_results_count + 10
     end
   end
@@ -103,8 +103,7 @@ describe UserImportFile do
   describe "when its mode is 'update'" do
     before(:each) do
       FactoryBot.create(:user,
-        username: 'user001',
-        profile: FactoryBot.create(:profile)
+        username: 'user001'
       )
     end
     it "should update users" do
@@ -117,7 +116,7 @@ describe UserImportFile do
       old_message_count = Message.count
       result = @file.modify
       result.should have_key(:user_updated)
-      user001 = User.where(username: 'user001').first
+      user001 = User.find_by(username: 'user001')
       user001.email.should eq 'user001@example.jp'
       user001.profile.full_name.should eq '田辺 浩介'
       user001.profile.full_name_transcription.should eq 'たなべこうすけ'
@@ -128,7 +127,7 @@ describe UserImportFile do
     end
 
     it "should not overwrite with null value" do
-      user = User.where(username: 'user001').first
+      user = User.find_by(username: 'user001')
       user.profile = FactoryBot.create(:profile,
         user_number: '001',
         full_name: 'User 001',
@@ -137,6 +136,7 @@ describe UserImportFile do
         note: 'Note',
         keyword_list: 'keyword1 keyword2',
         date_of_birth: 10.years.ago)
+      user.save!
       file = UserImportFile.create!(
         user_import: File.new("#{Rails.root}/../../examples/user_update_file2.tsv"),
         user: users(:admin),
@@ -161,7 +161,7 @@ describe UserImportFile do
       )
       result = file.modify
       result.should have_key(:user_updated)
-      user001 = User.where(username: 'user001').first
+      user001 = User.find_by(username: 'user001')
       user001.profile.user_number.should eq '0001'
     end
     it "should update user's lock status" do
@@ -173,7 +173,7 @@ describe UserImportFile do
       )
       result = file.modify
       result.should have_key(:user_updated)
-      user001 = User.where(username: 'user001').first
+      user001 = User.find_by(username: 'user001')
       user001.access_locked?.should be_truthy
     end
   end
@@ -204,7 +204,7 @@ describe UserImportFile do
     end
 
     it "should not remove users if there are checkouts" do
-      user001 = User.where(username: 'user001').first
+      user001 = User.find_by(username: 'user001')
       FactoryBot.create(:checkout, user: user001, item: FactoryBot.create(:item))
       old_count = User.count
       file = UserImportFile.create!(

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'
@@ -11,7 +15,7 @@ abort("The Rails environment is running in production mode!") if Rails.env.produ
 require 'spec_helper'
 require 'rspec/rails'
 # Add additional requires below this line. Rails is not loaded until this point!
-require 'factory_bot_rails'
+require 'factory_bot'
 require 'rspec/active_model/mocks'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
@@ -66,3 +70,7 @@ RSpec.configure do |config|
     end
   end
 end
+
+FactoryBot.definition_file_paths << "#{::Rails.root}/../../spec/factories"
+FactoryBot.find_definitions
+

data/spec/system/libraries_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe 'Libraries', type: :system do
       sign_in users(:admin)
     end
 
-    xit 'should show library config' do
+    it 'should show library config' do
       visit library_path(libraries(:library_00002).id, locale: :ja)
       expect(page).to have_content '設定'
     end
@@ -20,9 +20,9 @@ RSpec.describe 'Libraries', type: :system do
       sign_in users(:librarian1)
     end
 
-    xit 'should not show library config' do
+    it 'should not show library config' do
       visit library_path(libraries(:library_00002).id, locale: :ja)
-      expect(page).not_to have_link '設定'
+      expect(page).not_to have_content '設定'
     end
   end
 
@@ -33,14 +33,14 @@ RSpec.describe 'Libraries', type: :system do
 
     it 'should not show library config' do
       visit library_path(libraries(:library_00002).id, locale: :ja)
-      expect(page).not_to have_link '設定'
+      expect(page).not_to have_content '設定'
     end
   end
 
   describe 'When not logged in' do
     it 'should not show library config' do
       visit library_path(libraries(:library_00002).id, locale: :ja)
-      expect(page).not_to have_link '設定'
+      expect(page).not_to have_content '設定'
     end
   end
 end