foreman_wreckingball 3.4.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f9adf6349a9a378c18d5be9f632245d0861f63b53ba5ce89b1d72849e0e8c0a
-  data.tar.gz: '09d87212258ae239f338beed765cf7f9685505e446b458c030e49b33cfc11f27'
+  metadata.gz: 5386e48704b4c0837fd34063239ead1bda9c7e2dd72cc60d82c15ac60334fea2
+  data.tar.gz: 4ed751665783de1efb8e25534cc32324f287c4611aa579d031873078b53ff7d1
 SHA512:
-  metadata.gz: ad1fd61579be1231af29fd18b660e7b8185923f21cef0fad379bede4464eef6fc3cffb1b36da738bf3323918838a97003221a1a23500328ef2f6db9cdf690dc6
-  data.tar.gz: 2a2afce44f557b74509e3b9833f8ca8b3c95564146e2d16f8c733f0ea62ccc15bcc902da4a510f0b18d7fe76e22617c963aacbf4d073a9af66fa9c647c9bace6
+  metadata.gz: 2d6df272535f83e43c0889bce9655beb8b01f522269a85ebfbb7e5a6f1d332c407632e295234e12e7dc826897e8cc7eda587a322a57d265b3239ebbda54b4d4f
+  data.tar.gz: 3aea63d70aa6895ba153fdf32c370127ca8ee8a2b22ceb9099b4c8ded6fca3b8315561e4cd78854ec1977b6df73d7dee7e54e5943237de496dfaf1eebec179bd

data/app/controllers/foreman_wreckingball/hosts_controller.rb

@@ -4,11 +4,7 @@ module ForemanWreckingball
   class HostsController < ::HostsController
     include ::ForemanTasks::Concerns::Parameters::Triggering
     include ::HostsHelper
-    if Gem::Version.new(SETTINGS[:version].short) < Gem::Version.new('1.20')
-      include ::ApplicationHelper
-    else
-      include ::AuthorizeHelper
-    end
+    include ::AuthorizeHelper
 
     AJAX_REQUESTS = [:status_hosts].freeze
     before_action :ajax_request, :only => AJAX_REQUESTS
@@ -44,9 +40,14 @@ module ForemanWreckingball
     def status_managed_hosts_dashboard
       vmware_compute_resources = Foreman::Model::Vmware.unscoped.all
 
+      @errors = {}
+
       # NOTE The call to ComputeResource#vms may slow things down
       vms_by_compute_resource_id = vmware_compute_resources.each_with_object({}) do |cr, memo|
         memo[cr.id] = cr.vms.all
+      rescue StandardError => e
+        @errors[cr.name] = e.message
+        Foreman::Logging.exception("Failed to load VMs from compute resource #{cr.name}", e)
       end
 
       # Get all VM UUIDs found in any of the compute resources
@@ -178,7 +179,7 @@ module ForemanWreckingball
 
     def action_permission
       case params[:action]
-      when 'status_dashboard', 'status_hosts'
+      when 'status_dashboard', 'status_hosts', 'status_managed_hosts_dashboard'
         'view'
       when 'refresh_status_dashboard'
         'refresh_vmware_status'

data/app/models/foreman_wreckingball/vmware_hypervisor_facet.rb

@@ -6,14 +6,11 @@ module ForemanWreckingball
 
     validates_lengths_from_database
 
-    validates :host, :presence => true, :allow_blank => false
+    validates :host, presence: true, allow_blank: false
 
-    belongs_to :vmware_cluster, :inverse_of => :vmware_hypervisor_facets, :class_name => 'ForemanWreckingball::VmwareCluster'
-
-    has_one :compute_resource, :inverse_of => :vmware_hypervisor_facets, :through => :vmware_cluster
-
-    has_many :vmware_facets, :class_name => '::ForemanWreckingball::VmwareFacet', :through => :vmware_clusters,
-                             :inverse_of => :vmware_hypervisor_facets
+    belongs_to :vmware_cluster, inverse_of: :vmware_hypervisor_facets, class_name: '::ForemanWreckingball::VmwareCluster'
+    has_one :compute_resource, inverse_of: :vmware_hypervisor_facets, through: :vmware_cluster
+    has_many :vmware_facets, inverse_of: :vmware_hypervisor_facets, through: :vmware_cluster
 
     serialize :feature_capabilities, JSON
 

