enju_bookmark 0.2.2 → 0.3.2

data/spec/factories/bookmark.rb

@@ -1,7 +1,8 @@
 FactoryBot.define do
-  factory :bookmark do |f|
-    f.sequence(:title){|n| "bookmark_#{n}"}
-    f.sequence(:url){|n| "http://example.jp/#{n}"}
-    f.user_id{FactoryBot.create(:user).id}
+  factory :bookmark do
+    sequence(:title){|n| "bookmark_#{n}"}
+    sequence(:url){|n| "http://example.jp/#{n}"}
+    user_id{FactoryBot.create(:user).id}
+    association :manifestation
   end
 end

data/spec/factories/bookmark_stat.rb

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :bookmark_stat do |f|
-    f.start_date 1.week.ago
-    f.end_date 1.day.ago
+    f.start_date { 1.week.ago }
+    f.end_date { 1.day.ago }
   end
 end

data/spec/factories/library.rb

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

@@ -3,4 +3,12 @@ FactoryBot.define do
     f.sequence(:original_title){|n| "manifestation_title_#{n}"}
     f.carrier_type_id{CarrierType.find(1).id}
   end
+
+  factory :manifestation_serial, class: Manifestation do |f|
+    f.sequence(:original_title){|n| "manifestation_title_#{n}"}
+    f.carrier_type_id{CarrierType.find(1).id}
+    f.language_id{Language.find(1).id}
+    f.serial{true}
+    f.series_statements{[FactoryBot.create(:series_statement_serial)]}
+  end
 end

data/spec/factories/profile.rb

@@ -1,10 +1,10 @@
 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}"}
-    f.library_id 2
-    f.locale "ja"
+    f.library_id { 2 }
+    f.locale { 'ja' }
     f.user_id {FactoryBot.create(:user).id}
   end
 end

data/spec/factories/user.rb

@@ -1,43 +1,43 @@
 FactoryBot.define do
-  factory :admin, :class => User do |f|
+  factory :admin, class: User do |f|
     f.sequence(:username){|n| "admin_#{n}"}
     f.sequence(:email){|n| "admin_#{n}@example.jp"}
-    f.password 'adminpassword'
-    f.password_confirmation 'adminpassword'
+    f.password { 'adminpassword' }
+    f.password_confirmation { 'adminpassword' }
     f.after(:create) do |user|
       user_has_role = UserHasRole.new
-      user_has_role.assign_attributes({:user_id => user.id, :role_id => Role.find_by_name('Administrator').id})
+      user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by(name: 'Administrator').id})
       user_has_role.save
       user.reload
     end
   end
 
-  factory :librarian, :class => User do |f|
+  factory :librarian, class: User do |f|
     f.sequence(:username){|n| "librarian_#{n}"}
     f.sequence(:email){|n| "librarian_#{n}@example.jp"}
-    f.password 'librarianpassword'
-    f.password_confirmation 'librarianpassword'
+    f.password { 'librarianpassword' }
+    f.password_confirmation { 'librarianpassword' }
     f.after(:create) do |user|
       user_has_role = UserHasRole.new
-      user_has_role.assign_attributes({:user_id => user.id, :role_id => Role.find_by_name('Librarian').id})
+      user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by(name: 'Librarian').id})
       user_has_role.save
       user.reload
     end
   end
 
-  factory :user, :class => User do |f|
+  factory :user, class: User do |f|
     f.sequence(:username){|n| "user_#{n}"}
     f.sequence(:email){|n| "user_#{n}@example.jp"}
-    f.password 'userpassword'
-    f.password_confirmation 'userpassword'
+    f.password { 'userpassword' }
+    f.password_confirmation { 'userpassword' }
     f.after(:create) do |user|
       user_has_role = UserHasRole.new
-      user_has_role.assign_attributes({:user_id => user.id, :role_id => Role.find_by_name('User').id})
+      user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by(name: 'User').id})
       user_has_role.save
       user.reload
     end
   end
 
-  factory :invalid_user, :class => User do |f|
+  factory :invalid_user, class: User do |f|
   end
 end

data/spec/fixtures/frequencies.yml

