foreman_discovery 10.0.0 → 11.0.0

data/test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb

@@ -7,14 +7,14 @@ module ForemanDiscovery
 
       context 'hosts controller requests from discovered_hosts url' do
         test 'get "host" params from "discovered_hosts" params' do
-          os = FactoryGirl.create(:operatingsystem, :with_associations)
+          os = FactoryBot.create(:operatingsystem, :with_associations)
           arch_id = os.architectures.first.id
           discovered_host_params = {
             'discovered_host' => { 'architecture_id' => arch_id }
           }
 
           @request.stubs(:path).returns(architecture_selected_discovered_hosts_path)
-          post :architecture_selected, discovered_host_params, set_session_user
+          post :architecture_selected, params: discovered_host_params, session: set_session_user
           assert_match(/"#{os.id}"/, response.body)
         end
       end

data/test/integration/discovered_hosts_test.rb

@@ -0,0 +1,151 @@
+require 'test_plugin_helper'
+require 'integration_test_helper'
+
+class DiscoveredHostsTest < IntegrationTestWithJavascript
+  let(:discovered_host) { FactoryBot.create(:discovered_host, :with_facts) }
+  let(:discovered_hosts) { Host::Discovered.all }
+
+  extend Minitest::OptionalRetry
+
+  setup do
+    assert discovered_notification_blueprint
+    discovered_host.save!
+    visit discovered_hosts_path
+  end
+
+  teardown do
+    Host::Discovered.destroy_all
+  end
+
+  describe 'Reboot all' do
+    test 'triggers reboot on all discovered_hosts' do
+      Host::Discovered.any_instance
+                      .expects(:reboot)
+                      .at_least(discovered_hosts.count)
+      select_all_hosts
+      page.find_link('Reboot All').click
+    end
+  end
+
+  describe 'Autoprovision all' do
+    test 'converts all discovered to managed hosts' do
+      select_all_hosts
+      page.find_link('Auto Provision All').click
+      wait_for_ajax
+      assert page.has_text?('Discovered hosts are provisioning now')
+    end
+  end
+
+  describe 'Delete hosts' do
+    test 'it removes all hosts' do
+      select_all_hosts
+      page.find_link('Select Action').click
+      page.find_link('Delete hosts').click
+      wait_for_ajax
+      assert page.has_text?('The following hosts are about to be changed')
+      page.find_button('Submit').click
+      wait_for_ajax
+      assert page.has_text?('Destroyed selected hosts')
+    end
+  end
+
+  describe 'using Create Host link' do
+    setup do
+      page.find("#host_ids_#{discovered_host.id}")
+          .query_scope
+          .find_link('Provision').click
+    end
+
+    test 'and forwards to editing it' do
+      create_host
+      assert_equal edit_discovered_host_path(id: discovered_host),
+                   current_path
+    end
+
+    context 'with a Hostgroup selected' do
+      let(:discovery_hostgroup) { Hostgroup.first }
+
+      test 'it passes it on' do
+        select_from('host_hostgroup_id', discovery_hostgroup.id)
+        create_host
+        assert_param discovery_hostgroup.id.to_s,
+                     'host.hostgroup_id'
+      end
+    end
+
+    context 'with a Location selected' do
+      let(:discovery_location) { Location.first }
+
+      test 'it passes it on' do
+        select_from('host_location_id', discovery_location.id)
+        create_host
+        assert_param discovery_location.id.to_s,
+                     'host.location_id'
+      end
+    end
+
+    context 'with a Organization selected' do
+      let(:discovery_organization) { Organization.first }
+
+      test 'it passes it on' do
+        select_from('host_organization_id', discovery_organization.id)
+        create_host
+        assert_param discovery_organization.id.to_s,
+                     'host.organization_id'
+      end
+    end
+  end
+
+  describe 'edit form' do
+    test 'it is a host form' do
+      visit edit_discovered_host_path(discovered_host)
+      assert page.find("form#edit_host_#{discovered_host.id}")
+    end
+
+    context 'with a hostgroup passed' do
+      let(:hostgroup_environment) { FactoryBot.create(:environment) }
+      let(:hostgroup_domain) { FactoryBot.create(:domain) }
+      let(:hostgroup) do
+        FactoryBot.create(:hostgroup, :with_os,
+                           environment: hostgroup_environment,
+                           domain: hostgroup_domain)
+      end
+
+      setup do
+        visit edit_discovered_host_path(discovered_host,
+                                        'host[hostgroup_id]' => hostgroup.id)
+        page.find("a[href='#os']").click
+        assert_selected '#host_hostgroup_id', hostgroup.id
+      end
+
+      it 'sets inherited attributes' do
+        %i[environment architecture operatingsystem].each do |attribute|
+          assert_selected "#host_#{attribute}_id", hostgroup.send(attribute).id
+        end
+
+        page.find('a[href="#network"]').click
+        page.find_button('Edit').click
+        assert_selected '#host_interfaces_attributes_0_domain_id',
+                        hostgroup.domain.id
+      end
+    end
+  end
+
+  private
+
+  def select_all_hosts
+    page.find('#check_all').click
+  end
+
+  def select_from(element_id, id)
+    page.find_by_id(element_id, visible: false)
+        .find("option[value='#{id}']", visible: false)
+        .select_option
+  end
+
+  def create_host
+    page.find("#fixedPropertiesSelector-#{discovered_host.id}")
+        .find_button('Create Host').click
+    wait_for_ajax
+  end
+end

