foreman_discovery 10.0.0 → 11.0.0

data/test/unit/discovered_mailer_test.rb

@@ -4,7 +4,7 @@ class DiscoveredMailerTest < ActiveSupport::TestCase
   setup do
     @user = User.current = users :admin
 
-    FactoryGirl.create(:mail_notification,
+    FactoryBot.create(:mail_notification,
                        :name => :discovered_summary,
                        :description => N_('A summary of discovered hosts'),
                        :mailer => 'DiscoveredMailer',

data/test/unit/discovery_attribute_set_test.rb

@@ -1,14 +1,16 @@
 require 'test_plugin_helper'
 
 class DiscoveryAttributeSetTest < ActiveSupport::TestCase
+  include FactImporterIsolation
+  allow_transactions_for_any_importer
 
   setup do
     @facts = parse_json_fixture('/facts.json')['facts']
-    FactoryGirl.create(:setting,
+    FactoryBot.create(:setting,
                        :name => 'discovery_hostname',
                        :value => 'discovery_bootif',
                        :category => 'Setting::Discovered')
-    FactoryGirl.create(:setting,
+    FactoryBot.create(:setting,
                        :name => 'discovery_prefix',
                        :value => 'mac',
                        :category => 'Setting::Discovered')

data/test/unit/discovery_rule_test.rb

@@ -2,7 +2,7 @@ require 'test_plugin_helper'
 
 class DiscoveryRuleTest < ActiveSupport::TestCase
   setup do
-    @hostgroup = FactoryGirl.create(:hostgroup)
+    @hostgroup = FactoryBot.create(:hostgroup)
   end
 
   context "#validates attribute" do
@@ -114,7 +114,7 @@ class DiscoveryRuleTest < ActiveSupport::TestCase
 
   test "should enforce hostgroup organizations and locations" do
     skip unless (SETTINGS[:organizations_enabled] && SETTINGS[:locations_enabled])
-    loc = FactoryGirl.create(:location, :name => "hgloc")
+    loc = FactoryBot.create(:location, :name => "hgloc")
     @hostgroup.locations << loc
     @hostgroup.save!
     rule = DiscoveryRule.new :name => "myrule",

data/test/unit/discovery_taxonomy_extensions_test.rb

@@ -7,7 +7,7 @@ class DiscoveryTaxonomyExtensionsTest < ActiveSupport::TestCase
   end
 
   test 'deleting location does not hard fail if there is associated discovered host' do
-    location = FactoryGirl.create(:location)
+    location = FactoryBot.create(:location)
 
     assert (host = discover_host_from_facts(@facts))
     host.location = location

data/test/unit/fact_parser_test.rb

@@ -55,7 +55,7 @@ class FactParserTest < ActiveSupport::TestCase
   end
 
   test "#suggested_primary_interface detects interface even when 'ignore_puppet_facts_for_provisioning' is set" do
-    FactoryGirl.create(:setting,
+    FactoryBot.create(:setting,
                        :name => 'ignore_puppet_facts_for_provisioning',
                        :value => true,
                        :category => 'Setting::Provisioning')

data/test/unit/host_discovered_test.rb

@@ -1,6 +1,9 @@
 require 'test_plugin_helper'
 
 class HostDiscoveredTest < ActiveSupport::TestCase
+  include FactImporterIsolation
+  allow_transactions_for_any_importer
+
   setup do
     @facts = parse_json_fixture('/facts.json')['facts']
     set_default_settings
@@ -17,52 +20,52 @@ class HostDiscoveredTest < ActiveSupport::TestCase
   end
 
   test 'fact value association is set accordingly' do
-    discovered_host = FactoryGirl.create(:discovered_host, :with_facts, :fact_count => 1)
+    discovered_host = FactoryBot.create(:discovered_host, :with_facts, :fact_count => 1)
     fact_value = discovered_host.fact_values.first
     assert_equal discovered_host.id, fact_value.host.id
   end
 
   test "should setup subnet" do
     raw = parse_json_fixture('/facts.json')
-    subnet = FactoryGirl.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [organization_one], :locations => [location_one])
+    subnet = FactoryBot.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [organization_one], :locations => [location_one])
     Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
     host = discover_host_from_facts(@facts)
     assert_equal subnet, host.primary_interface.subnet
   end
 
   test "should setup subnet with org and loc set via settings" do
-    org = FactoryGirl.create(:organization, :name => "subnet_org")
-    loc = FactoryGirl.create(:location, :name => "subnet_loc")
+    org = FactoryBot.create(:organization, :name => "subnet_org")
+    loc = FactoryBot.create(:location, :name => "subnet_loc")
     Setting['discovery_organization'] = org.name
     Setting['discovery_location'] = loc.name
     raw = parse_json_fixture('/facts.json')
-    subnet = FactoryGirl.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [org], :locations => [loc])
+    subnet = FactoryBot.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [org], :locations => [loc])
     Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
     host = discover_host_from_facts(@facts)
     assert_equal subnet, host.primary_interface.subnet
   end
 
   test "should setup subnet with org and loc set via facts" do
-    org = FactoryGirl.create(:organization, :name => "subnet_org_via_fact")
-    loc = FactoryGirl.create(:location, :name => "subnet_loc_via_fact")
+    org = FactoryBot.create(:organization, :name => "subnet_org_via_fact")
+    loc = FactoryBot.create(:location, :name => "subnet_loc_via_fact")
     raw = parse_json_fixture('/facts.json')
     @facts['foreman_organization'] = org.name
     @facts['foreman_location'] = loc.name
-    subnet = FactoryGirl.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [org], :locations => [loc])
+    subnet = FactoryBot.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [org], :locations => [loc])
     Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
     host = discover_host_from_facts(@facts)
     assert_equal subnet, host.primary_interface.subnet
   end
 
   test "should set nested org and loc" do
