diff --git a/spec/factories/ext_management_system.rb b/spec/factories/ext_management_system.rb index 1d3bb7e..93c52ef 100644 --- a/spec/factories/ext_management_system.rb +++ b/spec/factories/ext_management_system.rb @@ -1,11 +1,11 @@ -FactoryGirl.define do +FactoryBot.define do factory :ems_redfish_physical_infra, :aliases => ["manageiq/providers/redfish/physical_infra"], :class => "ManageIQ::Providers::Redfish::PhysicalInfraManager", :parent => :ems_physical_infra do trait :auth do after(:create) do |ems| - ems.authentications << FactoryGirl.create(:authentication) + ems.authentications << FactoryBot.create(:authentication) end end @@ -20,7 +20,7 @@ after(:create) do |ems| secrets = Rails.application.secrets.redfish - ems.authentications << FactoryGirl.create( + ems.authentications << FactoryBot.create( :authentication, :userid => secrets.try(:[], "userid") || "REDFISH_USERID", :password => secrets.try(:[], "password") || "REDFISH_PASSWORD" diff --git a/spec/factories/physical_server.rb b/spec/factories/physical_server.rb index 0d56b8d..2100c3a 100644 --- a/spec/factories/physical_server.rb +++ b/spec/factories/physical_server.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :redfish_physical_server, :class => "ManageIQ::Providers::Redfish::PhysicalInfraManager::PhysicalServer", :parent => :physical_server do diff --git a/spec/models/manageiq/providers/redfish/physical_infra_manager/operations/led_spec.rb b/spec/models/manageiq/providers/redfish/physical_infra_manager/operations/led_spec.rb index 363a768..434ebff 100644 --- a/spec/models/manageiq/providers/redfish/physical_infra_manager/operations/led_spec.rb +++ b/spec/models/manageiq/providers/redfish/physical_infra_manager/operations/led_spec.rb @@ -1,7 +1,7 @@ describe ManageIQ::Providers::Redfish::PhysicalInfraManager do - let(:server) { FactoryGirl.create(:redfish_physical_server, :vcr) } + let(:server) { FactoryBot.create(:redfish_physical_server, :vcr) } subject(:ems) do - FactoryGirl.create(:ems_redfish_physical_infra, :vcr) + FactoryBot.create(:ems_redfish_physical_infra, :vcr) end describe "#blink_loc_led", :vcr do diff --git a/spec/models/manageiq/providers/redfish/physical_infra_manager/operations/power_spec.rb b/spec/models/manageiq/providers/redfish/physical_infra_manager/operations/power_spec.rb index 7616475..c3583fe 100644 --- a/spec/models/manageiq/providers/redfish/physical_infra_manager/operations/power_spec.rb +++ b/spec/models/manageiq/providers/redfish/physical_infra_manager/operations/power_spec.rb @@ -1,7 +1,7 @@ describe ManageIQ::Providers::Redfish::PhysicalInfraManager do - let(:server) { FactoryGirl.create(:redfish_physical_server, :vcr) } + let(:server) { FactoryBot.create(:redfish_physical_server, :vcr) } subject(:ems) do - FactoryGirl.create(:ems_redfish_physical_infra, :vcr) + FactoryBot.create(:ems_redfish_physical_infra, :vcr) end describe "#power_on", :vcr do diff --git a/spec/models/manageiq/providers/redfish/physical_infra_manager/refresher_spec.rb b/spec/models/manageiq/providers/redfish/physical_infra_manager/refresher_spec.rb index e9c2e6d..908a4ab 100644 --- a/spec/models/manageiq/providers/redfish/physical_infra_manager/refresher_spec.rb +++ b/spec/models/manageiq/providers/redfish/physical_infra_manager/refresher_spec.rb @@ -1,6 +1,6 @@ describe ManageIQ::Providers::Redfish::PhysicalInfraManager::Refresher do subject(:ems) do - FactoryGirl.create(:ems_redfish_physical_infra, :vcr, + FactoryBot.create(:ems_redfish_physical_infra, :vcr, :security_protocol => "ssl", :port => 8889) end diff --git a/spec/models/manageiq/providers/redfish/physical_infra_manager_spec.rb b/spec/models/manageiq/providers/redfish/physical_infra_manager_spec.rb index 9b1492f..a647d07 100644 --- a/spec/models/manageiq/providers/redfish/physical_infra_manager_spec.rb +++ b/spec/models/manageiq/providers/redfish/physical_infra_manager_spec.rb @@ -10,7 +10,7 @@ let(:rf_module) { class_double("RedfishClient").as_stubbed_const } let(:rf_client) { instance_double("RedfishClient::Root") } subject(:ems) do - FactoryGirl.create(:ems_redfish_physical_infra, :auth, + FactoryBot.create(:ems_redfish_physical_infra, :auth, :hostname => "host", :port => 1234) end @@ -44,7 +44,7 @@ context "#connect" do it "aborts on missing credentials" do - ems = FactoryGirl.create(:ems_redfish_physical_infra) + ems = FactoryBot.create(:ems_redfish_physical_infra) expect { ems.connect }.to raise_error(MiqException::MiqHostError) end