foreman_leapp 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39b76ff9be101528d380dd92e6a34317ff06baa209970768f118376a194f0619
-  data.tar.gz: d2c650f2b39291ea86a4b1f674513640817f13cb1392609335d77d21a57edb52
+  metadata.gz: 3ab2b680299f37a54a1d6463cfb4182f3f225f45ce3c74ece1fa85c43ca78bc4
+  data.tar.gz: 8f53d714c059f1697cfd8e001b18722e031254b74b852f291d77478173892b26
 SHA512:
-  metadata.gz: 90be586b8c9583b141818d797a32f0c34579ffdca1df9e9f51ccb591dd51e6f9b370632af43120a76081a548bcee52585d36fe36af55970790f92a5c496fe790
-  data.tar.gz: 7a37d8be2dd4fc5eee7062e53c46cc6b2303a844cc0752f03c0bc0be7a342efeab01c01b579c17c2af7635635c3a6cb0b9c036c5c65984b01a613fbafda9dff6
+  metadata.gz: 7fd6eaed188b8932a412371b1d8971ab660f54927594487756086337b2c8d77aa250cc19ce869c3d10a9699834687e59686a65c7e4f2630910d5432b68fc6fcd
+  data.tar.gz: ad7bc193c7b5383217aa0cc83e351775cd278f808c34c353d6a1d17e8deace44c650decdb280b8a4f9980e666d73584e1687a678958729cd345602fc0a12065c

data/app/lib/helpers/job_helper.rb

@@ -3,10 +3,16 @@
 module Helpers
   module JobHelper
     class << self
+      # Returns true if the given feature is present in the job_invocation's job_features,
+      # or if a matching RemoteExecutionFeature exists for the job_template.
       def correct_feature?(job_invocation, feature)
-        RemoteExecutionFeature.where(job_template_id: job_invocation.pattern_template_invocations
-                                                                    .first
-                                                                    .template_id, label: feature).any?
+        # check if the feature exists in the DB for the job_template
+        template_id = job_invocation.pattern_template_invocations.first.template_id
+        return true if RemoteExecutionFeature.exists?(job_template_id: template_id, label: feature)
+
+        # Fallback: check if the feature is present in job_features
+        job_features = Array(job_invocation.task&.input&.[]('job_features'))
+        job_features.include?(feature)
       end
     end
   end

data/lib/foreman_leapp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanLeapp
-  VERSION = '2.0.4'
+  VERSION = '2.0.5'
 end

data/test/unit/helpers/job_helper_test.rb

@@ -8,22 +8,63 @@ module Helpers
 
     let(:job_template) do
       FactoryBot.create(:job_template, template: 'echo "1"', job_category: 'leapp',
-        provider_type: 'SSH', name: 'Leapp preupgrade')
+                        provider_type: 'SSH', name: 'Leapp preupgrade')
+    end
+    let(:job_invocation) { FactoryBot.create(:job_invocation, :with_task) }
+    let(:feature_label) { 'leapp_preupgrade' }
+
+    setup do
+      FactoryBot.create(:template_invocation, template: job_template, job_invocation: job_invocation)
     end
-    let(:job_invocation) { FactoryBot.create(:job_invocation) }
 
     describe 'correct_feature?' do
-      setup do
-        RemoteExecutionFeature.find_by(label: 'leapp_preupgrade').update(job_template: job_template)
-        FactoryBot.create(:template_invocation, template: job_template, job_invocation: job_invocation)
+      test 'returns true when feature is listed in job_features' do
+        job_invocation.task.stubs(:input).returns({ 'job_features' => [feature_label] })
+        assert helper.correct_feature?(job_invocation, feature_label)
+      end
+
+      test 'returns false when job_features does not include the feature and DB has no match' do
+        job_invocation.task.stubs(:input).returns({ 'job_features' => ['some_other_feature'] })
+        assert_not helper.correct_feature?(job_invocation, feature_label)
+      end
+
+      test 'returns true when job_features does not include the feature but DB does match' do
+        RemoteExecutionFeature.find_by(label: feature_label).update(job_template: job_template)
+        job_invocation.task.stubs(:input).returns({ 'job_features' => ['some_other_feature'] })
+        assert helper.correct_feature?(job_invocation, feature_label)
+      end
+
+      test 'returns true when job_features key is missing but DB matches' do
+        RemoteExecutionFeature.find_by(label: feature_label).update(job_template: job_template)
+        job_invocation.task.stubs(:input).returns({})
+        assert helper.correct_feature?(job_invocation, feature_label)
+      end
+
+      test 'returns false when job_features key is missing and DB does not match' do
+        job_invocation.task.stubs(:input).returns({})
+        assert_not helper.correct_feature?(job_invocation, feature_label)
+      end
+
+      test 'returns false when job_features is nil and DB does not match' do
+        job_invocation.task.stubs(:input).returns({ 'job_features' => nil })
+        assert_not helper.correct_feature?(job_invocation, feature_label)
+      end
+
+      test 'returns true when job_features is nil but DB matches' do
+        RemoteExecutionFeature.find_by(label: feature_label).update(job_template: job_template)
+        job_invocation.task.stubs(:input).returns({ 'job_features' => nil })
+        assert helper.correct_feature?(job_invocation, feature_label)
       end
 
-      it 'correct feature' do
-        assert helper.correct_feature?(job_invocation, 'leapp_preupgrade')
+      test 'returns false when task is nil and feature not found in DB' do
+        job_invocation.stubs(:task).returns(nil)
+        assert_not helper.correct_feature?(job_invocation, feature_label)
       end
 
-      it 'wrong feature' do
-        assert_not helper.correct_feature?(job_invocation, 'leapp_preupgrade2')
+      test 'returns true when task is nil but DB matches' do
+        RemoteExecutionFeature.find_by(label: feature_label).update(job_template: job_template)
+        job_invocation.stubs(:task).returns(nil)
+        assert helper.correct_feature?(job_invocation, feature_label)
       end
     end
   end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_leapp
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Foreman Leapp team
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-20 00:00:00.000000000 Z
+date: 2025-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
@@ -201,7 +200,6 @@ homepage: https://github.com/theforeman/foreman_leapp
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -216,8 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A Foreman plugin for Leapp utility.
 test_files: