From b9d728f890eec61ca96fe0c539e916f1bfe68dd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Tue, 21 Nov 2017 22:50:03 +0100 Subject: [PATCH] replaced deprecate FactoryGirl gem with FactoryBot --- Gemfile | 4 ++-- Gemfile.lock | 24 ++++++++++++------------ spec/factories/group.rb | 4 ++-- spec/factories/import_job.rb | 2 +- spec/factories/link.rb | 2 +- spec/factories/online_notification.rb | 2 +- spec/factories/role.rb | 4 ++-- spec/factories/scheduler.rb | 4 ++-- spec/factories/signature.rb | 4 ++-- spec/factories/tag.rb | 2 +- spec/factories/ticket.rb | 4 ++-- spec/factories/ticket/article.rb | 2 +- spec/factories/token.rb | 4 ++-- spec/factories/user.rb | 4 ++-- spec/factories/vendor/net/ldap/entry.rb | 2 +- spec/support/factory_bot.rb | 3 +++ spec/support/factory_girl.rb | 3 --- spec/support/system_init.rb | 2 +- 18 files changed, 38 insertions(+), 38 deletions(-) create mode 100644 spec/support/factory_bot.rb delete mode 100644 spec/support/factory_girl.rb diff --git a/Gemfile b/Gemfile index 53e3fff1a..394f766f1 100644 --- a/Gemfile +++ b/Gemfile @@ -131,8 +131,8 @@ group :development, :test do # Setting ENV for testing purposes gem 'figaro' - # Use Factory Girl for generating random test data - gem 'factory_girl_rails' + # Use Factory Bot for generating random test data + gem 'factory_bot_rails' # mock http calls gem 'webmock' diff --git a/Gemfile.lock b/Gemfile.lock index 4fb822511..bc2c0bf51 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -97,12 +97,12 @@ GEM composite_primary_keys (10.0.1) activerecord (~> 5.1.0) concurrent-ruby (1.0.5) - coveralls (0.8.21) - json (>= 1.8, < 3) - simplecov (~> 0.14.1) - term-ansicolor (~> 1.3) - thor (~> 0.19.4) - tins (~> 1.6) + coveralls (0.7.1) + multi_json (~> 1.3) + rest-client + simplecov (>= 0.7) + term-ansicolor + thor crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.3) @@ -132,10 +132,10 @@ GEM erubi (1.7.0) eventmachine (1.2.5) execjs (2.7.0) - factory_girl (4.9.0) + factory_bot (4.8.2) activesupport (>= 3.0.0) - factory_girl_rails (4.9.0) - factory_girl (~> 4.9.0) + factory_bot_rails (4.8.2) + factory_bot (~> 4.8.2) railties (>= 3.0.0) faraday (0.12.2) multipart-post (>= 1.2, < 3) @@ -391,7 +391,7 @@ GEM shellany (0.0.1) simple-rss (1.3.1) simple_oauth (0.3.1) - simplecov (0.14.1) + simplecov (0.15.1) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) @@ -420,7 +420,7 @@ GEM therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref - thor (0.19.4) + thor (0.20.0) thread_safe (0.3.6) tilt (2.0.8) tins (1.15.1) @@ -496,7 +496,7 @@ DEPENDENCIES em-websocket eventmachine execjs - factory_girl_rails + factory_bot_rails figaro github_changelog_generator guard diff --git a/spec/factories/group.rb b/spec/factories/group.rb index 41470d89c..b2a673ee1 100644 --- a/spec/factories/group.rb +++ b/spec/factories/group.rb @@ -1,10 +1,10 @@ -FactoryGirl.define do +FactoryBot.define do sequence :test_group_name do |n| "TestGroup#{n}" end end -FactoryGirl.define do +FactoryBot.define do factory :group do name { generate(:test_group_name) } diff --git a/spec/factories/import_job.rb b/spec/factories/import_job.rb index ce4ed05e3..228093a1d 100644 --- a/spec/factories/import_job.rb +++ b/spec/factories/import_job.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :import_job do name 'Import::Test' payload {} diff --git a/spec/factories/link.rb b/spec/factories/link.rb index a9fb7195a..5365c4ade 100644 --- a/spec/factories/link.rb +++ b/spec/factories/link.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :link do link_type_id { Link::Type.find_by(name: 'normal').id } link_object_source_id { Link::Object.find_by(name: 'Ticket').id } diff --git a/spec/factories/online_notification.rb b/spec/factories/online_notification.rb index 37ef435f9..00e43c1d0 100644 --- a/spec/factories/online_notification.rb +++ b/spec/factories/online_notification.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :online_notification do object_lookup_id { ObjectLookup.by_name('Ticket') } type_lookup_id { TypeLookup.by_name('Assigned to you') } diff --git a/spec/factories/role.rb b/spec/factories/role.rb index 6a8cd742f..23d0c4463 100644 --- a/spec/factories/role.rb +++ b/spec/factories/role.rb @@ -1,10 +1,10 @@ -FactoryGirl.define do +FactoryBot.define do sequence :test_role_name do |n| "TestRole#{n}" end end -FactoryGirl.define do +FactoryBot.define do factory :role do name { generate(:test_role_name) } diff --git a/spec/factories/scheduler.rb b/spec/factories/scheduler.rb index 5b484c9a1..5f2cc2e36 100644 --- a/spec/factories/scheduler.rb +++ b/spec/factories/scheduler.rb @@ -1,10 +1,10 @@ -FactoryGirl.define do +FactoryBot.define do sequence :test_scheduler_name do |n| "Testscheduler#{n}" end end -FactoryGirl.define do +FactoryBot.define do factory :scheduler do name { generate(:test_scheduler_name) } diff --git a/spec/factories/signature.rb b/spec/factories/signature.rb index acbee4f72..15bc21f3e 100644 --- a/spec/factories/signature.rb +++ b/spec/factories/signature.rb @@ -1,10 +1,10 @@ -FactoryGirl.define do +FactoryBot.define do sequence :test_signature_name do |n| "Test signature #{n}" end end -FactoryGirl.define do +FactoryBot.define do factory :signature do name { generate(:test_signature_name) } body '#{user.firstname} #{user.lastname}'.text2html diff --git a/spec/factories/tag.rb b/spec/factories/tag.rb index 04e00c15d..3794e6f2b 100644 --- a/spec/factories/tag.rb +++ b/spec/factories/tag.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :tag do tag_object_id { Tag::Object.lookup_by_name_and_create('Ticket').id } tag_item_id { Tag::Item.lookup_by_name_and_create('blub').id } diff --git a/spec/factories/ticket.rb b/spec/factories/ticket.rb index a9161d77f..35b03275c 100644 --- a/spec/factories/ticket.rb +++ b/spec/factories/ticket.rb @@ -1,8 +1,8 @@ -FactoryGirl.define do +FactoryBot.define do factory :ticket do title 'Test Ticket' group { Group.lookup(name: 'Users') } - customer { FactoryGirl.create(:customer_user) } + customer { FactoryBot.create(:customer_user) } state { Ticket::State.lookup(name: 'new') } priority { Ticket::Priority.lookup(name: '2 normal') } updated_by_id 1 diff --git a/spec/factories/ticket/article.rb b/spec/factories/ticket/article.rb index be26f9c3f..efcd7f845 100644 --- a/spec/factories/ticket/article.rb +++ b/spec/factories/ticket/article.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :ticket_article, class: Ticket::Article do from 'factory-customer-1@example.com' to 'factory-customer-1@example.com' diff --git a/spec/factories/token.rb b/spec/factories/token.rb index bdd77e6f3..f87477ef1 100644 --- a/spec/factories/token.rb +++ b/spec/factories/token.rb @@ -1,6 +1,6 @@ -FactoryGirl.define do +FactoryBot.define do factory :token do - user_id { FactoryGirl.create(:user).id } + user_id { FactoryBot.create(:user).id } end factory :token_password_reset, parent: :token do diff --git a/spec/factories/user.rb b/spec/factories/user.rb index 8077e61be..4272f225d 100644 --- a/spec/factories/user.rb +++ b/spec/factories/user.rb @@ -1,10 +1,10 @@ -FactoryGirl.define do +FactoryBot.define do sequence :email do |n| "nicole.braun#{n}@zammad.org" end end -FactoryGirl.define do +FactoryBot.define do factory :user do login 'nicole.braun' diff --git a/spec/factories/vendor/net/ldap/entry.rb b/spec/factories/vendor/net/ldap/entry.rb index 605b368eb..5dc4fa729 100644 --- a/spec/factories/vendor/net/ldap/entry.rb +++ b/spec/factories/vendor/net/ldap/entry.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do # add custom attributes via: # mocked_entry = build(:ldap_entry) diff --git a/spec/support/factory_bot.rb b/spec/support/factory_bot.rb new file mode 100644 index 000000000..c7890e49c --- /dev/null +++ b/spec/support/factory_bot.rb @@ -0,0 +1,3 @@ +RSpec.configure do |config| + config.include FactoryBot::Syntax::Methods +end diff --git a/spec/support/factory_girl.rb b/spec/support/factory_girl.rb deleted file mode 100644 index eec437fb3..000000000 --- a/spec/support/factory_girl.rb +++ /dev/null @@ -1,3 +0,0 @@ -RSpec.configure do |config| - config.include FactoryGirl::Syntax::Methods -end diff --git a/spec/support/system_init.rb b/spec/support/system_init.rb index 3b4bcec18..ac0c986b7 100644 --- a/spec/support/system_init.rb +++ b/spec/support/system_init.rb @@ -3,7 +3,7 @@ RSpec.configure do |config| email = 'admin@example.com' if !::User.exists?(email: email) - FactoryGirl.create(:user, + FactoryBot.create(:user, login: 'admin', firstname: 'Admin', lastname: 'Admin',