Skip to content

Commit d1939e9

Browse files
committed
Update bundler and factory_bot
1 parent df06bd4 commit d1939e9

File tree

8 files changed

+29
-26
lines changed

8 files changed

+29
-26
lines changed

jsonapi-utils.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ Gem::Specification.new do |spec|
2121

2222
spec.add_runtime_dependency 'jsonapi-resources', '0.9.11'
2323

24-
spec.add_development_dependency 'bundler', '~> 2.0'
24+
spec.add_development_dependency 'bundler', '>= 1.14'
2525
spec.add_development_dependency 'rake', '~> 12.3.3'
2626
spec.add_development_dependency 'rails', ENV['RAILS_VERSION'] || '~> 5.2.4'
2727
spec.add_development_dependency 'sqlite3', '~> 1.4'
2828
spec.add_development_dependency 'rspec-rails', '~> 3.9.0'
29-
spec.add_development_dependency 'factory_girl', '~> 4.8'
29+
spec.add_development_dependency 'factory_bot', '~> 5.1'
3030
spec.add_development_dependency 'smart_rspec', '~> 0.1.6'
3131
spec.add_development_dependency 'pry', '~> 0.12.2'
3232
spec.add_development_dependency 'pry-byebug'

spec/controllers/posts_controller_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
include_context 'JSON API headers'
55

66
before(:all) do
7-
@post = FactoryGirl.create_list(:post, 3).first
7+
@post = FactoryBot.create_list(:post, 3).first
88
end
99

1010
before(:each) do

spec/controllers/users_controller_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
include_context 'JSON API headers'
55

66
before(:all) do
7-
@user = FactoryGirl.create_list(:user, 3, :with_posts).first
7+
@user = FactoryBot.create_list(:user, 3, :with_posts).first
88
end
99

1010
before(:each) do

spec/features/page_count_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def TestApp.draw_page_count_test_routes
3434

3535
before(:all) do
3636
TestApp.draw_page_count_test_routes
37-
FactoryGirl.create_list(:user, 3, :with_posts)
37+
FactoryBot.create_list(:user, 3, :with_posts)
3838
end
3939

4040
describe 'page count with a paged paginator' do

spec/features/record_count_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def TestApp.draw_record_count_test_routes
5656

5757
before(:all) do
5858
TestApp.draw_record_count_test_routes
59-
FactoryGirl.create_list(:user, 3, :with_posts)
59+
FactoryBot.create_list(:user, 3, :with_posts)
6060
end
6161

6262
describe 'explicit count' do

spec/jsonapi/utils/support/pagination_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
end
77

88
before(:all) do
9-
FactoryGirl.create_list(:user, 2)
9+
FactoryBot.create_list(:user, 2)
1010
end
1111

1212
let(:options) { {} }

spec/spec_helper.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
require 'smart_rspec'
2-
require 'factory_girl'
2+
require 'factory_bot'
33
require 'support/helpers'
44

55
RSpec.configure do |config|
6-
config.include FactoryGirl::Syntax::Methods
76
config.include Helpers::ResponseParser
7+
config.include FactoryBot::Syntax::Methods
88

99
config.define_derived_metadata do |meta|
1010
meta[:aggregate_failures] = true

spec/support/factories.rb

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,9 @@
1-
require 'factory_girl'
1+
require 'factory_bot'
2+
require_relative './models'
23

3-
FactoryGirl.define do
4-
factory :category, class: Category do
5-
sequence(:title) { |n| "Title for Category #{n}" }
6-
end
7-
8-
factory :post, class: Post do
9-
association :author, factory: :user
10-
category
11-
12-
sequence(:id) { |n| n }
13-
sequence(:title) { |n| "Title for Post #{n}" }
14-
sequence(:body) { |n| "Body for Post #{n}" }
15-
content_type :article
16-
hidden_field 'It\'s a hidden field!'
17-
end
4+
# require 'byebug'; byebug
185

6+
FactoryBot.define do
197
factory :user, class: User do
208
sequence(:id) { |n| n }
219
sequence(:first_name) { |n| "User##{n}" }
@@ -24,7 +12,7 @@
2412
after(:create) { |user| create(:profile, user: user) }
2513

2614
trait :with_posts do
27-
transient { post_count 3 }
15+
transient { post_count { 3 } }
2816
after(:create) do |user, e|
2917
create_list(:post, e.post_count, author: user)
3018
end
@@ -37,4 +25,19 @@
3725
sequence(:nickname) { |n| "Nickname##{n}" }
3826
sequence(:location) { |n| "Location##{n}" }
3927
end
28+
29+
factory :post, class: Post do
30+
association :author, factory: :user
31+
category
32+
33+
sequence(:id) { |n| n }
34+
sequence(:title) { |n| "Title for Post #{n}" }
35+
sequence(:body) { |n| "Body for Post #{n}" }
36+
content_type { :article }
37+
hidden_field { 'It\'s a hidden field!' }
38+
end
39+
40+
factory :category, class: Category do
41+
sequence(:title) { |n| "Title for Category #{n}" }
42+
end
4043
end

0 commit comments

Comments
 (0)