Migrate to factory_bot

ereslibre · ereslibre · commit 26fdee8c38d0 · 2017-10-21T17:26:53.000+02:00
diff --git a/Gemfile b/Gemfile
@@ -31,7 +31,7 @@ end
 
 group :test do
   gem "brakeman"
-  gem "factory_girl_rails"
+  gem "factory_bot_rails"
   gem "rspec-rails"
   gem "rubocop"
   gem "rubocop-rspec"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -51,10 +51,10 @@ GEM
     diff-lcs (1.3)
     docile (1.1.5)
     erubi (1.7.0)
-    factory_girl (4.8.1)
+    factory_bot (4.8.2)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.8.0)
-      factory_girl (~> 4.8.0)
+    factory_bot_rails (4.8.2)
+      factory_bot (~> 4.8.2)
       railties (>= 3.0.0)
     ffi (1.9.18)
     globalid (0.4.0)
@@ -207,7 +207,7 @@ DEPENDENCIES
   bcrypt (~> 3.1.7)
   brakeman
   byebug
-  factory_girl_rails
+  factory_bot_rails
   jbuilder (~> 2.5)
   jwt (~> 1.5)
   listen (>= 3.0.5, < 3.2)
diff --git a/spec/factories/admin_factory.rb b/spec/factories/admin_factory.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :admin do
     sequence(:username) { |n| "username#{n}" }
     sequence(:email)    { |n| "admin@example#{n}.com" }
diff --git a/spec/factories/cell_factory.rb b/spec/factories/cell_factory.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :cell do
     uuid              { SecureRandom.uuid }
     sequence(:fqdn)   { |n| "cell#{n}.example.com" }
diff --git a/spec/factories/cell_volume_factory.rb b/spec/factories/cell_volume_factory.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :cell_volume do
     cell
   end
diff --git a/spec/factories/download_token_factory.rb b/spec/factories/download_token_factory.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :download_token do
     association :object, factory: :full_object
     user
diff --git a/spec/factories/full_object_factory.rb b/spec/factories/full_object_factory.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :full_object do
     user
     uuid            { SecureRandom.uuid }
diff --git a/spec/factories/full_object_replica_factory.rb b/spec/factories/full_object_replica_factory.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :full_object_replica do
     association :object, factory: :full_object
     cell_volume
diff --git a/spec/factories/sync_token_factory.rb b/spec/factories/sync_token_factory.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :sync_token do
     association :source_cell_volume, factory: :cell_volume
     association :target_cell_volume, factory: :cell_volume
diff --git a/spec/factories/upload_token_factory.rb b/spec/factories/upload_token_factory.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :upload_token do
     user
     cell_volume
diff --git a/spec/factories/user_factory.rb b/spec/factories/user_factory.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user do
     sequence(:username) { |n| "username#{n}" }
     sequence(:email)    { |n| "admin@example#{n}.com" }
diff --git a/spec/jobs/converge_object_job_spec.rb b/spec/jobs/converge_object_job_spec.rb
@@ -2,7 +2,7 @@
 
 RSpec.describe ConvergeObjectJob do
 
-  let(:object) { FactoryGirl.create :full_object }
+  let(:object) { FactoryBot.create :full_object }
 
   describe "#perform" do
     it "calls to Brain.converge_object" do
diff --git a/spec/jobs/sync_object_job_spec.rb b/spec/jobs/sync_object_job_spec.rb
@@ -2,7 +2,7 @@
 
 RSpec.describe SyncObjectJob do
 
-  let(:sync_token) { FactoryGirl.create :sync_token }
+  let(:sync_token) { FactoryBot.create :sync_token }
 
   describe "#perform" do
     it "calls to Brain.sync_object" do
diff --git a/spec/lib/admin_cli_spec.rb b/spec/lib/admin_cli_spec.rb
@@ -5,7 +5,7 @@
 
   subject(:admin_cli) { described_class.new }
 
-  let(:admin) { FactoryGirl.create :admin }
+  let(:admin) { FactoryBot.create :admin }
   let(:username) { "username" }
   let(:password) { "password" }
   let(:email) { "user@example.com" }
diff --git a/spec/lib/brain_spec.rb b/spec/lib/brain_spec.rb
@@ -3,10 +3,10 @@
 
 RSpec.describe Brain do
 
-  let(:object) { FactoryGirl.create :full_object }
-  let(:volume) { FactoryGirl.create :cell_volume }
-  let(:other_volume) { FactoryGirl.create :cell_volume }
-  let(:sync_token) { FactoryGirl.create :sync_token }
+  let(:object) { FactoryBot.create :full_object }
+  let(:volume) { FactoryBot.create :cell_volume }
+  let(:other_volume) { FactoryBot.create :cell_volume }
+  let(:sync_token) { FactoryBot.create :sync_token }
 
   describe ".schedule_sync" do
     def schedule_sync
