enju_library 0.4.0.beta.4 → 0.4.0.rc.1

data/spec/fixtures/user_import_files.yml

@@ -30,8 +30,8 @@ two:
 #
 # Table name: user_import_files
 #
-#  id                       :integer          not null, primary key
-#  user_id                  :integer
+#  id                       :bigint           not null, primary key
+#  user_id                  :bigint
 #  note                     :text
 #  executed_at              :datetime
 #  user_import_file_name    :string
@@ -41,9 +41,9 @@ two:
 #  user_import_fingerprint  :string
 #  edit_mode                :string
 #  error_message            :text
-#  created_at               :datetime
-#  updated_at               :datetime
+#  created_at               :datetime         not null
+#  updated_at               :datetime         not null
 #  user_encoding            :string
-#  default_library_id       :integer
-#  default_user_group_id    :integer
+#  default_library_id       :bigint
+#  default_user_group_id    :bigint
 #

data/spec/fixtures/user_import_results.yml

@@ -16,11 +16,11 @@ two:
 #
 # Table name: user_import_results
 #
-#  id                  :integer          not null, primary key
-#  user_import_file_id :integer
-#  user_id             :integer
+#  id                  :bigint           not null, primary key
+#  user_import_file_id :bigint
+#  user_id             :bigint
 #  body                :text
-#  created_at          :datetime
-#  updated_at          :datetime
+#  created_at          :datetime         not null
+#  updated_at          :datetime         not null
 #  error_message       :text
 #

data/spec/fixtures/withdraws.yml

@@ -11,10 +11,10 @@ withdraws_00001:
 #
 # Table name: withdraws
 #
-#  id           :integer          not null, primary key
-#  basket_id    :integer
-#  item_id      :integer
-#  librarian_id :integer
+#  id           :bigint           not null, primary key
+#  basket_id    :bigint
+#  item_id      :bigint
+#  librarian_id :bigint
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
 #

data/spec/models/accept_spec.rb

@@ -12,10 +12,10 @@ end
 #
 # Table name: accepts
 #
-#  id           :integer          not null, primary key
-#  basket_id    :integer
-#  item_id      :integer
-#  librarian_id :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  id           :bigint           not null, primary key
+#  basket_id    :bigint
+#  item_id      :bigint
+#  librarian_id :bigint
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #

data/spec/models/basket_spec.rb

@@ -14,10 +14,10 @@ end
 #
 # Table name: baskets
 #
-#  id           :integer          not null, primary key
-#  user_id      :integer
+#  id           :bigint           not null, primary key
+#  user_id      :bigint
 #  note         :text
 #  lock_version :integer          default(0), not null
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #

data/spec/models/bookstore_spec.rb

@@ -9,7 +9,7 @@ end
 #
 # Table name: bookstores
 #
-#  id               :integer          not null, primary key
+#  id               :bigint           not null, primary key
 #  name             :text             not null
 #  zip_code         :string
 #  address          :text
@@ -18,7 +18,6 @@ end
 #  fax_number       :string
 #  url              :string
 #  position         :integer
-#  deleted_at       :datetime
-#  created_at       :datetime
-#  updated_at       :datetime
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
 #

data/spec/models/budget_type_spec.rb

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

data/spec/models/library_group_spec.rb

@@ -18,7 +18,7 @@ end
 #
 # Table name: library_groups
 #
-#  id                            :integer          not null, primary key
+#  id                            :bigint           not null, primary key
 #  name                          :string           not null
 #  display_name                  :text
 #  short_name                    :string           not null
@@ -27,8 +27,8 @@ end
 #  note                          :text
 #  country_id                    :integer
 #  position                      :integer
-#  created_at                    :datetime
-#  updated_at                    :datetime
+#  created_at                    :datetime         not null
+#  updated_at                    :datetime         not null
 #  admin_networks                :text
 #  allow_bookmark_external_url   :boolean          default(FALSE), not null
 #  url                           :string           default("http://localhost:3000/")
@@ -39,7 +39,7 @@ end
 #  family_name_first             :boolean          default(TRUE)
 #  screenshot_generator          :string
 #  pub_year_facet_range_interval :integer          default(10)
-#  user_id                       :integer
+#  user_id                       :bigint
 #  csv_charset_conversion        :boolean          default(FALSE), not null
 #  header_logo_file_name         :string
 #  header_logo_content_type      :string
@@ -49,4 +49,5 @@ end
 #  display_name_translations     :jsonb            not null
 #  login_banner_translations     :jsonb            not null
 #  footer_banner_translations    :jsonb            not null
+#  email                         :string
 #

data/spec/models/library_spec.rb

@@ -17,7 +17,7 @@ end
 #
 # Table name: libraries
 #
-#  id                        :integer          not null, primary key
+#  id                        :bigint           not null, primary key
 #  name                      :string           not null
 #  display_name              :text
 #  short_display_name        :string           not null
@@ -31,13 +31,12 @@ end
 #  note                      :text
 #  call_number_rows          :integer          default(1), not null
 #  call_number_delimiter     :string           default("|"), not null
-#  library_group_id          :integer          not null
+#  library_group_id          :bigint           not null
 #  users_count               :integer          default(0), not null
 #  position                  :integer
-#  country_id                :integer
-#  created_at                :datetime
-#  updated_at                :datetime
-#  deleted_at                :datetime
+#  country_id                :bigint
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
 #  opening_hour              :text
 #  isil                      :string
 #  latitude                  :float

data/spec/models/request_status_type_spec.rb

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

data/spec/models/request_type_spec.rb

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

data/spec/models/search_engine_spec.rb