-    org_parent = FactoryGirl.create(:organization, :name => "org")
-    org = FactoryGirl.create(:organization, :name => "suborg", :parent_id => org_parent.id)
-    loc_parent = FactoryGirl.create(:location, :name => "loc")
-    loc = FactoryGirl.create(:location, :name => "subloc", :parent_id => loc_parent.id)
+    org_parent = FactoryBot.create(:organization, :name => "org")
+    org = FactoryBot.create(:organization, :name => "suborg", :parent_id => org_parent.id)
+    loc_parent = FactoryBot.create(:location, :name => "loc")
+    loc = FactoryBot.create(:location, :name => "subloc", :parent_id => loc_parent.id)
     Setting['discovery_organization'] = org.name
     Setting['discovery_location'] = loc.name
     raw = parse_json_fixture('/facts.json')
-    subnet = FactoryGirl.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [org], :locations => [loc])
+    subnet = FactoryBot.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [org], :locations => [loc])
     Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
     host = discover_host_from_facts(@facts)
     assert_equal org, host.organization
@@ -98,7 +101,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     Host::Discovered.delete('mace41f13cc3658')
     Setting[:discovery_lock] = "true"
     raw = parse_json_fixture('/facts.json')
-    subnet = FactoryGirl.create(:subnet,
+    subnet = FactoryBot.create(:subnet,
                                 :tftp,
                                 :network => '10.35.27.0',
                                 :cidr    => '24',
@@ -140,7 +143,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
   end
 
   test "should not create discovered host when managed host exists" do
-    FactoryGirl.create(:host, :mac => 'E4:1F:13:CC:36:58')
+    FactoryBot.create(:host, :mac => 'E4:1F:13:CC:36:58')
     raw = parse_json_fixture('/facts.json')
     exception = assert_raises(::Foreman::Exception) do
       discover_host_from_facts(@facts)
@@ -192,14 +195,14 @@ class HostDiscoveredTest < ActiveSupport::TestCase
   end
 
   test 'discovered host can be searched in multiple taxonomies' do
-    org1 = FactoryGirl.create(:organization)
-    org2 = FactoryGirl.create(:organization)
-    org3 = FactoryGirl.create(:organization)
-    user_subset = FactoryGirl.create(:user, :organizations => [org1, org2])
-    user_all = FactoryGirl.create(:user, :organizations => [org1, org2, org3])
-    host1 = FactoryGirl.create(:host, :type => "Host::Discovered", :organization => org1)
-    host2 = FactoryGirl.create(:host, :type => "Host::Discovered", :organization => org2)
-    host3 = FactoryGirl.create(:host, :type => "Host::Discovered", :organization => org3)
+    org1 = FactoryBot.create(:organization)
+    org2 = FactoryBot.create(:organization)
+    org3 = FactoryBot.create(:organization)
+    user_subset = FactoryBot.create(:user, :organizations => [org1, org2])
+    user_all = FactoryBot.create(:user, :organizations => [org1, org2, org3])
+    host1 = FactoryBot.create(:host, :type => "Host::Discovered", :organization => org1)
+    host2 = FactoryBot.create(:host, :type => "Host::Discovered", :organization => org2)
+    host3 = FactoryBot.create(:host, :type => "Host::Discovered", :organization => org3)
     hosts = nil
 
     assert_nil Organization.current

data/test/unit/managed_extensions_test.rb

@@ -24,7 +24,7 @@ class ManagedExtensionsTest < ActiveSupport::TestCase
     @host.stubs(:operatingsystem).returns(@operatingsystem)
     @host.stubs(:provisioning_template).returns('A template')
     @host.stubs(:medium).returns('http://a_medium')
-    @host.stubs(:architecture).returns(FactoryGirl.create(:architecture))
+    @host.stubs(:architecture).returns(FactoryBot.create(:architecture))
     @kexec_json = {
       :kernel => "http://a_host/vmlinuz",
       :initrd => "http://a_host/someimage.img"

data/test/unit/ui_notifications/destroy_host_test.rb

@@ -1,26 +1,36 @@
 require 'test_plugin_helper'
 
 class DestroyHostNotificationTest < ActiveSupport::TestCase
+  alias_method  :blueprint, :discovered_notification_blueprint
+
+  setup do
+    assert blueprint
+  end
+
   test 'destorying discovered host should remove notification' do
-    host = FactoryGirl.create(:discovered_host)
+    host = FactoryBot.create(:discovered_host)
     assert_difference('blueprint.notifications.count', -1) do
       host.destroy
     end
   end
 
-  test 'do not remove notification if others discovered hosts exists' do
-    host1 = FactoryGirl.create(:discovered_host)
-    assert_equal 1, blueprint.notifications.count
-    host2 = FactoryGirl.create(:discovered_host)
-    assert_equal 1, blueprint.notifications.count
-    host2.destroy
+  test 'do not remove notification if other discovered hosts exists' do
+    assert_difference('blueprint.notifications.count') do
+      FactoryBot.create(:discovered_host)
+    end
     assert_equal 1, blueprint.notifications.count
-    host1.destroy
+    assert_no_difference('blueprint.notifications.count') do
+      FactoryBot.create(:discovered_host)
+    end
+    assert_no_difference('blueprint.notifications.count') do
+      Host::Discovered.all.last.destroy
+    end
+    Host::Discovered.destroy_all
     assert_equal 0, blueprint.notifications.count
   end
 
   test 'discovered host type change should update notifications' do
-    host = FactoryGirl.create(:discovered_host)
+    host = FactoryBot.create(:discovered_host)
     assert_equal 1, blueprint.notifications.count
     new_host = ::ForemanDiscovery::HostConverter.to_managed(host, false, false)
     assert new_host.save!
@@ -28,17 +38,11 @@ class DestroyHostNotificationTest < ActiveSupport::TestCase
   end
 
   test 'type change should not removing notifications for discovered hosts' do
-    host1 = FactoryGirl.create(:discovered_host)
-    FactoryGirl.create(:discovered_host)
+    host1 = FactoryBot.create(:discovered_host)
+    FactoryBot.create(:discovered_host)
     assert_equal 1, blueprint.notifications.count
     new_host = ::ForemanDiscovery::HostConverter.to_managed(host1, false, false)
     assert new_host.save!
     assert_equal 1, blueprint.notifications.count
   end
-
-  private
-
-  def blueprint
-    NotificationBlueprint.find_by(name: 'new_discovered_host')
-  end
 end

data/test/unit/ui_notifications/new_host_test.rb

@@ -1,26 +1,26 @@
 require 'test_plugin_helper'
 
 class NewHostNotificationTest < ActiveSupport::TestCase
-  test 'new discovered host should generate a notification' do
+  alias_method  :blueprint, :discovered_notification_blueprint
+
+  setup do
     assert blueprint
-    FactoryGirl.create :discovered_host
-    assert_equal 1, blueprint.notifications.count
+  end
+
+  test 'new discovered host should generate a notification' do
+    assert_difference('blueprint.notifications.count') do
+      FactoryBot.create :discovered_host
+    end
   end
 
   test 'multiple discovered hosts should generate only one notification' do
-    host1 = FactoryGirl.create :discovered_host
+    host1 = FactoryBot.create :discovered_host
     ForemanDiscovery::UINotifications::NewHost.deliver!(host1)
     expired_at = blueprint.notifications.first.expired_at
     Time.any_instance.stubs(:utc).returns(expired_at + 1.hour)
-    host2 = FactoryGirl.create :discovered_host
+    host2 = FactoryBot.create :discovered_host
     ForemanDiscovery::UINotifications::NewHost.deliver!(host2)
     assert_equal 1, blueprint.notifications.count
     assert_not_equal expired_at, blueprint.notifications.first.expired_at
   end
-
-  private
-
-  def blueprint
-    NotificationBlueprint.find_by(name: 'new_discovered_host')
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 10.0.0
+  version: 11.0.0
 platform: ruby
 authors:
 - alongoldboim
@@ -16,6 +16,7 @@ authors:
 - David Davis
 - Dominic Cleal
 - Eric D. Helms
+- Ewoud Kohl van Wijngaarden
 - Frank Wall
 - Greg Sutcliffe
 - ChairmanTubeAmp
@@ -23,6 +24,7 @@ authors:
 - Imri Zvik
 - Joseph Mitchell Magen
 - June Zhang
+- Lars Berntzon
 - Lukas Zapletal
 - Lukáš Zapletal
 - Marek Hulan
@@ -32,8 +34,10 @@ authors:
 - Michael Moll
 - Nick
 - Ohad Levy
+- Ondrej Prazak
 - Ori Rabin
 - orrabin
+- Partha Aji
 - Petr Chalupa
 - Phirince Philip
 - Rahul Bajaj
@@ -52,7 +56,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2018-01-30 00:00:00.000000000 Z
 dependencies: []
 description: MaaS Discovery Plugin engine for Foreman
 email: gsutclif@redhat.com
@@ -126,7 +130,6 @@ files:
 - app/views/discovery_rules/new.html.erb
 - app/views/foreman_discovery/debian_kexec.erb
 - app/views/foreman_discovery/redhat_kexec.erb
-- config/as_deprecation_whitelist.yaml
 - config/initializers/discovery_setup.rb
 - config/routes.rb
 - db/migrate/20141107091416_create_discovery_rules.rb
@@ -218,6 +221,7 @@ files:
 - test/functional/discovered_hosts_controller_test.rb
 - test/functional/discovery_rules_controller_test.rb
 - test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb
+- test/integration/discovered_hosts_test.rb
 - test/test_helper_discovery.rb
 - test/test_plugin_helper.rb
 - test/unit/discovered_extensions_test.rb
@@ -259,6 +263,7 @@ summary: MaaS Discovery Plugin for Foreman
 test_files:
 - test/test_plugin_helper.rb
 - test/test_helper_discovery.rb
+- test/integration/discovered_hosts_test.rb
 - test/unit/discovery_attribute_set_test.rb
 - test/unit/facts.json
 - test/unit/discovered_mailer_test.rb