diff --git a/spec/lib/cell_cli_spec.rb b/spec/lib/cell_cli_spec.rb
@@ -5,8 +5,8 @@
 
   subject(:cell_cli) { described_class.new }
 
-  let(:cell) { FactoryGirl.create :cell }
-  let(:discovered_cell) { FactoryGirl.create :cell, status: :discovered }
+  let(:cell) { FactoryBot.create :cell }
+  let(:discovered_cell) { FactoryBot.create :cell, status: :discovered }
 
   before { cell }
 
diff --git a/spec/lib/cli_spec.rb b/spec/lib/cli_spec.rb
@@ -3,7 +3,7 @@
 
 RSpec.describe CLI do
 
-  let(:admin) { FactoryGirl.create :admin }
+  let(:admin) { FactoryBot.create :admin }
 
   it { is_expected.to have_subcommand "admin" }
   it { is_expected.to have_subcommand "cell" }
diff --git a/spec/models/cell_spec.rb b/spec/models/cell_spec.rb
@@ -1,7 +1,7 @@
 require "spec_helper"
 
 RSpec.describe Cell do
-  let(:cell) { FactoryGirl.create :cell }
+  let(:cell) { FactoryBot.create :cell }
 
   it { is_expected.to have_many(:volumes).class_name("CellVolume").dependent(:destroy) }
   it { is_expected.to have_many(:object_backups).through(:volumes) }
@@ -14,7 +14,7 @@
     subject { cell.accept }
 
     context "current status is discovered" do
-      let(:cell) { FactoryGirl.create :cell, status: described_class.statuses[:discovered] }
+      let(:cell) { FactoryBot.create :cell, status: described_class.statuses[:discovered] }
 
       it { is_expected.to be true }
 
@@ -25,7 +25,7 @@
 
     (described_class.statuses.keys - ["discovered"]).each do |status|
       context "current status is #{status}" do
-        let(:cell) { FactoryGirl.create :cell, status: status }
+        let(:cell) { FactoryBot.create :cell, status: status }
 
         it { is_expected.to be false }
 
diff --git a/spec/models/download_token_spec.rb b/spec/models/download_token_spec.rb
@@ -1,7 +1,7 @@
 require "spec_helper"
 
 RSpec.describe DownloadToken do
