Begin conversion from FactoryGirl to FactoryBot

Gemfile

@@ -229,7 +229,7 @@ unless ENV["APPLIANCE"]
     gem "brakeman",         "~>3.3",    :require => false
     gem "capybara",         "~>2.5.0",  :require => false
     gem "coveralls",                    :require => false
-    gem "factory_girl",     "~>4.5.0",  :require => false
+    gem "factory_bot",      "~>4.11.1", :require => false
     gem "timecop",          "~>0.7.3",  :require => false
     gem "vcr",              "~>3.0.2",  :require => false
     gem "webmock",          "~>2.3.1",  :require => false

config/environments/test.rb

@@ -62,7 +62,7 @@
 end
 
 require "minitest"
-require "factory_girl"
+require "factory_bot"
 require "timecop"
 require "vcr"
 require "webmock/rspec"

spec/factories/account.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :account
 
   factory :account_user, :parent => :account do

spec/factories/assigned_server_role.rb

@@ -1,11 +1,11 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :assigned_server_role do
     active          { true }
     priority        { AssignedServerRole::HIGH_PRIORITY }
   end
 
   factory :assigned_server_role_in_master_region, :parent => :assigned_server_role do
     # GOAL: master_supported? = true, regional_role? = true
-    server_role { FactoryGirl.create(:server_role, :role_scope => "region", :max_concurrent => 1) }
+    server_role { FactoryBot.create(:server_role, :role_scope => "region", :max_concurrent => 1) }
   end
 end

spec/factories/authentication.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :authentication do
     userid      "testuser"
     password    "secret"

spec/factories/automate_workspace.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :automate_workspace do
     user
     tenant

spec/factories/availability_zone.rb

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

spec/factories/blacklisted_event.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :blacklisted_event do
     enabled true
   end

spec/factories/categories.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory(:category) do
     sequence(:name)        { |n| "category_#{seq_padded_for_sorting(n)}" }
     sequence(:description) { |n| "category #{seq_padded_for_sorting(n)}" }

spec/factories/chargeable_field.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :chargeable_field do
     metric 'unknown'
     group  'unknown'
@@ -18,7 +18,7 @@
     metric      'cpu_usagemhz_rate_average'
     group       'cpu'
     source      'used'
-    detail_measure { FactoryGirl.build(:chargeback_measure_hz) }
+    detail_measure { FactoryBot.build(:chargeback_measure_hz) }
   end
 
   factory :chargeable_field_cpu_allocated, :parent => :chargeable_field do
@@ -33,15 +33,15 @@
     metric      'derived_memory_available'
     group       'memory'
     source      'allocated'
-    detail_measure { FactoryGirl.build(:chargeback_measure_bytes) }
+    detail_measure { FactoryBot.build(:chargeback_measure_bytes) }
   end
 
   factory :chargeable_field_storage_allocated, :parent => :chargeable_field do
     description 'Allocated Disk Storage in Bytes'
     metric      'derived_vm_allocated_disk_storage'
     group       'storage'
     source      'allocated'
-    detail_measure { FactoryGirl.build(:chargeback_measure_bytes) }
+    detail_measure { FactoryBot.build(:chargeback_measure_bytes) }
   end
 
   factory :chargeable_field_cpu_cores_used, :parent => :chargeable_field do
@@ -63,31 +63,31 @@
     metric      'derived_memory_used'
     group       'memory'
     source      'used'
-    detail_measure { FactoryGirl.build(:chargeback_measure_bytes) }
+    detail_measure { FactoryBot.build(:chargeback_measure_bytes) }
   end
 
   factory :chargeable_field_net_io_used, :parent => :chargeable_field do
     description 'Used Network I/O in KBps'
     metric      'net_usage_rate_average'
     group       'net_io'
     source      'used'
-    detail_measure { FactoryGirl.build(:chargeback_measure_bps) }
+    detail_measure { FactoryBot.build(:chargeback_measure_bps) }
   end
 
   factory :chargeable_field_disk_io_used, :parent => :chargeable_field do
     description 'Used disk I/O in KBps'
     metric      'disk_usage_rate_average'
     group       'disk_io'
     source      'used'