data/app/services/foreman_wreckingball/vmware_hypervisor_importer.rb

@@ -11,7 +11,7 @@ module ForemanWreckingball
     end
 
     def import!
-      logger.info "Can not determine organization for compute resource #{compute_resource}." if SETTINGS[:organizations_enabled]
+      logger.info "Can not determine organization for compute resource #{compute_resource}."
       compute_resource.refresh_cache
       compute_resource.vmware_clusters.each do |cluster|
         import_hypervisors(cluster)
@@ -113,12 +113,10 @@ module ForemanWreckingball
     end
 
     def organization
-      return unless SETTINGS[:organizations_enabled]
       compute_resource.organizations.first
     end
 
     def location
-      return unless SETTINGS[:locations_enabled]
       compute_resource.locations.first
     end
 

data/app/views/foreman_wreckingball/hosts/status_managed_hosts_dashboard.html.erb

@@ -18,6 +18,21 @@
   more_than_one_hosts_count: @more_than_one_hosts.count
 } %>
 
+<% if @errors.any? %>
+  <div class="alert alert-warning alert-block base alert-dismissable">
+    <%= alert_close %>
+    <h3>
+      <%= icon_text('warning-triangle-o', '', kind: 'pficon') %>
+      <%= _('Failed to load VM data.') %>
+    </h3>
+    <ul>
+    <% @errors.each do |cr, message| %>
+      <li><strong><%= cr %>:</strong> <%= message %></li>
+    <% end %>
+    </ul>
+  </div>
+<% end %>
+
 <ul class='nav nav-tabs' data-tabs='tabs'>
   <li class='active'>
     <%= content_tag :a, _('List of Hosts not found in vSphere'), href: '#missing_vms_tab', 'data-toggle': 'tab' %>

data/lib/foreman_wreckingball/engine.rb

@@ -42,7 +42,19 @@ module ForemanWreckingball
 
     initializer 'foreman_wreckingball.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_wreckingball do
