foreman_discovery 23.0.0 → 23.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c06b773090a573270dd6c59f3f3ea9236a4a92aee4097904c7306b4190b71870
-  data.tar.gz: 6aeb520a8f222918d58459f5afa95430ac490f3bde6066eafc030f550ea39109
+  metadata.gz: 2af9907694c24e71a07821c25a97af3353d334cc63557b801db69cacf85e47b8
+  data.tar.gz: e501ebae40fa529940a1f263a0f41e72eba10c77dad1abbc7e08fdfcff197b57
 SHA512:
-  metadata.gz: 02a2a1a166d4412c82aaeadd5d1b8e200776d5680e97baccda80ffbc07f7013b84a44a512dcc4c77921dfc85e4c33c56f039213d58a05f81eaca9fad8687540e
-  data.tar.gz: a2c342f5b8dfe0b74fd3694d2fe58b7ea64b68835d08d731c33cea5007c39a4b237e374fd725307c6e40af6074f78f3b4b29d118a5a8f7cc6e084c5ac7cc073f
+  metadata.gz: 5f125da984e0713a9a7e22af5eaa410e8908e248f7331b163c627b02c09564aab16edddc7883d049dc9b4b02501c56f09ec7a18116e816804fec59859a3c2ad3
+  data.tar.gz: c5affa967bc8af1a68236561dec3f9c5c893a16293cd0a35a1c632180bd0313b9f37a9bdace4912f4af7cc8775870163a03be664ab5a0e19e57babbb11ac482f

data/app/controllers/api/v2/discovered_hosts_controller.rb

@@ -218,7 +218,7 @@ module Api
                            :message => error_message
                        }
         else
-          process_success _("Discovered hosts are rebooting now")
+          process_success :success_msg => _("Discovered hosts are rebooting now")
         end
       end
 

data/app/controllers/discovered_hosts_controller.rb

@@ -83,7 +83,8 @@ class DiscoveredHostsController < ::ApplicationController
       ::ForemanDiscovery::HostConverter.set_build_clean_facts(host)
       ::ForemanDiscovery::HostConverter.unused_ip_for_host(host)
       if host.save
-        success_options = { :success_redirect => host_path(host), :redirect_xhr => request.xhr? }
+        host_path = Setting['host_details_ui'] ? host_details_page_path(host) : host_path(host)
+        success_options = { :success_redirect => host_path, :redirect_xhr => request.xhr? }
         success_options[:success_msg] = success_message if success_message
         process_success success_options
       else

data/lib/discovery.rake

@@ -19,7 +19,8 @@ end
 
 load 'tasks/jenkins.rake'
 if Rake::Task.task_defined?(:'jenkins:unit')
-  Rake::Task["jenkins:unit"].enhance do
+  # The "unit" tests also include system tests
+  Rake::Task["jenkins:unit"].enhance(['webpack:compile']) do
     Rake::Task['test:discovery'].invoke
   end
 end

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "23.0.0"
+  VERSION = "23.0.2"
 end

data/test/functional/discovered_hosts_controller_test.rb

@@ -101,7 +101,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
 
     managed_host = Host.find(host.id)
     assert managed_host.build
-    assert_redirected_to host_url(managed_host)
+    assert_redirected_to host_details_page_path(managed_host)
     assert_equal hostgroup.id, managed_host.hostgroup_id
     assert_match(/Successfully/, flash[:success])
   end

data/test/functional/discovery_rules_controller_test.rb

@@ -3,12 +3,6 @@ require_relative '../test_plugin_helper'
 class DiscoveryRulesControllerTest < ActionController::TestCase
   setup :initialize_host
 
-  test "should add a link to navigation" do
-    get :index, params: {}, session: set_session_user
-    assert_response :success
-    assert response.body =~ /\/discovery_rules/
-  end
-
   test "reader role should get index" do
     get :index, params: {}, session: set_session_user_default_reader
     assert_response :success

data/test/integration/menu_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class ManagedExtensionsTest < ActiveSupport::TestCase
+  def test_discovery_rules_is_in_menu
+    menu = UserMenu.new.generate
+    assert_includes(menu, { name: 'Discovery Rules', url: '/discovery_rules' })
+  end
+end

data/test/unit/host_discovered_test.rb

@@ -271,7 +271,8 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     @facts["productname"] = "Dishwasher DW400"
     host2 = discover_host_from_facts(@facts)
     assert_equal 'mace41f13cc3658', host2.name
-    assert_equal 'Dishwasher DW400', host2.facts["productname"]
+    # Bypass fact cache by using it as a method
+    assert_equal 'Dishwasher DW400', host2.facts('productname')['productname']
     assert_equal '10.35.27.2', host2.ip
     assert_equal 1, Host::Discovered.where(:name => 'mace41f13cc3658').count
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 23.0.0
+  version: 23.0.2
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -76,7 +76,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-22 00:00:00.000000000 Z
+date: 2024-03-05 00:00:00.000000000 Z
 dependencies: []
 description: MaaS Discovery Plugin engine for Foreman
 email: gsutclif@redhat.com
@@ -295,6 +295,7 @@ files:
 - test/functional/discovery_rules_controller_test.rb
 - test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb
 - test/integration/discovered_hosts_test.rb
+- test/integration/menu_test.rb
 - test/migrations/20221102075151_migrate_discovery_hostname_and_fact_column_to_array_test.rb
 - test/migrations/20221102075151_migrate_discovery_hostname_and_fact_column_to_array_test.rb.orig
 - test/static_fixtures/redhat_kexec.erb
@@ -380,6 +381,7 @@ test_files:
 - test/functional/discovered_hosts_controller_test.rb
 - test/functional/discovery_rules_controller_test.rb
 - test/integration/discovered_hosts_test.rb
+- test/integration/menu_test.rb
 - test/unit/ui_notifications/destroy_host_test.rb
 - test/unit/ui_notifications/new_host_test.rb
 - test/unit/discovered_mailer_test.rb