-    detail_measure { FactoryGirl.build(:chargeback_measure_bps) }
+    detail_measure { FactoryBot.build(:chargeback_measure_bps) }
   end
 
   factory :chargeable_field_storage_used, :parent => :chargeable_field do
     description 'Used Disk Storage in Bytes'
     metric      'derived_vm_used_disk_storage'
     group       'storage'
     source      'used'
-    detail_measure { FactoryGirl.build(:chargeback_measure_bytes) }
+    detail_measure { FactoryBot.build(:chargeback_measure_bytes) }
   end
 
   factory :chargeable_field_metering_used, :parent => :chargeable_field do

spec/factories/chargeback_rate.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :chargeback_rate do
     guid                   { SecureRandom.uuid }
     sequence(:description) { |n| "Chargeback Rate ##{n}" }
@@ -19,14 +19,14 @@
         params_hash.merge!(chargeback_rate_params[:detail]) if chargeback_rate_params[:detail]
         params = [factory_name, :tiers, params_hash]
 
-        chargeback_rate.chargeback_rate_details << FactoryGirl.create(*params)
+        chargeback_rate.chargeback_rate_details << FactoryBot.create(*params)
       end
     end
 
     trait :with_details do
       chargeback_rate_details do
-        [FactoryGirl.create(:chargeback_rate_detail_memory_allocated, :tiers_with_three_intervals),
-         FactoryGirl.create(:chargeback_rate_detail_memory_used, :tiers)]
+        [FactoryBot.create(:chargeback_rate_detail_memory_allocated, :tiers_with_three_intervals),
+         FactoryBot.create(:chargeback_rate_detail_memory_used, :tiers)]
       end
     end
 
@@ -43,7 +43,7 @@
           chargeback_rate_detail_memory_used
           chargeback_rate_detail_net_io_used
         ).each do |factory_name|
-          chargeback_rate.chargeback_rate_details << FactoryGirl.create(factory_name,
+          chargeback_rate.chargeback_rate_details << FactoryBot.create(factory_name,
                                                                         :tiers_with_three_intervals,
                                                                         :per_time => evaluator.per_time)
         end
@@ -60,7 +60,7 @@
           chargeback_rate_detail_fixed_storage_cost
           chargeback_rate_detail_fixed_storage_cost
         ).each do |factory_name|
