enju_circulation 0.2.3 → 0.2.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (50) hide show
  1. checksums.yaml +4 -4
  2. data/lib/enju_circulation/version.rb +1 -1
  3. data/lib/generators/enju_circulation/update/update_generator.rb +1 -1
  4. data/lib/tasks/enju_circulation_tasks.rake +1 -1
  5. data/spec/concerns/enju_accept_spec.rb +5 -5
  6. data/spec/controllers/carrier_type_has_checkout_types_controller_spec.rb +13 -13
  7. data/spec/controllers/checkout_types_controller_spec.rb +13 -13
  8. data/spec/controllers/checkouts_controller_spec.rb +1 -1
  9. data/spec/controllers/circulation_statuses_controller_spec.rb +12 -12
  10. data/spec/controllers/item_has_use_restrictions_controller_spec.rb +12 -12
  11. data/spec/controllers/lending_policies_controller_spec.rb +9 -9
  12. data/spec/controllers/manifestation_checkout_stats_controller_spec.rb +13 -13
  13. data/spec/controllers/manifestation_reserve_stats_controller_spec.rb +13 -13
  14. data/spec/controllers/reserves_controller_spec.rb +11 -11
  15. data/spec/controllers/use_restrictions_controller_spec.rb +12 -12
  16. data/spec/controllers/user_checkout_stats_controller_spec.rb +13 -13
  17. data/spec/controllers/user_group_has_checkout_types_controller_spec.rb +12 -12
  18. data/spec/controllers/user_reserve_stats_controller_spec.rb +13 -13
  19. data/spec/factories/accept.rb +4 -4
  20. data/spec/factories/basket.rb +2 -2
  21. data/spec/factories/carrier_type.rb +1 -1
  22. data/spec/factories/carrier_type_has_checkout_type.rb +3 -3
  23. data/spec/factories/checkout.rb +1 -1
  24. data/spec/factories/checkout_stat.rb +1 -1
  25. data/spec/factories/checkout_stat_has_manifestation.rb +3 -3
  26. data/spec/factories/checkout_stat_has_user.rb +3 -3
  27. data/spec/factories/checkout_type.rb +1 -1
  28. data/spec/factories/circulation_status.rb +1 -1
  29. data/spec/factories/item.rb +2 -2
  30. data/spec/factories/item_has_use_restriction.rb +3 -3
  31. data/spec/factories/lending_policy.rb +3 -3
  32. data/spec/factories/manifestation.rb +1 -1
  33. data/spec/factories/manifestation_checkout_stat.rb +1 -1
  34. data/spec/factories/manifestation_reserve_stat.rb +1 -1
  35. data/spec/factories/profile.rb +1 -1
  36. data/spec/factories/reserve.rb +5 -5
  37. data/spec/factories/reserve_stat_has_manifestation.rb +3 -3
  38. data/spec/factories/reserve_stat_has_user.rb +3 -3
  39. data/spec/factories/use_restriction.rb +1 -1
  40. data/spec/factories/user.rb +1 -1
  41. data/spec/factories/user_checkout_stat.rb +1 -1
  42. data/spec/factories/user_group.rb +1 -1
  43. data/spec/factories/user_group_has_checkout_type.rb +3 -3
  44. data/spec/factories/user_reserve_stat.rb +1 -1
  45. data/spec/models/reserve_spec.rb +9 -9
  46. data/spec/rails_helper.rb +3 -3
  47. data/spec/support/controller_macros.rb +3 -3
  48. data/spec/views/checked_items/new.html.erb_spec.rb +3 -3
  49. data/spec/views/reserves/index.html.erb_spec.rb +1 -1
  50. metadata +4 -4
@@ -1,4 +1,4 @@
1
- FactoryGirl.define do
1
+ FactoryBot.define do
2
2
  factory :profile, :class => Profile do |f|
3
3
  f.user_group {UserGroup.first}
4
4
  f.required_role {Role.find_by_name('User')}
@@ -1,12 +1,12 @@
1
- FactoryGirl.define do
1
+ FactoryBot.define do
2
2
  factory :reserve do |f|
3
3
  before(:create) do |reserve|
4
- profile = FactoryGirl.create(:profile)
5
- user = User.new(FactoryGirl.attributes_for(:user))
4
+ profile = FactoryBot.create(:profile)
5
+ user = User.new(FactoryBot.attributes_for(:user))
6
6
  user.profile = profile
7
7
  reserve.user = user
8
8
  end
9
- f.manifestation_id{FactoryGirl.create(:manifestation).id}
10
- # f.user{FactoryGirl.create(:user)}
9
+ f.manifestation_id{FactoryBot.create(:manifestation).id}
10
+ # f.user{FactoryBot.create(:user)}
11
11
  end
12
12
  end