@@ -12,7 +12,7 @@ end
 #
 # Table name: search_engines
 #
-#  id                        :integer          not null, primary key
+#  id                        :bigint           not null, primary key
 #  name                      :string           not null
 #  display_name              :text
 #  url                       :string           not null
@@ -22,7 +22,7 @@ end
 #  additional_param          :text
 #  note                      :text
 #  position                  :integer
-#  created_at                :datetime
-#  updated_at                :datetime
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
 #  display_name_translations :jsonb            not null
 #

data/spec/models/shelf_spec.rb

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

data/spec/models/subscribe_spec.rb

@@ -9,11 +9,11 @@ end
 #
 # Table name: subscribes
 #
-#  id              :integer          not null, primary key
-#  subscription_id :integer          not null
+#  id              :bigint           not null, primary key
+#  subscription_id :bigint           not null
 #  work_id         :integer          not null
 #  start_at        :datetime         not null
 #  end_at          :datetime         not null
-#  created_at      :datetime
-#  updated_at      :datetime
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
 #

data/spec/models/subscription_spec.rb

@@ -13,13 +13,12 @@ end
 #
 # Table name: subscriptions
 #
-#  id               :integer          not null, primary key
+#  id               :bigint           not null, primary key
 #  title            :text             not null
 #  note             :text
-#  user_id          :integer
-#  order_list_id    :integer
-#  deleted_at       :datetime
+#  user_id          :bigint
+#  order_list_id    :bigint
 #  subscribes_count :integer          default(0), not null
-#  created_at       :datetime
-#  updated_at       :datetime
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
 #

data/spec/models/user_export_file_spec.rb

@@ -17,13 +17,13 @@ end
 #
 # Table name: user_export_files
 #
-#  id                       :integer          not null, primary key
-#  user_id                  :integer
+#  id                       :bigint           not null, primary key
+#  user_id                  :bigint
 #  user_export_file_name    :string
 #  user_export_content_type :string
 #  user_export_file_size    :bigint
 #  user_export_updated_at   :datetime
 #  executed_at              :datetime
-#  created_at               :datetime
-#  updated_at               :datetime
+#  created_at               :datetime         not null
+#  updated_at               :datetime         not null
 #

data/spec/models/user_group_spec.rb

@@ -14,14 +14,13 @@ end
 #
 # Table name: user_groups
 #
-#  id                               :integer          not null, primary key
+#  id                               :bigint           not null, primary key
 #  name                             :string
 #  display_name                     :text
 #  note                             :text
 #  position                         :integer
-#  created_at                       :datetime
-#  updated_at                       :datetime
-#  deleted_at                       :datetime
+#  created_at                       :datetime         not null
+#  updated_at                       :datetime         not null
 #  valid_period_for_new_user        :integer          default(0), not null
 #  expired_at                       :datetime
 #  number_of_day_to_notify_overdue  :integer          default(7), not null

data/spec/models/user_import_file_spec.rb

@@ -21,7 +21,7 @@ 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, error: 3})
+      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
@@ -91,7 +91,7 @@ describe UserImportFile do
       old_users_count = User.count
       old_import_results_count = UserImportResult.count
       @file.user = User.find_by(username: 'librarian1')
-      @file.import_start.should eq({user_imported: 5, user_found: 0, error: 3})
+      @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.count.should eq old_users_count + 5
       UserImportResult.count.should eq old_import_results_count + 10
@@ -216,8 +216,8 @@ end
 #
 # Table name: user_import_files
 #
-#  id                       :integer          not null, primary key
-#  user_id                  :integer
+#  id                       :bigint           not null, primary key
+#  user_id                  :bigint
 #  note                     :text
 #  executed_at              :datetime
 #  user_import_file_name    :string
@@ -227,9 +227,9 @@ end
 #  user_import_fingerprint  :string
 #  edit_mode                :string
 #  error_message            :text
-#  created_at               :datetime
-#  updated_at               :datetime
+#  created_at               :datetime         not null
+#  updated_at               :datetime         not null
 #  user_encoding            :string
-#  default_library_id       :integer
-#  default_user_group_id    :integer
+#  default_library_id       :bigint
+#  default_user_group_id    :bigint
 #

data/spec/models/user_import_result_spec.rb

@@ -9,11 +9,11 @@ end
 #
 # Table name: user_import_results
 #
-#  id                  :integer          not null, primary key
-#  user_import_file_id :integer
-#  user_id             :integer
+#  id                  :bigint           not null, primary key
+#  user_import_file_id :bigint
+#  user_id             :bigint
 #  body                :text
-#  created_at          :datetime
-#  updated_at          :datetime
+#  created_at          :datetime         not null
+#  updated_at          :datetime         not null
 #  error_message       :text
 #

data/spec/models/withdraw_spec.rb

@@ -12,10 +12,10 @@ end
 #
 # Table name: withdraws
 #
-#  id           :integer          not null, primary key
-#  basket_id    :integer
-#  item_id      :integer
-#  librarian_id :integer
+#  id           :bigint           not null, primary key
+#  basket_id    :bigint
+#  item_id      :bigint
+#  librarian_id :bigint
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
 #

data/spec/system/libraries_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe 'Libraries', type: :system do
       sign_in users(:admin)
     end
 
-    it 'should show library config' do
+    xit '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
 
-    it 'should not show library config' do
+    xit 'should not show library config' do
       visit library_path(libraries(:library_00002).id, locale: :ja)
-      expect(page).not_to have_content '設定'
+      expect(page).not_to have_link '設定'
     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_content '設定'
+      expect(page).not_to have_link '設定'
     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_content '設定'
+      expect(page).not_to have_link '設定'
     end
   end
 end