-          chargeback_rate.chargeback_rate_details << FactoryGirl.create(factory_name,
+          chargeback_rate.chargeback_rate_details << FactoryBot.create(factory_name,
                                                                         :tiers_with_three_intervals,
                                                                         :per_time => evaluator.per_time)
         end

spec/factories/chargeback_rate_detail.rb

@@ -1,7 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :chargeback_rate_detail do
     chargeback_rate
-    detail_currency { FactoryGirl.create(:chargeback_rate_detail_currency) }
+    detail_currency { FactoryBot.create(:chargeback_rate_detail_currency) }
 
     transient do
       tiers_params nil
@@ -11,20 +11,20 @@
       after(:create) do |chargeback_rate_detail, evaluator|
         if evaluator.tiers_params
           evaluator.tiers_params.each do |tier|
-            chargeback_rate_detail.chargeback_tiers << FactoryGirl.create(*[:chargeback_tier, tier])
+            chargeback_rate_detail.chargeback_tiers << FactoryBot.create(*[:chargeback_tier, tier])
           end
         else
-          chargeback_rate_detail.chargeback_tiers << FactoryGirl.create(:chargeback_tier)
+          chargeback_rate_detail.chargeback_tiers << FactoryBot.create(:chargeback_tier)
         end
       end
     end
 
     trait :tiers_with_three_intervals do
       chargeback_tiers do
         [
-          FactoryGirl.create(:chargeback_tier_first_of_three),
-          FactoryGirl.create(:chargeback_tier_second_of_three),
-          FactoryGirl.create(:chargeback_tier_third_of_three)
+          FactoryBot.create(:chargeback_tier_first_of_three),
+          FactoryBot.create(:chargeback_tier_second_of_three),
+          FactoryBot.create(:chargeback_tier_third_of_three)
         ]
       end
     end
@@ -52,54 +52,54 @@
 
   factory :chargeback_rate_detail_cpu_used, :parent => :chargeback_rate_detail do
     per_unit    "megahertz"
-    chargeable_field { FactoryGirl.build(:chargeable_field_cpu_used) }
+    chargeable_field { FactoryBot.build(:chargeable_field_cpu_used) }
   end
 
   factory :chargeback_rate_detail_cpu_cores_used, :parent => :chargeback_rate_detail do
     per_unit    "cores"
-    chargeable_field { FactoryGirl.build(:chargeable_field_cpu_cores_used) }
+    chargeable_field { FactoryBot.build(:chargeable_field_cpu_cores_used) }
   end
 
   factory :chargeback_rate_detail_cpu_cores_allocated, :parent => :chargeback_rate_detail do
     per_unit    "cores"
-    chargeable_field { FactoryGirl.build(:chargeable_field_cpu_cores_allocated) }
+    chargeable_field { FactoryBot.build(:chargeable_field_cpu_cores_allocated) }
   end
 
   factory :chargeback_rate_detail_cpu_allocated, :traits => [:daily],
                                                  :parent => :chargeback_rate_detail do
     per_unit    "cpu"
-    chargeable_field { FactoryGirl.build(:chargeable_field_cpu_allocated) }
+    chargeable_field { FactoryBot.build(:chargeable_field_cpu_allocated) }
   end
 
   factory :chargeback_rate_detail_memory_allocated, :traits => [:megabytes, :daily],
                                                     :parent => :chargeback_rate_detail do
-    chargeable_field { FactoryGirl.build(:chargeable_field_memory_allocated) }
+    chargeable_field { FactoryBot.build(:chargeable_field_memory_allocated) }
   end
 
   factory :chargeback_rate_detail_memory_used, :traits => [:megabytes, :hourly],
                                                :parent => :chargeback_rate_detail do
-    chargeable_field { FactoryGirl.build(:chargeable_field_memory_used) }
+    chargeable_field { FactoryBot.build(:chargeable_field_memory_used) }
   end
 
   factory :chargeback_rate_detail_disk_io_used, :traits => [:kbps], :parent => :chargeback_rate_detail do
-    chargeable_field { FactoryGirl.build(:chargeable_field_disk_io_used) }
+    chargeable_field { FactoryBot.build(:chargeable_field_disk_io_used) }
   end
 
   factory :chargeback_rate_detail_net_io_used, :traits => [:kbps], :parent => :chargeback_rate_detail do
-    chargeable_field { FactoryGirl.build(:chargeable_field_net_io_used) }
+    chargeable_field { FactoryBot.build(:chargeable_field_net_io_used) }
   end
 
   factory :chargeback_rate_detail_storage_used, :traits => [:gigabytes],
                                                 :parent => :chargeback_rate_detail do
-    chargeable_field { FactoryGirl.build(:chargeable_field_storage_used) }
+    chargeable_field { FactoryBot.build(:chargeable_field_storage_used) }
   end
 
   factory :chargeback_rate_detail_storage_allocated, :traits => [:gigabytes],
                                                      :parent => :chargeback_rate_detail do
-    chargeable_field { FactoryGirl.build(:chargeable_field_storage_allocated) }
+    chargeable_field { FactoryBot.build(:chargeable_field_storage_allocated) }
   end
 
   factory :chargeback_rate_detail_fixed_compute_cost, :traits => [:daily], :parent => :chargeback_rate_detail do
-    chargeable_field { FactoryGirl.build(:chargeable_field_fixed_compute_1) }
+    chargeable_field { FactoryBot.build(:chargeable_field_fixed_compute_1) }
   end
 end

spec/factories/chargeback_rate_detail_currency.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :chargeback_rate_detail_currency do
     code  "EUR"
     name "Euro"

spec/factories/chargeback_rate_detail_measure.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :chargeback_rate_detail_measure do
     step  "1024"
     name "Bytes Units"

spec/factories/chargeback_tier.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :chargeback_tier do
     start 0
     finish Float::INFINITY

spec/factories/classification.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :classification do
     sequence(:name)        { |n| "category_#{seq_padded_for_sorting(n)}" }
     sequence(:description) { |n| "category #{seq_padded_for_sorting(n)}" }
@@ -31,17 +31,17 @@
   factory :classification_cost_center_with_tags, :parent => :classification_cost_center do
     children do
       [
-        FactoryGirl.create(:classification_tag, :name => "001", :description => "Cost Center 001"),
+        FactoryBot.create(:classification_tag, :name => "001", :description => "Cost Center 001"),
       ]
     end
   end
 
   factory :classification_department_with_tags, :parent => :classification_department do
     children do
       [
-        FactoryGirl.create(:classification_tag, :name => "accounting", :description => "Accounting"),
-        FactoryGirl.create(:classification_tag, :name => "finance",    :description => "Financial Services"),
-        FactoryGirl.create(:classification_tag, :name => "hr",         :description => "Human Resources"),
+        FactoryBot.create(:classification_tag, :name => "accounting", :description => "Accounting"),
+        FactoryBot.create(:classification_tag, :name => "finance",    :description => "Financial Services"),
+        FactoryBot.create(:classification_tag, :name => "hr",         :description => "Human Resources"),
       ]
     end
   end

spec/factories/cloud_network.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :cloud_network do
     sequence(:name)    { |n| "cloud_network_#{seq_padded_for_sorting(n)}" }
     sequence(:ems_ref) { |n| "ems_ref_#{seq_padded_for_sorting(n)}" }

spec/factories/cloud_service.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :cloud_service do
     sequence(:executable_name) { |n| "cloud_service_#{seq_padded_for_sorting(n)}" }
     scheduling_disabled false

spec/factories/cloud_subnet.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :cloud_subnet do
     sequence(:name)    { |n| "cloud_subnet_#{seq_padded_for_sorting(n)}" }
     sequence(:ems_ref) { |n| "ems_ref_#{seq_padded_for_sorting(n)}" }

spec/factories/cloud_tenants.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :cloud_tenant do
     sequence(:name)         { |n| "cloud_tenant_#{seq_padded_for_sorting(n)}" }
     sequence(:description)  { |n| "cloud_tenant_description_#{seq_padded_for_sorting(n)}" }

spec/factories/cloud_volume.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :cloud_volume do
     sequence(:volume_type) { |n| "volume_type_#{seq_padded_for_sorting(n)}" }
   end

spec/factories/cloud_volume_backup.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :cloud_volume_backup do
     sequence(:name)    { |n| "cloud_volume_backup_#{seq_padded_for_sorting(n)}" }
     sequence(:ems_ref) { |n| "ems_ref_#{seq_padded_for_sorting(n)}" }

spec/factories/cloud_volume_snapshot.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :cloud_volume_snapshot do
     sequence(:name)    { |n| "cloud_volume_snapshot_#{seq_padded_for_sorting(n)}" }
     sequence(:ems_ref) { |n| "ems_ref_#{seq_padded_for_sorting(n)}" }

spec/factories/compliance.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :compliance do
     sequence(:id)          { |n| 10_000_000 + n }
     sequence(:resource_id) { |n| 10_000_010 + n }

spec/factories/compliance_detail.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :compliance_detail do
     sequence(:id) { |n| 10_000_000 + n }
     created_on DateTime .current

spec/factories/condition.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :condition do
     sequence(:name)        { |num| "condition_#{seq_padded_for_sorting(num)}" }
     sequence(:description) { |num| "Condition #{seq_padded_for_sorting(num)}" }

spec/factories/configuration_location.rb

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

spec/factories/configuration_organization.rb

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