@@ -1,6 +1,6 @@
1
- FactoryGirl.define do
1
+ FactoryBot.define do
2
2
  factory :reserve_stat_has_manifestation do |f|
3
- f.manifestation_reserve_stat_id{FactoryGirl.create(:manifestation_reserve_stat).id}
4
- f.manifestation_id{FactoryGirl.create(:manifestation).id}
3
+ f.manifestation_reserve_stat_id{FactoryBot.create(:manifestation_reserve_stat).id}
4
+ f.manifestation_id{FactoryBot.create(:manifestation).id}
5
5
  end
6
6
  end
@@ -1,6 +1,6 @@
1
- FactoryGirl.define do
1
+ FactoryBot.define do
2
2
  factory :reserve_stat_has_user do |f|
3
- f.user_reserve_stat_id{FactoryGirl.create(:user_reserve_stat).id}
4
- f.user_id{FactoryGirl.create(:user).id}
3
+ f.user_reserve_stat_id{FactoryBot.create(:user_reserve_stat).id}
4
+ f.user_id{FactoryBot.create(:user).id}
5
5
  end
6
6
  end
@@ -1,4 +1,4 @@
1
- FactoryGirl.define do
1
+ FactoryBot.define do
2
2
  factory :use_restriction do |f|
3
3
  f.sequence(:name){|n| "use_restriction_#{n}"}
4
4
  end
@@ -1,4 +1,4 @@
1
- FactoryGirl.define do
1
+ FactoryBot.define do
2
2
  factory :admin, :class => User do |f|
3
3
  f.sequence(:username){|n| "admin_#{n}"}
4
4
  f.sequence(:email){|n| "admin_#{n}@example.jp"}
@@ -1,4 +1,4 @@
1
- FactoryGirl.define do
1
+ FactoryBot.define do
2
2
  factory :user_checkout_stat do |f|
3
3
  f.start_date 1.week.ago
4
4
  f.end_date 1.day.ago
@@ -1,4 +1,4 @@
1
- FactoryGirl.define do
1
+ FactoryBot.define do
2
2
  factory :user_group do |f|
3
3
  f.sequence(:name){|n| "user_group_#{n}"}
4
4
  end
@@ -1,6 +1,6 @@
1
- FactoryGirl.define do
1
+ FactoryBot.define do
2
2
  factory :user_group_has_checkout_type do |f|
3
- f.user_group_id{FactoryGirl.create(:user_group).id}
4
- f.checkout_type_id{FactoryGirl.create(:checkout_type).id}
3
+ f.user_group_id{FactoryBot.create(:user_group).id}
4
+ f.checkout_type_id{FactoryBot.create(:checkout_type).id}
5
5
  end
6
6
  end
@@ -1,4 +1,4 @@
1
- FactoryGirl.define do
1
+ FactoryBot.define do
2
2
  factory :user_reserve_stat do |f|
3
3
  f.start_date 1.week.ago
4
4
  f.end_date 1.day.ago
@@ -52,9 +52,9 @@ describe Reserve do
52
52
  end
53
53
 
54
54
  it "should have reservations that will be expired" do
55
- reserve = FactoryGirl.create(:reserve)
55
+ reserve = FactoryBot.create(:reserve)
56
56
  reserve.transition_to!(:requested)
57
- item = FactoryGirl.create(:item, manifestation_id: reserve.manifestation.id)
57
+ item = FactoryBot.create(:item, manifestation_id: reserve.manifestation.id)
58
58
  item.retain(reserve.user)
59
59
  reserve.reload
60
60
  reserve.expired_at = Date.yesterday
@@ -63,9 +63,9 @@ describe Reserve do
63
63
  end
64
64
 
65
65
  it "should have completed reservation" do
66
- reserve = FactoryGirl.create(:reserve)
66
+ reserve = FactoryBot.create(:reserve)
67
67
  reserve.transition_to!(:requested)
68
- item = FactoryGirl.create(:item, manifestation_id: reserve.manifestation.id)
68
+ item = FactoryBot.create(:item, manifestation_id: reserve.manifestation.id)
69
69
  item.checkout!(reserve.user)
70
70
  expect(Reserve.completed).to include reserve
71
71
  end
@@ -111,21 +111,21 @@ describe Reserve do
111
111
  end
112
112
 
113
113
  it "should be treated as Waiting" do
114
- reserve = FactoryGirl.create(:reserve)
114
+ reserve = FactoryBot.create(:reserve)
115
115
  expect(Reserve.waiting).to include reserve
116
- reserve = FactoryGirl.create(:reserve, expired_at: nil)
116
+ reserve = FactoryBot.create(:reserve, expired_at: nil)
117
117
  expect(Reserve.waiting).to include reserve
118
118
  end
119
119
 
120
120
  it "should not retain against reserves with already retained" do