data/test/test_helper_discovery.rb

@@ -9,11 +9,11 @@ def user_with_perms(perms)
     p.resource_type = 'DiscoveryRule' if p.name =~ /discovery_rules$/
     p.save!
   end
-  role = FactoryGirl.create :role
+  role = FactoryBot.create :role
   perms.each do |perm|
-    FactoryGirl.create(:filter, :role => role, :permissions => [perm])
+    FactoryBot.create(:filter, :role => role, :permissions => [perm])
   end
-  user = FactoryGirl.create :user, :with_mail, :admin => false
+  user = FactoryBot.create :user, :with_mail, :admin => false
   user.roles << role
   user.save
   user
@@ -52,29 +52,29 @@ def extract_form_errors(response)
 end
 
 def set_default_settings
-  FactoryGirl.create(:setting, :name => 'discovery_fact', :value => 'discovery_bootif', :category => 'Setting::Discovered')
-  FactoryGirl.create(:setting, :name => 'discovery_hostname', :value => 'discovery_bootif', :category => 'Setting::Discovered')
-  FactoryGirl.create(:setting, :name => 'discovery_auto', :value => true, :category => 'Setting::Discovered')
-  FactoryGirl.create(:setting, :name => 'discovery_reboot', :value => true, :category => 'Setting::Discovered')
-  FactoryGirl.create(:setting, :name => 'discovery_organization', :value => "Organization 1", :category => 'Setting::Discovered')
-  FactoryGirl.create(:setting, :name => 'discovery_location', :value => "Location 1", :category => 'Setting::Discovered')
-  FactoryGirl.create(:setting, :name => 'discovery_prefix', :value => 'mac', :category => 'Setting::Discovered')
-  FactoryGirl.create(:setting, :name => 'discovery_clean_facts', :value => false, :category => 'Setting::Discovered')
-  FactoryGirl.create(:setting, :name => 'discovery_lock', :value => 'false', :category => 'Setting::Discovered')
-  FactoryGirl.create(:setting, :name => 'discovery_lock_template', :value => 'pxelinux_discovery', :category => 'Setting::Discovered')
-  FactoryGirl.create(:setting, :name => 'discovery_pxelinux_lock_template', :value => 'pxelinux_discovery', :category => 'Setting::Discovered')
-  FactoryGirl.create(:setting, :name => 'discovery_pxegrub_lock_template', :value => 'pxegrub_discovery', :category => 'Setting::Discovered')
-  FactoryGirl.create(:setting, :name => 'discovery_pxegrub2_lock_template', :value => 'pxegrub2_discovery', :category => 'Setting::Discovered')
-  FactoryGirl.create(:setting, :name => 'discovery_always_rebuild_dns', :value => true, :category => 'Setting::Discovered')
+  FactoryBot.create(:setting, :name => 'discovery_fact', :value => 'discovery_bootif', :category => 'Setting::Discovered')
+  FactoryBot.create(:setting, :name => 'discovery_hostname', :value => 'discovery_bootif', :category => 'Setting::Discovered')
+  FactoryBot.create(:setting, :name => 'discovery_auto', :value => true, :category => 'Setting::Discovered')
+  FactoryBot.create(:setting, :name => 'discovery_reboot', :value => true, :category => 'Setting::Discovered')
+  FactoryBot.create(:setting, :name => 'discovery_organization', :value => "Organization 1", :category => 'Setting::Discovered')
+  FactoryBot.create(:setting, :name => 'discovery_location', :value => "Location 1", :category => 'Setting::Discovered')
+  FactoryBot.create(:setting, :name => 'discovery_prefix', :value => 'mac', :category => 'Setting::Discovered')
+  FactoryBot.create(:setting, :name => 'discovery_clean_facts', :value => false, :category => 'Setting::Discovered')
+  FactoryBot.create(:setting, :name => 'discovery_lock', :value => 'false', :category => 'Setting::Discovered')
+  FactoryBot.create(:setting, :name => 'discovery_lock_template', :value => 'pxelinux_discovery', :category => 'Setting::Discovered')
+  FactoryBot.create(:setting, :name => 'discovery_pxelinux_lock_template', :value => 'pxelinux_discovery', :category => 'Setting::Discovered')
+  FactoryBot.create(:setting, :name => 'discovery_pxegrub_lock_template', :value => 'pxegrub_discovery', :category => 'Setting::Discovered')
+  FactoryBot.create(:setting, :name => 'discovery_pxegrub2_lock_template', :value => 'pxegrub2_discovery', :category => 'Setting::Discovered')
+  FactoryBot.create(:setting, :name => 'discovery_always_rebuild_dns', :value => true, :category => 'Setting::Discovered')
 end
 
 def setup_hostgroup(host)