@@ -0,0 +1,68 @@
+--- 
+frequency_00001: 
+  name: unknown
+  display_name: "en: unknown\r\n\
+    ja: 不明・不定期刊"
+  id: 1
+  position: 1
+frequency_00002: 
+  name: daily
+  display_name: "en: daily\r\n\
+    ja: 日刊"
+  id: 2
+  position: 2
+frequency_00003: 
+  name: weekly
+  display_name: "en: weekly\r\n\
+    ja: 週刊"
+  id: 3
+  position: 3
+frequency_00004: 
+  name: biweekly
+  display_name: "en: biweekly\r\n\
+    ja: 隔週刊"
+  id: 4
+  position: 4
+frequency_00005: 
+  name: monthly
+  display_name: "en: monthly\r\n\
+    ja: 月刊"
+  id: 5
+  position: 5
+frequency_00006: 
+  name: bimonthly
+  display_name: "en: bimonthly\r\n\
+    ja: 隔月刊"
+  id: 6
+  position: 6
+frequency_00007: 
+  name: quarterly
+  display_name: "en: quarterly\r\n\
+    ja: 季刊"
+  id: 7
+  position: 7
+frequency_00008: 
+  name: yearly
+  display_name: "en: yearly\r\n\
+    ja: 年刊"
+  id: 8
+  position: 8
+frequency_00009: 
+  name: biyearly
+  display_name: "en: biyearly\r\n\
+    ja: 隔年刊"
+  id: 9
+  position: 9
+
+# == Schema Information
+#
+# Table name: frequencies
+#
+#  id           :integer          not null, primary key
+#  name         :string           not null
+#  display_name :text
+#  note         :text
+#  position     :integer
+#  created_at   :datetime
+#  updated_at   :datetime
+#

data/spec/models/bookmark_spec.rb

@@ -13,7 +13,7 @@ describe Bookmark do
     old_manifestation_count = Manifestation.count
     old_item_count = Item.count
     lambda{
-      bookmark = FactoryBot.create(:user).bookmarks.create(:url => 'http://www.example.com/', :title => 'test')
+      bookmark = FactoryBot.create(:user).bookmarks.create(url: 'http://www.example.com/', title: 'test')
     }.should change(Bookmark, :count)
     Manifestation.count.should eq old_manifestation_count + 1
     Item.count.should eq old_item_count + 1
@@ -23,7 +23,7 @@ describe Bookmark do
     old_manifestation_count = Manifestation.count
     old_item_count = Item.count
     lambda{
-      bookmark = FactoryBot.create(:user).bookmarks.create(:url => "#{LibraryGroup.site_config.url}manifestations/1", :title => 'test')
+      bookmark = FactoryBot.create(:user).bookmarks.create(url: "#{LibraryGroup.site_config.url}manifestations/1", title: 'test')
     }.should change(Bookmark, :count)
     assert_equal old_manifestation_count, Manifestation.count
     assert_equal old_item_count, Item.count
@@ -33,7 +33,7 @@ describe Bookmark do
     old_manifestation_count = Manifestation.count
     old_item_count = Item.count
     lambda{
-      bookmark = FactoryBot.create(:user).bookmarks.create(:url => "#{LibraryGroup.site_config.url}libraries/1", :title => 'test')
+      bookmark = FactoryBot.create(:user).bookmarks.create(url: "#{LibraryGroup.site_config.url}libraries/1", title: 'test')
     }.should_not change(Bookmark, :count)
     assert_equal old_manifestation_count, Manifestation.count
     assert_equal old_item_count, Item.count

data/spec/rails_helper.rb

@@ -8,7 +8,6 @@ ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
 require 'factory_bot'
-require 'sunspot-rails-tester'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -32,19 +31,7 @@ RSpec.configure do |config|
   # instead of true.
   config.use_transactional_fixtures = true
 
-  config.extend ControllerMacros, :type => :controller
-
-  $original_sunspot_session = Sunspot.session
-
-  config.before do
-    Sunspot.session = Sunspot::Rails::StubSessionProxy.new($original_sunspot_session)
-  end
-
-  config.before :each, :solr => true do
-    Sunspot::Rails::Tester.start_original_sunspot_session
-    Sunspot.session = $original_sunspot_session
-    Sunspot.remove_all!
-  end
+  config.extend ControllerMacros, type: :controller
 
   config.infer_spec_type_from_file_location!
 end