-  let(:download_token) { FactoryGirl.create :download_token }
+  let(:download_token) { FactoryBot.create :download_token }
 
   it {
     is_expected.to belong_to(:object).class_name("FullObject")
diff --git a/spec/models/full_object_spec.rb b/spec/models/full_object_spec.rb
@@ -1,9 +1,9 @@
 require "spec_helper"
 
 RSpec.describe FullObject do
-  let(:object) { FactoryGirl.create :full_object }
-  let(:object_replicas) { FactoryGirl.create_list :full_object_replica, 2, object: object }
-  let(:other_cell_volume) { FactoryGirl.create :cell_volume }
+  let(:object) { FactoryBot.create :full_object }
+  let(:object_replicas) { FactoryBot.create_list :full_object_replica, 2, object: object }
+  let(:other_cell_volume) { FactoryBot.create :cell_volume }
 
   it { is_expected.to belong_to(:user) }
   it {
diff --git a/spec/models/upload_token_spec.rb b/spec/models/upload_token_spec.rb
@@ -1,7 +1,7 @@
 require "spec_helper"
 
 RSpec.describe UploadToken do
-  let(:upload_token) { FactoryGirl.create :upload_token }
+  let(:upload_token) { FactoryBot.create :upload_token }
 
   it { is_expected.to belong_to(:user) }
   it { is_expected.to belong_to(:cell_volume) }
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
@@ -1,7 +1,7 @@
 require "spec_helper"
 
 RSpec.describe User do
-  let(:user) { FactoryGirl.create :user }
+  let(:user) { FactoryBot.create :user }
 
   it { is_expected.to have_many(:refresh_tokens).dependent(:destroy) }
   it { is_expected.to have_many(:download_tokens).dependent(:destroy) }
diff --git a/spec/requests/admin_api/v1/cells/accept_controller_spec.rb b/spec/requests/admin_api/v1/cells/accept_controller_spec.rb
@@ -3,9 +3,9 @@
 RSpec.describe AdminApi::V1::Cells::AcceptController do
   subject { response }
 
-  let(:admin)           { FactoryGirl.create :admin }
-  let(:discovered_cell) { FactoryGirl.create :cell, status: :discovered }
-  let(:accepted_cell)   { FactoryGirl.create :cell, status: :accepted }
+  let(:admin)           { FactoryBot.create :admin }
+  let(:discovered_cell) { FactoryBot.create :cell, status: :discovered }
+  let(:accepted_cell)   { FactoryBot.create :cell, status: :accepted }
   let(:headers)         { { headers: basic_auth(admin) } }
 
   context "cell is in discovered status" do
diff --git a/spec/requests/api/v1/objects/downloads_controller_spec.rb b/spec/requests/api/v1/objects/downloads_controller_spec.rb
@@ -3,7 +3,7 @@
 RSpec.describe Api::V1::Objects::DownloadsController do
   subject { response }
 
-  let(:object_replica) { FactoryGirl.create :full_object_replica }
+  let(:object_replica) { FactoryBot.create :full_object_replica }
   let(:user) { object_replica.object.user }
 
   describe "#show" do
diff --git a/spec/requests/api/v1/objects_controller_spec.rb b/spec/requests/api/v1/objects_controller_spec.rb
@@ -3,7 +3,7 @@
 RSpec.describe Api::V1::ObjectsController do
   subject { response }
 
-  let(:object_replica) { FactoryGirl.create :full_object_replica }
+  let(:object_replica) { FactoryBot.create :full_object_replica }
   let(:object) { object_replica.object }
   let(:user) { object.user }
 
diff --git a/spec/requests/api/v1/sessions_controller_spec.rb b/spec/requests/api/v1/sessions_controller_spec.rb
@@ -3,7 +3,7 @@
 RSpec.describe Api::V1::SessionsController do
   subject { response }
 
-  let(:user) { FactoryGirl.create :user }
+  let(:user) { FactoryBot.create :user }
   let(:refresh_token) { user.refresh_tokens.create }
 
   describe "#create" do
diff --git a/spec/requests/cluster_api/v1/cells/discovery_controller_spec.rb b/spec/requests/cluster_api/v1/cells/discovery_controller_spec.rb
@@ -3,7 +3,7 @@
 RSpec.describe ClusterApi::V1::Cells::DiscoveryController do
   subject { response }
 
-  let(:cell) { FactoryGirl.build :cell }
+  let(:cell) { FactoryBot.build :cell }
   let(:cell_params) do
     {
       cell: {
diff --git a/spec/requests/cluster_api/v1/download_tokens_controller_spec.rb b/spec/requests/cluster_api/v1/download_tokens_controller_spec.rb
@@ -3,7 +3,7 @@
 RSpec.describe ClusterApi::V1::DownloadTokensController do
   subject { response }
 
-  let(:download_token) { FactoryGirl.create :download_token }
+  let(:download_token) { FactoryBot.create :download_token }
   let(:cell) { download_token.cell_volume.cell }
   let(:user) { download_token.user }
   let(:remote_ip) { download_token.remote_ip }
diff --git a/spec/requests/cluster_api/v1/objects_controller_spec.rb b/spec/requests/cluster_api/v1/objects_controller_spec.rb
@@ -3,8 +3,8 @@
 RSpec.describe ClusterApi::V1::ObjectsController do
   subject { response }
 
-  let(:object) { FactoryGirl.create :full_object }
-  let(:upload_token) { FactoryGirl.create :upload_token, user: object.user }
+  let(:object) { FactoryBot.create :full_object }
+  let(:upload_token) { FactoryBot.create :upload_token, user: object.user }
   let(:existing_object_params) do
     {
       upload_token: upload_token.token,
diff --git a/spec/requests/cluster_api/v1/sync_tokens_controller_spec.rb b/spec/requests/cluster_api/v1/sync_tokens_controller_spec.rb
@@ -3,7 +3,7 @@
 RSpec.describe ClusterApi::V1::SyncTokensController do
   subject { response }
 
-  let(:sync_token) { FactoryGirl.create :sync_token }
+  let(:sync_token) { FactoryBot.create :sync_token }
   let(:remote_ip) { sync_token.target_cell_volume.cell.ip_address }
 
   before { show }
diff --git a/spec/requests/cluster_api/v1/upload_tokens_controller_spec.rb b/spec/requests/cluster_api/v1/upload_tokens_controller_spec.rb
@@ -3,7 +3,7 @@
 RSpec.describe ClusterApi::V1::UploadTokensController do
   subject { response }
 
-  let(:upload_token) { FactoryGirl.create :upload_token }
+  let(:upload_token) { FactoryBot.create :upload_token }
   let(:cell) { upload_token.cell_volume.cell }
   let(:user) { upload_token.user }
   let(:remote_ip) { upload_token.remote_ip }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FactoryGirl.define do`
	`1`	`+FactoryBot.define do`
`2`	`2`	`factory :admin do`
`3`	`3`	`sequence(:username) { \|n\| "username#{n}" }`
`4`	`4`	`sequence(:email) { \|n\| "admin@example#{n}.com" }`