-  domain = FactoryGirl.create(:domain)
-  subnet = FactoryGirl.create(:subnet_ipv4, :network => "192.168.100.0")
-  environment = FactoryGirl.create(:environment, :organizations => [host.organization], :locations => [host.location])
-  medium = FactoryGirl.create(:medium, :organizations => [host.organization], :locations => [host.location])
-  os = FactoryGirl.create(:operatingsystem, :with_ptables, :with_archs, :media => [medium])
-  hostgroup = FactoryGirl.create(
+  domain = FactoryBot.create(:domain)
+  subnet = FactoryBot.create(:subnet_ipv4, :network => "192.168.100.0")
+  environment = FactoryBot.create(:environment, :organizations => [host.organization], :locations => [host.location])
+  medium = FactoryBot.create(:medium, :organizations => [host.organization], :locations => [host.location])
+  os = FactoryBot.create(:operatingsystem, :with_ptables, :with_archs, :media => [medium])
+  hostgroup = FactoryBot.create(
     :hostgroup, :with_rootpass, :with_puppet_orchestration,
     :operatingsystem => os,
     :architecture => os.architectures.first,
@@ -110,6 +110,15 @@ def location_one
   Location.find_by_name('Location 1')
 end
 
+def current_path_info
+  current_url.sub(%r{.*?://}, '')[%r{[/\?\#].*}] || '/'
+end
+
+def current_params
+  query = current_path_info.split('?')[1]
+  Rack::Utils.parse_nested_query query
+end
+
 def facts_simple_network100_42
   {
     "interfaces"       => "lo,eth0,eth1",
@@ -127,3 +136,24 @@ def discover_host_from_facts(facts)
     Host::Discovered.import_host(facts)
   end
 end
+
+def assert_param(expected, param)
+  keys = param.split('.')
+  result = current_params
+  keys.each do |key|
+    result = result[key]
+  end
+  assert_equal expected, result
+end
+
+def assert_selected(select_selector, value)
+  select = page.all(select_selector, visible: false).last
+  selected = select.find("option[selected='selected']", visible: false) rescue nil
+  assert_not_nil selected, "Nothing selected in #{select_selector}"
+  assert_equal value.to_s, selected.value
+end
+
+def discovered_notification_blueprint
+  @blueprint ||= FactoryBot.create(:notification_blueprint,
+                                   name: 'new_discovered_host')
+end

data/test/test_plugin_helper.rb

@@ -3,10 +3,6 @@ require 'test_helper'
 
 require 'test_helper_discovery'
 
-# Add plugin to FactoryGirl's paths
-FactoryGirl.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
-FactoryGirl.reload
-# load notification seeds.
-require File.join(
-  File.dirname(__FILE__), '..', 'db', 'seeds.d', '80_discovery_ui_notification'
-)
+# Add plugin to FactoryBot's paths
+FactoryBot.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
+FactoryBot.reload

data/test/unit/discovered_extensions_test.rb

@@ -2,6 +2,8 @@ require 'test_plugin_helper'
 
 class DiscoveredExtensionsTest < ActiveSupport::TestCase
   include Foreman::Controller::DiscoveredExtensions
+  include FactImporterIsolation
+  allow_transactions_for_any_importer
 
   setup do
     @facts = facts_simple_network100_42
@@ -15,28 +17,28 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
 
   test "no rule is found out of one for a discovered host with no facts" do
     host = discover_host_from_facts(@facts)
-    FactoryGirl.create(:discovery_rule, :search => "facts.foo = bar")
+    FactoryBot.create(:discovery_rule, :search => "facts.foo = bar")
     refute find_discovery_rule(host)
   end
 
   test "no rule is found out of one for a discovered host with some facts" do
     host = discover_host_from_facts(@facts)
-    FactoryGirl.create(:discovery_rule, :search => "facts.foo = doesnotexist")
+    FactoryBot.create(:discovery_rule, :search => "facts.foo = doesnotexist")
     refute find_discovery_rule(host)
   end
 
   test "no rule is found out of two for a discovered host" do
     facts = @facts.merge({"somefact" => "abc"})
     host = discover_host_from_facts(facts)
-    FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = xxx")
-    FactoryGirl.create(:discovery_rule, :priority => 2, :search => "facts.somefact = zzz")
+    FactoryBot.create(:discovery_rule, :priority => 1, :search => "facts.somefact = xxx")
+    FactoryBot.create(:discovery_rule, :priority => 2, :search => "facts.somefact = zzz")
     refute find_discovery_rule(host)
   end
 
   test "rule out of one is found for a discovered host" do
     facts = @facts.merge({"somefact" => "abc"})
     host = discover_host_from_facts(facts)
-    r1 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
+    r1 = FactoryBot.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
                             :organizations => [host.organization], :locations => [host.location])
     assert_equal find_discovery_rule(host), r1
   end
@@ -44,9 +46,9 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
   test "first rule out of two is found for a discovered host" do
     facts = @facts.merge({"somefact" => "abc"})
     host = discover_host_from_facts(facts)
-    r1 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
+    r1 = FactoryBot.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
                             :organizations => [host.organization], :locations => [host.location])
-    FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = x",
+    FactoryBot.create(:discovery_rule, :priority => 1, :search => "facts.somefact = x",
                        :organizations => [host.organization], :locations => [host.location])
     assert_equal find_discovery_rule(host), r1
   end
@@ -54,9 +56,9 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
   test "second rule out of two is found for a discovered host" do
     facts = @facts.merge({"somefact" => "abc"})
     host = discover_host_from_facts(facts)
-    FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = x",
+    FactoryBot.create(:discovery_rule, :priority => 1, :search => "facts.somefact = x",
                        :organizations => [host.organization], :locations => [host.location])
-    r2 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
+    r2 = FactoryBot.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
                             :organizations => [host.organization], :locations => [host.location])
     assert_equal find_discovery_rule(host), r2
   end
@@ -64,9 +66,9 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
   test "first rule out of two with different priorities is found for a discovered host" do
     facts = @facts.merge({"somefact" => "abc"})
     host = discover_host_from_facts(facts)
-    r1 = FactoryGirl.create(:discovery_rule, :name => "A", :priority => 1, :search => "facts.somefact = abc",
+    r1 = FactoryBot.create(:discovery_rule, :name => "A", :priority => 1, :search => "facts.somefact = abc",
                             :organizations => [host.organization], :locations => [host.location])
-    r2 = FactoryGirl.create(:discovery_rule, :name => "B", :priority => 2, :search => "facts.somefact = abc",
+    r2 = FactoryBot.create(:discovery_rule, :name => "B", :priority => 2, :search => "facts.somefact = abc",
                        :organizations => [host.organization], :locations => [host.location])
     assert_equal find_discovery_rule(host), r1
   end
@@ -74,9 +76,9 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
   test "second rule out of two with different priorities is found for a discovered host" do
     facts = @facts.merge({"somefact" => "abc"})
     host = discover_host_from_facts(facts)
-    r1 = FactoryGirl.create(:discovery_rule, :name => "A", :priority => 2, :search => "facts.somefact = abc",
+    r1 = FactoryBot.create(:discovery_rule, :name => "A", :priority => 2, :search => "facts.somefact = abc",
                        :organizations => [host.organization], :locations => [host.location])
-    r2 = FactoryGirl.create(:discovery_rule, :name => "B", :priority => 1, :search => "facts.somefact = abc",
+    r2 = FactoryBot.create(:discovery_rule, :name => "B", :priority => 1, :search => "facts.somefact = abc",
                             :organizations => [host.organization], :locations => [host.location])
     assert_equal find_discovery_rule(host), r2
   end
@@ -84,9 +86,9 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
   test "older rule out of two is found for a discovered host" do
     facts = @facts.merge({"somefact" => "abc"})
     host = discover_host_from_facts(facts)
-    r1 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
+    r1 = FactoryBot.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
                        :organizations => [host.organization], :locations => [host.location])
-    r2 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
+    r2 = FactoryBot.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
                             :organizations => [host.organization], :locations => [host.location],
                             :created_at => Time.now + 1.day)
     assert_equal find_discovery_rule(host), r1
@@ -95,18 +97,18 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
   test "drained rule does not match for a discovered host" do
     facts = @facts.merge({"somefact" => "abc"})
     host = discover_host_from_facts(facts)
-    r1 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc", :max_count => 1,
+    r1 = FactoryBot.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc", :max_count => 1,
                             :organizations => [host.organization], :locations => [host.location])
-    r2 = FactoryGirl.create(:discovery_rule, :priority => 2, :search => "facts.somefact = abc",
+    r2 = FactoryBot.create(:discovery_rule, :priority => 2, :search => "facts.somefact = abc",
                             :organizations => [host.organization], :locations => [host.location])
-    FactoryGirl.create(:host, :discovery_rule => r1)
+    FactoryBot.create(:host, :discovery_rule => r1)
     assert_equal find_discovery_rule(host), r2
   end
 
   test "discovery rule is associated after auto provisioning" do
     facts = @facts.merge({"somefact" => "abc"})
     host = discover_host_from_facts(facts)
-    r1 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
+    r1 = FactoryBot.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
                             :organizations => [host.organization], :locations => [host.location])
     perform_auto_provision host, r1
     assert_equal host.primary_interface.managed, true
@@ -118,7 +120,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
   test "auto provisioning fails for rule without a hostgroup" do
     facts = @facts.merge({"somefact" => "abc"})
     host = discover_host_from_facts(facts)
-    r1 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
+    r1 = FactoryBot.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
                             :organizations => [host.organization], :locations => [host.location])
     r1.hostgroup = nil
     exception = assert_raises(::Foreman::Exception) do
@@ -130,7 +132,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
   test "existing rule revent from hostgroup deletion" do
     facts = @facts.merge({"somefact" => "abc"})
     host = discover_host_from_facts(facts)
-    r1 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
+    r1 = FactoryBot.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
                             :organizations => [host.organization], :locations => [host.location])
     assert_raises(ActiveRecord::RecordNotDestroyed) do
       r1.hostgroup.destroy!
@@ -140,9 +142,9 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
   test "rules with incorrect syntax are skipped" do
     facts = @facts.merge({"somefact" => "abc"})
     host = discover_host_from_facts(facts)
-    FactoryGirl.create(:discovery_rule, :priority => 1, :search => '=!^$#@?x',
+    FactoryBot.create(:discovery_rule, :priority => 1, :search => '=!^$#@?x',
                        :organizations => [host.organization], :locations => [host.location])
-    r2 = FactoryGirl.create(:discovery_rule, :priority => 2, :search => "facts.somefact = abc",
+    r2 = FactoryBot.create(:discovery_rule, :priority => 2, :search => "facts.somefact = abc",
                             :organizations => [host.organization], :locations => [host.location])
     assert_equal find_discovery_rule(host), r2
   end
@@ -150,7 +152,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
   test "hostname is copied after auto provisioning" do
     facts = @facts.merge({"somefact" => "abc"})
     host = discover_host_from_facts(facts)
-    r1 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
+    r1 = FactoryBot.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
                             :organizations => [host.organization], :locations => [host.location])
     perform_auto_provision host, r1
     assert_equal host.name, "macaabbccddeeff"
@@ -158,12 +160,12 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
 
   test "attributes from hostgroup are copied after auto provisioning for host with subnet detected" do
     facts = @facts.merge({"somefact" => "abc"})
-    domain = FactoryGirl.create(:domain)
-    subnet = FactoryGirl.create(:subnet_ipv4, :tftp, :dhcp, :name => 'subnet_100', :network => '192.168.100.0', :organizations => [Organization.find_by_name("Organization 1")], :locations => [Location.find_by_name("Location 1")])
+    domain = FactoryBot.create(:domain)
+    subnet = FactoryBot.create(:subnet_ipv4, :tftp, :dhcp, :name => 'subnet_100', :network => '192.168.100.0', :organizations => [Organization.find_by_name("Organization 1")], :locations => [Location.find_by_name("Location 1")])
     host = discover_host_from_facts(facts)
     assert_equal subnet, host.subnet
-    hostgroup = FactoryGirl.create(:hostgroup, :with_environment, :with_rootpass, :with_puppet_orchestration, :with_os, :pxe_loader => "PXELinux BIOS", :subnet => subnet, :domain => domain)
-    r1 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc", :organizations => [host.organization], :locations => [host.location], :hostgroup => hostgroup)
+    hostgroup = FactoryBot.create(:hostgroup, :with_environment, :with_rootpass, :with_puppet_orchestration, :with_os, :pxe_loader => "PXELinux BIOS", :subnet => subnet, :domain => domain)
+    r1 = FactoryBot.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc", :organizations => [host.organization], :locations => [host.location], :hostgroup => hostgroup)
     host.primary_interface.expects(:queue_tftp).at_least(1)
     host.primary_interface.expects(:queue_dhcp).at_least(1)
     assert managed_host = perform_auto_provision(host, r1)
@@ -190,10 +192,10 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
     facts = @facts.merge({"somefact" => "abc"})
     host = discover_host_from_facts(facts)
     refute host.subnet
-    domain = FactoryGirl.create(:domain)
-    subnet = FactoryGirl.create(:subnet_ipv4, :tftp, :dhcp, :name => 'subnet_100', :network => '192.168.100.0', :organizations => [Organization.find_by_name("Organization 1")], :locations => [Location.find_by_name("Location 1")])
-    hostgroup = FactoryGirl.create(:hostgroup, :with_environment, :with_rootpass, :with_puppet_orchestration, :with_os, :pxe_loader => "PXELinux BIOS", :subnet => subnet, :domain => domain)
-    r1 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc", :organizations => [host.organization], :locations => [host.location], :hostgroup => hostgroup)
+    domain = FactoryBot.create(:domain)
+    subnet = FactoryBot.create(:subnet_ipv4, :tftp, :dhcp, :name => 'subnet_100', :network => '192.168.100.0', :organizations => [Organization.find_by_name("Organization 1")], :locations => [Location.find_by_name("Location 1")])
+    hostgroup = FactoryBot.create(:hostgroup, :with_environment, :with_rootpass, :with_puppet_orchestration, :with_os, :pxe_loader => "PXELinux BIOS", :subnet => subnet, :domain => domain)
+    r1 = FactoryBot.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc", :organizations => [host.organization], :locations => [host.location], :hostgroup => hostgroup)
     host.primary_interface.expects(:queue_tftp).at_least(1)
     host.primary_interface.expects(:queue_dhcp).at_least(1)
     assert managed_host = perform_auto_provision(host, r1)
@@ -238,7 +240,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
 
     test "hostname falls back to original name on empty response via #{renderer_name}" do
       host = discover_host_from_facts(@facts)
-      r1 = FactoryGirl.create(:discovery_rule,
+      r1 = FactoryBot.create(:discovery_rule,
                               :search => "facts.somefact = abc",
                               :hostname => '<%= "" %>',
                               :organizations => [host.organization],
@@ -249,7 +251,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
 
     test "hostname is rendered after auto provisioning using #{renderer_name}" do
       host = discover_host_from_facts(@facts)
-      r1 = FactoryGirl.create(:discovery_rule,
+      r1 = FactoryBot.create(:discovery_rule,
                               :search => "facts.somefact = abc",
                               :hostname => 'x<%= 1+1 %>',
                               :organizations => [host.organization],
@@ -260,7 +262,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
 
     test "function rand is renderer properly using #{renderer_name}" do
       host = discover_host_from_facts(@facts)
-      r1 = FactoryGirl.create(:discovery_rule,
+      r1 = FactoryBot.create(:discovery_rule,
                               :search => "facts.somefact = abc",
                               :hostname => 'x<%= rand(4) %>',
                               :organizations => [host.organization],
@@ -271,7 +273,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
 
     test "hostname attribute name is renderer properly using #{renderer_name}" do
       host = discover_host_from_facts(@facts)
-      r1 = FactoryGirl.create(:discovery_rule,
+      r1 = FactoryBot.create(:discovery_rule,
                               :search => "facts.somefact = abc",
                               :hostname => 'x<%= @host.name %>',
                               :organizations => [host.organization],
@@ -282,7 +284,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
 
     test "hostname attribute ip is renderer properly using #{renderer_name}" do
       host = discover_host_from_facts(@facts)
-      r1 = FactoryGirl.create(:discovery_rule,
+      r1 = FactoryBot.create(:discovery_rule,
                               :search => "facts.somefact = abc",
                               :hostname => 'x<%= @host.ip.gsub(".","-") %>',
                               :organizations => [host.organization],
@@ -294,7 +296,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
     test "hostname attribute facts_hash is renderer properly using #{renderer_name}" do
       facts = @facts.merge({"somefact" => "abc"})
       host = discover_host_from_facts(facts)
-      r1 = FactoryGirl.create(:discovery_rule,
+      r1 = FactoryBot.create(:discovery_rule,
                               :search => "facts.somefact = abc",
                               :hostname => 'x<%= @host.facts["somefact"] %>',
                               :organizations => [host.organization],