121
- reserve = FactoryGirl.create(:reserve)
121
+ reserve = FactoryBot.create(:reserve)
122
122
  reserve.transition_to!(:requested)
123
123
  manifestation = reserve.manifestation
124
- item = FactoryGirl.create(:item, manifestation_id: manifestation.id)
124
+ item = FactoryBot.create(:item, manifestation_id: manifestation.id)
125
125
  expect{item.retain(reserve.user)}.not_to raise_error
126
126
  expect(reserve.retained?).to be true
127
127
  expect(item.retained?).to be true
128
- item = FactoryGirl.create(:item, manifestation_id: manifestation.id)
128
+ item = FactoryBot.create(:item, manifestation_id: manifestation.id)
129
129
  expect{item.retain(reserve.user)}.not_to raise_error
130
130
  expect(reserve.retained?).to be true
131
131
  expect(item.retained?).to be false
@@ -7,7 +7,7 @@ Coveralls.wear!
7
7
  ENV["RAILS_ENV"] ||= 'test'
8
8
  require File.expand_path("../dummy/config/environment", __FILE__)
9
9
  require 'rspec/rails'
10
- require 'factory_girl'
10
+ require 'factory_bot'
11
11
  require 'sunspot-rails-tester'
12
12
  require 'rspec/active_model/mocks'
13
13
  require "capybara/rspec"
@@ -51,5 +51,5 @@ RSpec.configure do |config|
51
51
  config.infer_spec_type_from_file_location!
52
52
  end
53
53
 
54
- FactoryGirl.definition_file_paths << "#{::Rails.root}/../../spec/factories"
55
- FactoryGirl.find_definitions
54
+ FactoryBot.definition_file_paths << "#{::Rails.root}/../../spec/factories"
55
+ FactoryBot.find_definitions
@@ -2,14 +2,14 @@ module ControllerMacros
2
2
  def login_admin
3
3
  before(:each) do
4
4
  @request.env["devise.mapping"] = Devise.mappings[:admin]
5
- sign_in FactoryGirl.create(:admin)
5
+ sign_in FactoryBot.create(:admin)
6
6
  end
7
7
  end
8
8
 
9
9
  def login_librarian
10
10
  before(:each) do
11
11
  @request.env["devise.mapping"] = Devise.mappings[:user]
12
- user = FactoryGirl.create(:librarian)
12
+ user = FactoryBot.create(:librarian)
13
13
  sign_in user
14
14
  end
15
15
  end
@@ -17,7 +17,7 @@ module ControllerMacros
17
17
  def login_user
18
18
  before(:each) do
19
19
  @request.env["devise.mapping"] = Devise.mappings[:user]
20
- user = FactoryGirl.create(:user)
20
+ user = FactoryBot.create(:user)
21
21
  sign_in user
22
22
  end
23
23
  end
@@ -4,9 +4,9 @@ describe "checked_items/new" do
4
4
  fixtures :all
5
5
 
6
6
  it "renders new checkout form" do
7
- profile = FactoryGirl.create(:profile, user_number: "foo")
8
- user = FactoryGirl.create(:user, profile: profile, username: "bar")
9
- basket = FactoryGirl.create(:basket, user: user)
7
+ profile = FactoryBot.create(:profile, user_number: "foo")
8
+ user = FactoryBot.create(:user, profile: profile, username: "bar")
9
+ basket = FactoryBot.create(:basket, user: user)
10
10
  assign(:basket, basket)
11
11
  assign(:checked_items, basket.checked_items)
12
12
  render
@@ -21,7 +21,7 @@ describe "reserves/index" do
21
21
  end
22
22
 
23
23
  it "renders a list of reserves when a reserve does not have expired_at" do
24
- reserve = FactoryGirl.create(:reserve, :expired_at => nil)
24
+ reserve = FactoryBot.create(:reserve, :expired_at => nil)
25
25
  assign(:reserves, Reserve.page(2))
26
26
  allow(view).to receive(:policy).and_return double(create?: true, update?: true, destroy?: true)
27
27
  render
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: enju_circulation
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.3
4
+ version: 0.2.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kosuke Tanabe
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-11-12 00:00:00.000000000 Z
11
+ date: 2018-01-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: enju_biblio
@@ -109,7 +109,7 @@ dependencies:
109
109
  - !ruby/object:Gem::Version
110
110
  version: '3.5'
111
111
  - !ruby/object:Gem::Dependency
112
- name: factory_girl_rails
112
+ name: factory_bot_rails
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
115
  - - ">="
@@ -870,7 +870,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
870
870
  version: '0'
871
871
  requirements: []
872
872
  rubyforge_project:
873
- rubygems_version: 2.5.2.1
873
+ rubygems_version: 2.6.14
874
874
  signing_key:
875
875
  specification_version: 4
876
876
  summary: enju_circulation plugin