foreman_discovery 15.0.2 → 15.1.0

data/test/integration/discovered_hosts_test.rb

@@ -9,6 +9,7 @@ class DiscoveredHostsTest < IntegrationTestWithJavascript
     assert discovered_notification_blueprint
     discovered_host.save!
     visit discovered_hosts_path
+    page.evaluate_script("document.getElementById('fixedPropertiesSelector-#{discovered_host.id}').classList.remove('fade')")
   end
 
   teardown do
@@ -64,15 +65,14 @@ class DiscoveredHostsTest < IntegrationTestWithJavascript
 
     test 'and forwards to editing it' do
       create_host
-      assert_equal edit_discovered_host_path(id: discovered_host),
-                   current_path
+      assert_current_path edit_discovered_host_path(id: discovered_host), ignore_query: true
     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)
+        select2(discovery_hostgroup.name, from: 'host_hostgroup_id')
         create_host
         assert_param discovery_hostgroup.id.to_s,
                      'host.hostgroup_id'
@@ -83,7 +83,7 @@ class DiscoveredHostsTest < IntegrationTestWithJavascript
       let(:discovery_location) { Location.first }
 
       test 'it passes it on' do
-        select_from('host_location_id', discovery_location.id)
+        select2(discovery_location.name, from: 'host_location_id')
         create_host
         assert_param discovery_location.id.to_s,
                      'host.location_id'
@@ -94,7 +94,7 @@ class DiscoveredHostsTest < IntegrationTestWithJavascript
       let(:discovery_organization) { Organization.first }
 
       test 'it passes it on' do
-        select_from('host_organization_id', discovery_organization.id)
+        select2(discovery_organization.name, from: 'host_organization_id')
         create_host
         assert_param discovery_organization.id.to_s,
                      'host.organization_id'
@@ -147,12 +147,6 @@ class DiscoveredHostsTest < IntegrationTestWithJavascript
     page.find("#host_ids_#{id}").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

data/test/unit/discovery_attribute_set_test.rb

@@ -41,15 +41,17 @@ class DiscoveryAttributeSetTest < ActiveSupport::TestCase
   end
 
   test "can search discovered hosts by disks_size" do
-    excluded = Setting[:excluded_facts]
-    Setting[:excluded_facts] = ["test"]
-    host = discover_host_from_facts(@facts)
-    disks_size = (host.facts_hash['blockdevice_sda_size'].to_f / 1024 / 1024).ceil
-    results = Host::Discovered.unscoped.search_for("disks_size = #{disks_size}")
-    assert_equal 1, results.count
-    results = Host::Discovered.unscoped.search_for("disks_size > #{disks_size}")
-    assert_equal 0, results.count
-  ensure
-    Setting[:excluded_facts] = excluded
+    begin
+      excluded = Setting[:excluded_facts]
+      Setting[:excluded_facts] = ["test"]
+      host = discover_host_from_facts(@facts)
+      disks_size = (host.facts_hash['blockdevice_sda_size'].to_f / 1024 / 1024).ceil
+      results = Host::Discovered.unscoped.search_for("disks_size = #{disks_size}")
+      assert_equal 1, results.count
+      results = Host::Discovered.unscoped.search_for("disks_size > #{disks_size}")
+      assert_equal 0, results.count
+    ensure
+      Setting[:excluded_facts] = excluded
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 15.0.2
+  version: 15.1.0
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -45,6 +45,7 @@ authors:
 - odovzhenko
 - Ohad Levy
 - Ondrej Prazak
+- Ondřej Ezr
 - Ori Rabin
 - orrabin
 - Partha Aji
@@ -68,7 +69,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-01 00:00:00.000000000 Z
+date: 2019-08-09 00:00:00.000000000 Z
 dependencies: []
 description: MaaS Discovery Plugin engine for Foreman
 email: gsutclif@redhat.com