enju_circulation 0.2.3 → 0.2.4

data/spec/factories/profile.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :profile, :class => Profile do |f|
     f.user_group {UserGroup.first}
     f.required_role {Role.find_by_name('User')}

data/spec/factories/reserve.rb

@@ -1,12 +1,12 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :reserve do |f|
     before(:create) do |reserve|
-      profile = FactoryGirl.create(:profile)
-      user = User.new(FactoryGirl.attributes_for(:user))
+      profile = FactoryBot.create(:profile)
+      user = User.new(FactoryBot.attributes_for(:user))
       user.profile = profile
       reserve.user = user
     end
-    f.manifestation_id{FactoryGirl.create(:manifestation).id}
-#    f.user{FactoryGirl.create(:user)}
+    f.manifestation_id{FactoryBot.create(:manifestation).id}
+#    f.user{FactoryBot.create(:user)}
   end
 end

data/spec/factories/reserve_stat_has_manifestation.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :reserve_stat_has_manifestation do |f|
-    f.manifestation_reserve_stat_id{FactoryGirl.create(:manifestation_reserve_stat).id}
-    f.manifestation_id{FactoryGirl.create(:manifestation).id}
+    f.manifestation_reserve_stat_id{FactoryBot.create(:manifestation_reserve_stat).id}
+    f.manifestation_id{FactoryBot.create(:manifestation).id}
   end
 end

data/spec/factories/reserve_stat_has_user.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :reserve_stat_has_user do |f|
-    f.user_reserve_stat_id{FactoryGirl.create(:user_reserve_stat).id}
-    f.user_id{FactoryGirl.create(:user).id}
+    f.user_reserve_stat_id{FactoryBot.create(:user_reserve_stat).id}
+    f.user_id{FactoryBot.create(:user).id}
   end
 end

data/spec/factories/use_restriction.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :use_restriction do |f|
     f.sequence(:name){|n| "use_restriction_#{n}"}
   end

data/spec/factories/user.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :admin, :class => User do |f|
     f.sequence(:username){|n| "admin_#{n}"}
     f.sequence(:email){|n| "admin_#{n}@example.jp"}

data/spec/factories/user_checkout_stat.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user_checkout_stat do |f|
     f.start_date 1.week.ago
     f.end_date 1.day.ago

data/spec/factories/user_group.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user_group do |f|
     f.sequence(:name){|n| "user_group_#{n}"}
   end

data/spec/factories/user_group_has_checkout_type.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user_group_has_checkout_type do |f|
-    f.user_group_id{FactoryGirl.create(:user_group).id}
-    f.checkout_type_id{FactoryGirl.create(:checkout_type).id}
+    f.user_group_id{FactoryBot.create(:user_group).id}
+    f.checkout_type_id{FactoryBot.create(:checkout_type).id}
   end
 end

data/spec/factories/user_reserve_stat.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user_reserve_stat do |f|
     f.start_date 1.week.ago
     f.end_date 1.day.ago

data/spec/models/reserve_spec.rb

@@ -52,9 +52,9 @@ describe Reserve do
   end
 
   it "should have reservations that will be expired" do
-    reserve = FactoryGirl.create(:reserve)
+    reserve = FactoryBot.create(:reserve)
     reserve.transition_to!(:requested)
-    item = FactoryGirl.create(:item, manifestation_id: reserve.manifestation.id)
+    item = FactoryBot.create(:item, manifestation_id: reserve.manifestation.id)
     item.retain(reserve.user)
     reserve.reload
     reserve.expired_at = Date.yesterday
@@ -63,9 +63,9 @@ describe Reserve do
   end
 
   it "should have completed reservation" do
-    reserve = FactoryGirl.create(:reserve)
+    reserve = FactoryBot.create(:reserve)
     reserve.transition_to!(:requested)
-    item = FactoryGirl.create(:item, manifestation_id: reserve.manifestation.id)
+    item = FactoryBot.create(:item, manifestation_id: reserve.manifestation.id)
     item.checkout!(reserve.user)
     expect(Reserve.completed).to include reserve
   end
@@ -111,21 +111,21 @@ describe Reserve do
   end
 
   it "should be treated as Waiting" do
-    reserve = FactoryGirl.create(:reserve)
+    reserve = FactoryBot.create(:reserve)
     expect(Reserve.waiting).to include reserve
-    reserve = FactoryGirl.create(:reserve, expired_at: nil)
+    reserve = FactoryBot.create(:reserve, expired_at: nil)
     expect(Reserve.waiting).to include reserve
   end
 
   it "should not retain against reserves with already retained" do
-    reserve = FactoryGirl.create(:reserve)
+    reserve = FactoryBot.create(:reserve)
     reserve.transition_to!(:requested)
     manifestation = reserve.manifestation
-    item = FactoryGirl.create(:item, manifestation_id: manifestation.id)
+    item = FactoryBot.create(:item, manifestation_id: manifestation.id)
     expect{item.retain(reserve.user)}.not_to raise_error
     expect(reserve.retained?).to be true
     expect(item.retained?).to be true
-    item = FactoryGirl.create(:item, manifestation_id: manifestation.id)
+    item = FactoryBot.create(:item, manifestation_id: manifestation.id)
     expect{item.retain(reserve.user)}.not_to raise_error
     expect(reserve.retained?).to be true
     expect(item.retained?).to be false

data/spec/rails_helper.rb

@@ -7,7 +7,7 @@ Coveralls.wear!
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
-require 'factory_girl'
+require 'factory_bot'
 require 'sunspot-rails-tester'
 require 'rspec/active_model/mocks'
 require "capybara/rspec"
@@ -51,5 +51,5 @@ RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
 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,14 +2,14 @@ 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[:user]
-      user = FactoryGirl.create(:librarian)
+      user = FactoryBot.create(:librarian)
       sign_in user
     end
   end
@@ -17,7 +17,7 @@ module ControllerMacros
   def login_user
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:user]
-      user = FactoryGirl.create(:user)
+      user = FactoryBot.create(:user)
       sign_in user
     end
   end

data/spec/views/checked_items/new.html.erb_spec.rb

@@ -4,9 +4,9 @@ describe "checked_items/new" do
   fixtures :all
 
   it "renders new checkout form" do
-    profile = FactoryGirl.create(:profile, user_number: "foo")
-    user = FactoryGirl.create(:user, profile: profile, username: "bar")
-    basket = FactoryGirl.create(:basket, user: user)
+    profile = FactoryBot.create(:profile, user_number: "foo")
+    user = FactoryBot.create(:user, profile: profile, username: "bar")
+    basket = FactoryBot.create(:basket, user: user)
     assign(:basket, basket)
     assign(:checked_items, basket.checked_items)
     render

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

@@ -21,7 +21,7 @@ describe "reserves/index" do
   end
 
   it "renders a list of reserves when a reserve does not have expired_at" do
-    reserve = FactoryGirl.create(:reserve, :expired_at => nil)
+    reserve = FactoryBot.create(:reserve, :expired_at => nil)
     assign(:reserves, Reserve.page(2))
     allow(view).to receive(:policy).and_return double(create?: true, update?: true, destroy?: true)
     render

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 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_biblio
@@ -109,7 +109,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:
     - - ">="
@@ -870,7 +870,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_circulation plugin