-        requires_foreman '>= 1.18'
+        requires_foreman '>= 1.21'
+
+        automatic_assets(false)
+        precompile_assets(
+          [
+            'foreman_wreckingball/modal.js',
+            'foreman_wreckingball/status_hosts_table.js',
+            'foreman_wreckingball/status_managed_hosts_dashboard.js',
+            'foreman_wreckingball/status_row.js',
+            'foreman_wreckingball/status_hosts_table.css',
+            'foreman_wreckingball/status_managed_hosts_dashboard.css'
+          ]
+        )
 
         security_block :foreman_wreckingball do
           permission :refresh_vmware_status_hosts, {
@@ -76,7 +88,7 @@ module ForemanWreckingball
 
         register_facet(ForemanWreckingball::VmwareHypervisorFacet, :vmware_hypervisor_facet)
 
-        add_controller_action_scope(HostsController, :index) { |base_scope| base_scope.includes(:vmware_facet) }
+        add_controller_action_scope('HostsController', :index) { |base_scope| base_scope.includes(:vmware_facet) }
 
         # extend host show page
         extend_page('compute_resources/show') do |context|
@@ -97,29 +109,25 @@ module ForemanWreckingball
 
     # Include concerns in this config.to_prepare block
     config.to_prepare do
-      begin
-        ::HostStatus.extend(ForemanWreckingball::HostStatusExtensions)
-
-        ::ComputeResource.send(:include, ForemanWreckingball::ComputeResourceExtensions)
-        ::Foreman::Model::Vmware.send(:include, ForemanWreckingball::VmwareExtensions)
-        ::Host::Managed.send(:include, ForemanWreckingball::HostExtensions)
-        ::Host::Managed.send(:include, ForemanWreckingball::VmwareFacetHostExtensions)
-        ::Host::Managed.send(:include, ForemanWreckingball::VmwareHypervisorFacetHostExtensions)
-        ::HostsHelper.send(:include, ForemanWreckingball::HostsHelperExtensions)
-        ::User.send(:include, ForemanWreckingball::UserExtensions)
-        ::Usergroup.send(:include, ForemanWreckingball::UsergroupExtensions)
-
-        if ForemanWreckingball.fog_patches_required?
-          ForemanWreckingball.fog_vsphere_namespace::Host.send(:include, FogExtensions::ForemanWreckingball::Vsphere::Host)
-          ForemanWreckingball.fog_vsphere_namespace::Server.send(:include, FogExtensions::ForemanWreckingball::Vsphere::Server)
-          ForemanWreckingball.fog_vsphere_namespace::Real.send(:include, FogExtensions::ForemanWreckingball::Vsphere::Real)
-          ForemanWreckingball.fog_vsphere_namespace::Mock.send(:include, FogExtensions::ForemanWreckingball::Vsphere::Mock)
-        end
-      rescue StandardError => e
-        Rails.logger.warn "ForemanWreckingball: skipping engine hook (#{e})\n#{e.backtrace.join("\n")}"
+      ::HostStatus.extend(ForemanWreckingball::HostStatusExtensions)
+
+      ::ComputeResource.send(:include, ForemanWreckingball::ComputeResourceExtensions)
+      ::Foreman::Model::Vmware.send(:include, ForemanWreckingball::VmwareExtensions)
+      ::Host::Managed.send(:include, ForemanWreckingball::HostExtensions)
+      ::Host::Managed.send(:include, ForemanWreckingball::VmwareFacetHostExtensions)
+      ::Host::Managed.send(:include, ForemanWreckingball::VmwareHypervisorFacetHostExtensions)
+      ::HostsHelper.send(:include, ForemanWreckingball::HostsHelperExtensions)
+      ::User.send(:include, ForemanWreckingball::UserExtensions)
+      ::Usergroup.send(:include, ForemanWreckingball::UsergroupExtensions)
+
+      if ForemanWreckingball.fog_patches_required?
+        ForemanWreckingball.fog_vsphere_namespace::Host.send(:include, FogExtensions::ForemanWreckingball::Vsphere::Host)
+        ForemanWreckingball.fog_vsphere_namespace::Server.send(:include, FogExtensions::ForemanWreckingball::Vsphere::Server)
+        ForemanWreckingball.fog_vsphere_namespace::Real.send(:include, FogExtensions::ForemanWreckingball::Vsphere::Real)
+        ForemanWreckingball.fog_vsphere_namespace::Mock.send(:include, FogExtensions::ForemanWreckingball::Vsphere::Mock)
       end
-
-      # load 'foreman_wreckingball/scheduled_jobs.rb'
+    rescue StandardError => e
+      Rails.logger.warn "ForemanWreckingball: skipping engine hook (#{e})\n#{e.backtrace.join("\n")}"
     end
 
     initializer 'foreman_wreckingball.register_gettext', after: :load_config_initializers do |_app|

data/lib/foreman_wreckingball/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanWreckingball
-  VERSION = '3.4.0'
+  VERSION = '3.4.1'
 end

data/lib/tasks/foreman_vmware_checks_tasks.rake

@@ -6,7 +6,7 @@ require 'rake/testtask'
 namespace :foreman_wreckingball do
   namespace :vmware do
     desc 'Synchonize VMware compute resource data'
-    task :sync => :environment do
+    task :sync => ['environment', 'dynflow:client'] do
       User.as_anonymous_admin do
         ::ForemanTasks.sync_task(::Actions::ForemanWreckingball::Vmware::ScheduleVmwareSync)
       end

data/test/controllers/foreman_wreckingball/hosts_controller_test.rb

@@ -4,8 +4,6 @@ require 'test_plugin_helper'
 
 module ForemanWreckingball
   class HostsControllerTest < ActionController::TestCase
-    include ForemanWreckingball::StatusHelper
-
     let(:fake_task) { OpenStruct.new(id: 123) }
 
     setup do
@@ -238,7 +236,7 @@ module ForemanWreckingball
 
         test 'remediate selected statuses' do
           get :schedule_remediate, params: { status_ids: status_ids }, session: set_session_user
-          assert_statuses HostStatus::Status.find(status_ids)
+          assert_same_elements HostStatus::Status.find(status_ids), assigns['statuses']
         end
       end
 
@@ -254,7 +252,7 @@ module ForemanWreckingball
 
         test 'remediate all statuses' do
           get :schedule_remediate, params: { host_association: host_association }, session: set_session_user
-          assert_statuses statuses
+          assert_same_elements statuses, assigns['statuses']
         end
 
         context 'with owned_only' do
@@ -265,7 +263,7 @@ module ForemanWreckingball
 
           test 'remediate only those statuses where the user is the owner of the host' do
             get :schedule_remediate, params: { host_association: host_association, owned_only: true }, session: set_session_user
-            assert_statuses statuses
+            assert_same_elements statuses, assigns['statuses']
           end
         end
       end
@@ -296,7 +294,7 @@ module ForemanWreckingball
 
         test 'remediate selected statuses' do
           post :submit_remediate, params: { status_ids: status_ids }, session: set_session_user
-          assert_statuses HostStatus::Status.find(status_ids)
+          assert_same_elements HostStatus::Status.find(status_ids), assigns['statuses']
         end
       end
 
@@ -312,7 +310,7 @@ module ForemanWreckingball
 
         test 'remediate all statuses' do
           post :submit_remediate, params: { host_association: host_association }, session: set_session_user
-          assert_statuses statuses
+          assert_same_elements statuses, assigns['statuses']
         end
 
         context 'with owned_only' do
@@ -323,7 +321,7 @@ module ForemanWreckingball
 
           test 'remediate only those statuses where the user is the owner of the host' do
             post :submit_remediate, params: { host_association: host_association, owned_only: true }, session: set_session_user
-            assert_statuses statuses
+            assert_same_elements statuses, assigns['statuses']
           end
         end
       end

data/test/factories/compute_resource.rb

@@ -4,7 +4,7 @@ FactoryBot.modify do
   factory :compute_resource do
     trait :with_vmware_clusters do
       transient do
-        vmware_clusters_count 1
+        vmware_clusters_count { 1 }
       end
 
       after(:create) do |compute_resource, evaluator|

data/test/factories/foreman_wreckingball_factories.rb

@@ -3,129 +3,133 @@
 FactoryBot.define do
   factory :vmware_facet, class: 'ForemanWreckingball::VmwareFacet' do
     vmware_cluster
-    tools_state 2 #:toolsOk
-    power_state 1 #:poweredOn
-    cpus 2
-    corespersocket 1
-    memory_mb 8192
-    guest_id 'rhel6_64Guest'
-    cpu_hot_add false
-    hardware_version 'vmx-10'
-    cpu_features [
-      'cpuid.SSE3',
-      'cpuid.PCLMULQDQ',
-      'cpuid.SSSE3',
-      'cpuid.CMPXCHG16B',
-      'cpuid.PCID',
-      'cpuid.SSE41',
-      'cpuid.SSE42',
-      'cpuid.POPCNT',
-      'cpuid.AES',
-      'cpuid.XSAVE',
-      'cpuid.AVX',
-      'cpuid.DS',
-      'cpuid.SS',
-      'cpuid.XCR0_MASTER_SSE',
-      'cpuid.XCR0_MASTER_YMM_H',
-      'cpuid.LAHF64',
-      'cpuid.NX',
-      'cpuid.RDTSCP',
-      'cpuid.LM',
-      'cpuid.Intel'
-    ]
+    tools_state { 2 } #:toolsOk
+    power_state { 1 } #:poweredOn
+    cpus { 2 }
+    corespersocket { 1 }
+    memory_mb { 8192 }
+    guest_id { 'rhel6_64Guest' }
+    cpu_hot_add { false }
+    hardware_version { 'vmx-10' }
+    cpu_features do
+      [
+        'cpuid.SSE3',
+        'cpuid.PCLMULQDQ',
+        'cpuid.SSSE3',
+        'cpuid.CMPXCHG16B',
+        'cpuid.PCID',
+        'cpuid.SSE41',
+        'cpuid.SSE42',
+        'cpuid.POPCNT',
+        'cpuid.AES',
+        'cpuid.XSAVE',
+        'cpuid.AVX',
+        'cpuid.DS',
+        'cpuid.SS',
+        'cpuid.XCR0_MASTER_SSE',
+        'cpuid.XCR0_MASTER_YMM_H',
+        'cpuid.LAHF64',
+        'cpuid.NX',
+        'cpuid.RDTSCP',
+        'cpuid.LM',
+        'cpuid.Intel'
+      ]
+    end
     host
   end
 
   factory :vmware_hypervisor_facet, class: 'ForemanWreckingball::VmwareHypervisorFacet' do
     host
     vmware_cluster
-    cpu_cores 18
-    cpu_sockets 1
-    cpu_threads 36
-    memory 412_046_372_864
+    cpu_cores { 18 }
+    cpu_sockets { 1 }
+    cpu_threads { 36 }
+    memory { 412_046_372_864 }
     uuid { SecureRandom.uuid }
-    feature_capabilities [
-      'cpuid.3DNOW',
-      'cpuid.3DNOWPLUS',
-      'cpuid.3DNPREFETCH',
-      'cpuid.ABM',
-      'cpuid.ADX',
-      'cpuid.AES',
-      'cpuid.AMD',
-      'cpuid.AVX',
-      'cpuid.AVX2',
-      'cpuid.BMI1',
-      'cpuid.BMI2',
-      'cpuid.CMPXCHG16B',
-      'cpuid.CR8AVAIL',
-      'cpuid.Cyrix',
-      'cpuid.DS',
-      'cpuid.ENFSTRG',
-      'cpuid.EXTAPICSPC',
-      'cpuid.F16C',
-      'cpuid.FFXSR',
-      'cpuid.FMA',
-      'cpuid.FMA4',
-      'cpuid.FSGSBASE',
-      'cpuid.HLE',
-      'cpuid.IBPB',
-      'cpuid.IBRS',
-      'cpuid.INVPCID',
-      'cpuid.Intel',
-      'cpuid.LAHF64',
-      'cpuid.LM',
-      'cpuid.MISALIGNED_SSE',
-      'cpuid.MMXEXT',
-      'cpuid.MOVBE',
-      'cpuid.MWAIT',
-      'cpuid.NX',
-      'cpuid.PCID',
-      'cpuid.PCLMULQDQ',
-      'cpuid.PDPE1GB',
-      'cpuid.POPCNT',
-      'cpuid.PSN',
-      'cpuid.RDRAND',
-      'cpuid.RDSEED',
-      'cpuid.RDTSCP',
-      'cpuid.RTM',
-      'cpuid.SMAP',
-      'cpuid.SMEP',
-      'cpuid.SS',
-      'cpuid.SSE3',
-      'cpuid.SSE41',
-      'cpuid.SSE42',
-      'cpuid.SSE4A',
-      'cpuid.SSSE3',
-      'cpuid.STIBP',
-      'cpuid.SVM',
-      'cpuid.SVM_DECODE_ASSISTS',
-      'cpuid.SVM_FLUSH_BY_ASID',
-      'cpuid.SVM_NPT',
-      'cpuid.SVM_NRIP',
-      'cpuid.SVM_VMCB_CLEAN',
-      'cpuid.TBM',
-      'cpuid.VIA',
-      'cpuid.VMX',
-      'cpuid.XCR0_MASTER_SSE',
-      'cpuid.XCR0_MASTER_YMM_H',
-      'cpuid.XOP',
-      'cpuid.XSAVE',
-      'cpuid.XSAVEOPT',
-      'hv.capable',
-      'misc.cpuidFaulting',
-      'vpmc.fixctr.0',
-      'vpmc.fixedWidth',
-      'vpmc.genWidth',
-      'vpmc.genctr.0',
-      'vpmc.genctr.1',
-      'vpmc.genctr.2',
-      'vpmc.genctr.3',
-      'vpmc.microarchitecture.ivybridge',
-      'vpmc.numFixedCtrs',
-      'vpmc.numGenCtrs',
-      'vpmc.version',
-      'vt.realmode'
-    ]
+    feature_capabilities do
+      [
+        'cpuid.3DNOW',
+        'cpuid.3DNOWPLUS',
+        'cpuid.3DNPREFETCH',
+        'cpuid.ABM',
+        'cpuid.ADX',
+        'cpuid.AES',
+        'cpuid.AMD',
+        'cpuid.AVX',
+        'cpuid.AVX2',
+        'cpuid.BMI1',
+        'cpuid.BMI2',
+        'cpuid.CMPXCHG16B',
+        'cpuid.CR8AVAIL',
+        'cpuid.Cyrix',
+        'cpuid.DS',
+        'cpuid.ENFSTRG',
+        'cpuid.EXTAPICSPC',
+        'cpuid.F16C',
+        'cpuid.FFXSR',
+        'cpuid.FMA',
+        'cpuid.FMA4',
+        'cpuid.FSGSBASE',
+        'cpuid.HLE',
+        'cpuid.IBPB',
+        'cpuid.IBRS',
+        'cpuid.INVPCID',
+        'cpuid.Intel',
+        'cpuid.LAHF64',
+        'cpuid.LM',
+        'cpuid.MISALIGNED_SSE',
+        'cpuid.MMXEXT',
+        'cpuid.MOVBE',
+        'cpuid.MWAIT',
+        'cpuid.NX',
+        'cpuid.PCID',
+        'cpuid.PCLMULQDQ',
+        'cpuid.PDPE1GB',
+        'cpuid.POPCNT',
+        'cpuid.PSN',
+        'cpuid.RDRAND',
+        'cpuid.RDSEED',
+        'cpuid.RDTSCP',
+        'cpuid.RTM',
+        'cpuid.SMAP',
+        'cpuid.SMEP',
+        'cpuid.SS',
+        'cpuid.SSE3',
+        'cpuid.SSE41',
+        'cpuid.SSE42',
+        'cpuid.SSE4A',
+        'cpuid.SSSE3',
+        'cpuid.STIBP',
+        'cpuid.SVM',
+        'cpuid.SVM_DECODE_ASSISTS',
+        'cpuid.SVM_FLUSH_BY_ASID',
+        'cpuid.SVM_NPT',
+        'cpuid.SVM_NRIP',
+        'cpuid.SVM_VMCB_CLEAN',
+        'cpuid.TBM',
+        'cpuid.VIA',
+        'cpuid.VMX',
+        'cpuid.XCR0_MASTER_SSE',
+        'cpuid.XCR0_MASTER_YMM_H',
+        'cpuid.XOP',
+        'cpuid.XSAVE',
+        'cpuid.XSAVEOPT',
+        'hv.capable',
+        'misc.cpuidFaulting',
+        'vpmc.fixctr.0',
+        'vpmc.fixedWidth',
+        'vpmc.genWidth',
+        'vpmc.genctr.0',
+        'vpmc.genctr.1',
+        'vpmc.genctr.2',
+        'vpmc.genctr.3',
+        'vpmc.microarchitecture.ivybridge',
+        'vpmc.numFixedCtrs',
+        'vpmc.numGenCtrs',
+        'vpmc.version',
+        'vt.realmode'
+      ]
+    end
   end
 
   factory :vmware_cluster, class: 'ForemanWreckingball::VmwareCluster' do

data/test/factories/task.rb

@@ -3,15 +3,15 @@
 FactoryBot.modify do
   factory :some_task do
     trait :running do
-      state 'running'
+      state { 'running' }
     end
 
     trait :stopped do
-      state 'stopped'
+      state { 'stopped' }
     end
 
     trait :vmware_sync do
-      label ::Actions::ForemanWreckingball::Vmware::ScheduleVmwareSync.to_s
+      label { ::Actions::ForemanWreckingball::Vmware::ScheduleVmwareSync.to_s }
     end
   end
 end

data/test/helpers/foreman_wreckingball/status_helper.rb

@@ -4,7 +4,7 @@ module ForemanWreckingball
   module StatusHelper
     def assert_statuses(expected)
       actual = request.env['action_controller.instance'].instance_variable_get('@statuses')
-      assert_equal expected, actual
+      assert_same_elements expected, actual
     end
   end
 end

data/test/integration/hosts_status_dashboard_test.rb

@@ -23,28 +23,28 @@ class HostsStatusDashboardTest < ActionDispatch::IntegrationTest
     lists = find_all('div.list-view-pf-main-info')
 
     # VMWare Tools
-    assert_text lists[0].text, '1 OK'
-    assert_text lists[0].text, '0 Warning'
-    assert_text lists[0].text, '0 Critical'
+    assert_includes lists[0].text, '1 OK'
+    assert_includes lists[0].text, '0 Warning'
+    assert_includes lists[0].text, '0 Critical'
 
     # VMWare Operating System
-    assert_text lists[1].text, '2 OK'
-    assert_text lists[1].text, '0 Warning'
-    assert_text lists[1].text, '0 Critical'
+    assert_includes lists[1].text, '2 OK'
+    assert_includes lists[1].text, '0 Warning'
+    assert_includes lists[1].text, '0 Critical'
 
     # VMWare CPU Hot Plug
-    assert_text lists[2].text, '3 OK'
-    assert_text lists[2].text, '0 Warning'
-    assert_text lists[2].text, '0 Critical'
+    assert_includes lists[2].text, '3 OK'
+    assert_includes lists[2].text, '0 Warning'
+    assert_includes lists[2].text, '0 Critical'
 
     # VMWare Spectre V2
-    assert_text lists[3].text, '4 OK'
-    assert_text lists[3].text, '0 Warning'
-    assert_text lists[3].text, '5 Critical'
+    assert_includes lists[3].text, '4 OK'
+    assert_includes lists[3].text, '0 Warning'
+    assert_includes lists[3].text, '5 Critical'
 
     # VMWare Hardware Version
-    assert_text lists[4].text, '6 OK'
-    assert_text lists[4].text, '7 Warning'
-    assert_text lists[4].text, '0 Critical'
+    assert_includes lists[4].text, '6 OK'
+    assert_includes lists[4].text, '7 Warning'
+    assert_includes lists[4].text, '0 Critical'
   end
 end

data/test/models/host_test.rb

@@ -24,9 +24,9 @@ class Host::ManagedTest < ActiveSupport::TestCase
         FactoryBot.create(:host, :managed, owner: usergroup_with_user),
         FactoryBot.create(:host, :managed, owner: FactoryBot.create(:usergroup, usergroups: [usergroup_with_user]))
       ]
-      actual = Host::Managed.owned_by_current_user_or_group_with_current_user
+      actual = Host::Managed.owned_by_current_user_or_group_with_current_user.all
 
-      assert_equal expected, actual
+      assert_same_elements expected, actual
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_wreckingball
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Timo Goebel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-17 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
@@ -174,7 +174,7 @@ homepage: https://github.com/dm-drogeriemarkt/foreman_wreckingball
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -189,9 +189,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Adds status checks of the VMWare VMs to Foreman.
 test_files: