foreman_remote_execution 1.3.0 → 1.3.1

data/test/functional/api/v2/job_templates_controller_test.rb

@@ -91,7 +91,7 @@ module Api
         erb_data = @template.to_erb
         post :import, :template => erb_data
         assert_response :success
-        assert JobTemplate.unscoped.find_by_name(new_name)
+        assert JobTemplate.unscoped.find_by(name: new_name)
       end
     end
 

data/test/test_plugin_helper.rb

@@ -1,26 +1,9 @@
 # This calls the main test_helper in Foreman-core
 require 'test_helper'
-require 'database_cleaner'
 require 'dynflow/testing'
 
 # Add plugin to FactoryGirl's paths
 FactoryGirl.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
+# Add foreman tasks factories too
+FactoryGirl.definition_file_paths << "#{ForemanTasks::Engine.root}/test/factories"
 FactoryGirl.reload
-
-# Foreman's setup doesn't handle cleaning up for Minitest::Spec
-DatabaseCleaner.strategy = :transaction
-
-class Minitest::Spec
-  class << self
-    alias_method :context, :describe
-  end
-
-  before :each do
-    DatabaseCleaner.start
-    Setting::RemoteExecution.load_defaults
-  end
-
-  after :each do
-    DatabaseCleaner.clean
-  end
-end

data/test/unit/concerns/host_extensions_test.rb

@@ -1,6 +1,9 @@
 require 'test_plugin_helper'
 
-describe ForemanRemoteExecution::HostExtensions do
+class ForemanRemoteExecutionHostExtensionsTest < ActiveSupport::TestCase
+  before do
+    Setting::RemoteExecution.load_defaults
+  end
   let(:provider) { 'SSH' }
 
   before { User.current = FactoryGirl.build(:user, :admin) }
@@ -61,6 +64,52 @@ describe ForemanRemoteExecution::HostExtensions do
     end
   end
 
+  context 'scoped search' do
+    let(:job) do
+      job = FactoryGirl.create(:job_invocation, :with_task)
+      job.template_invocations << FactoryGirl.create(:template_invocation, :with_host, :with_failed_task)
+      job
+    end
+
+    let(:job2) do
+      job = FactoryGirl.create(:job_invocation, :with_task)
+      job.template_invocations << FactoryGirl.create(:template_invocation, :with_host, :with_failed_task)
+      job
+    end
+
+    it 'finds hosts for job_invocation.id' do
+      found_ids = Host.search_for("job_invocation.id = #{job.id}").map(&:id).sort
+      found_ids.must_equal job.template_invocations_host_ids.sort
+    end
+
+    it 'finds hosts by job_invocation.result' do
+      success, failed = job.template_invocations
+                           .partition { |template| template.run_host_job_task.result == 'success' }
+      found_ids = Host.search_for('job_invocation.result = success').map(&:id)
+      found_ids.must_equal success.map(&:host_id)
+      found_ids = Host.search_for('job_invocation.result = failed').map(&:id)
+      found_ids.must_equal failed.map(&:host_id)
+    end
+
+    it 'finds hosts by job_invocation.id and job_invocation.result' do
+      # Force evaluation of the jobs
+      job
+      job2
+
+      Host.search_for("job_invocation.id = #{job.id}").count.must_equal 2
+      Host.search_for("job_invocation.id = #{job2.id}").count.must_equal 2
+      Host.search_for('job_invocation.result = success').count.must_equal 2
+      Host.search_for('job_invocation.result = failed').count.must_equal 2
+
+      success, failed = job.template_invocations
+                           .partition { |template| template.run_host_job_task.result == 'success' }
+      found_ids = Host.search_for("job_invocation.id = #{job.id} AND job_invocation.result = success").map(&:id)
+      found_ids.must_equal success.map(&:host_id)
+      found_ids = Host.search_for("job_invocation.id = #{job.id} AND job_invocation.result = failed").map(&:id)
+      found_ids.must_equal failed.map(&:host_id)
+    end
+  end
+
   describe 'proxy determination strategies' do
     context 'subnet strategy' do
       let(:host) { FactoryGirl.build(:host, :with_execution) }
@@ -94,10 +143,10 @@ describe ForemanRemoteExecution::HostExtensions do
     end
 
     context 'global strategy' do
-      let(:organization) { FactoryGirl.build(:organization) }
-      let(:location) { FactoryGirl.build(:location) }
-      let(:host) { FactoryGirl.build(:host, :organization => organization, :location => location) }
-      let(:proxy_in_taxonomies) { FactoryGirl.create(:smart_proxy, :ssh, :organizations => [organization], :locations => [location]) }
+      let(:tax_organization) { FactoryGirl.build(:organization) }
+      let(:tax_location) { FactoryGirl.build(:location) }
+      let(:host) { FactoryGirl.build(:host, :organization => tax_organization, :location => tax_location) }
+      let(:proxy_in_taxonomies) { FactoryGirl.create(:smart_proxy, :ssh, :organizations => [tax_organization], :locations => [tax_location]) }
       let(:proxy_no_taxonomies) { FactoryGirl.create(:smart_proxy, :ssh) }
 
       context 'enabled' do

data/test/unit/concerns/nic_extensions_test.rb

@@ -1,6 +1,6 @@
 require 'test_plugin_helper'
 
-describe ForemanRemoteExecution::NicExtensions do
+class ForemanRemoteExecutionNicExtensionsTest < ActiveSupport::TestCase
   let(:host) { FactoryGirl.create(:host) }
 
   it 'sets the first primary interface as the execution interface' do

data/test/unit/execution_task_status_mapper_test.rb

@@ -1,7 +1,6 @@
 require 'test_plugin_helper'
 
-describe HostStatus::ExecutionStatus::ExecutionTaskStatusMapper do
-
+class ExecutionTaskStatusMapperTest < ActiveSupport::TestCase
   describe '.sql_conditions_for(status)' do
     let(:subject) { HostStatus::ExecutionStatus::ExecutionTaskStatusMapper }
 

data/test/unit/input_template_renderer_test.rb

@@ -1,6 +1,6 @@
 require 'test_plugin_helper'
 
-describe InputTemplateRenderer do
+class InputTemplateRendererTest < ActiveSupport::TestCase
   context 'renderer for simple template without inputs' do
     let(:renderer) { InputTemplateRenderer.new(FactoryGirl.build(:job_template, :template => 'id <%= preview? %>')) }
 

data/test/unit/job_invocation_composer_test.rb

@@ -2,24 +2,11 @@ require 'test_plugin_helper'
 RemoteExecutionProvider.register(:Ansible, OpenStruct)
 RemoteExecutionProvider.register(:Mcollective, OpenStruct)
 
-describe JobInvocationComposer do
+class JobInvocationComposerTest < ActiveSupport::TestCase
   before do
-    permission1 = Permission.find_by_name('view_job_templates')
-    permission2 = Permission.find_by_name('view_bookmarks')
-    permission3 = Permission.find_by_name('view_hosts')
-    filter1 = FactoryGirl.build(:filter, :permissions => [permission1], :search => 'name ~ trying*')
-    filter2 = FactoryGirl.build(:filter, :permissions => [permission2])
-    filter3 = FactoryGirl.build(:filter, :permissions => [permission3])
-    filter1.save
-    filter2.save
-    filter3.save
-    role = FactoryGirl.build(:role)
-    role.filters = filter1, filter2, filter3
-    role.save
-    User.current = FactoryGirl.build(:user)
-    User.current.current_password = User.current.password
-    User.current.roles << role
-    User.current.save
+    setup_user('view', 'job_templates', 'name ~ trying*')
+    setup_user('view', 'bookmarks')
+    setup_user('view', 'hosts')
   end
 
   let(:trying_job_template_1) { FactoryGirl.create(:job_template, :job_category => 'trying_job_template_1', :name => 'trying1', :provider_type => 'SSH') }
@@ -213,8 +200,7 @@ describe JobInvocationComposer do
               trying_job_template_1.id.to_s => {
                 :input_values => { input1.id.to_s => { :value => 'value1' }, unauthorized_input1.id.to_s => { :value => 'dropped' } }
               }
-            }
-          }
+            }}
         end
         let(:params) { { :job_invocation => { :providers => { :ssh => ssh_params } } }.with_indifferent_access }
         let(:invocations) { composer.pattern_template_invocations }
@@ -233,8 +219,7 @@ describe JobInvocationComposer do
               trying_job_template_1.id.to_s => {
                 :effective_user => invocation_effective_user
               }
-            }
-          }
+            }}
         end
         let(:params) { { :job_invocation => { :providers => { :ssh => ssh_params } } }.with_indifferent_access }
         let(:template_invocation) do
@@ -382,7 +367,8 @@ describe JobInvocationComposer do
               :job_templates => {
                 trying_job_template_1.id.to_s => {
                   :input_values => { }
-                } } }
+                }
+              } }
           end
           let(:params) { { :job_invocation => { :providers => { :ssh => ssh_params } } }.with_indifferent_access }
 
@@ -398,7 +384,8 @@ describe JobInvocationComposer do
               :job_templates => {
                 trying_job_template_1.id.to_s => {
                   :input_values => { input1.id.to_s => { :value => 'value1' } }
-                } } }
+                }
+              } }
           end
           let(:params) { { :job_invocation => { :providers => { :ssh => ssh_params } } }.with_indifferent_access }
 
@@ -415,7 +402,8 @@ describe JobInvocationComposer do
             :job_templates => {
               trying_job_template_1.id.to_s => {
                 :input_values => { input1.id.to_s => { :value => 'value1' } }
-              } } }
+              }
+            } }
         end
         let(:params) do
           { :job_invocation => { :providers => { :ssh => ssh_params } }, :targeting => { :search_query => "name = #{host.name}" } }.with_indifferent_access
@@ -496,16 +484,15 @@ describe JobInvocationComposer do
             :job_templates => {
               trying_job_template_1.id.to_s => {
                 :input_values => { input1.id.to_s => { :value => 'value1' } }
-              } } }
+              }
+            } }
         end
         let(:params) do
           {
             :job_invocation => {
               :providers => { :ssh => ssh_params },
-              :concurrency_control => {
-                :level => 5,
-                :time_span => 60
-              }
+              :concurrency_level => 5,
+              :time_span => 60,
             },
             :targeting => {
               :search_query => "name = #{host.name}",
@@ -525,6 +512,11 @@ describe JobInvocationComposer do
           new_composer.job_category.must_equal existing.job_category
         end
 
+        it 'accepts additional host ids' do
+          new_composer = JobInvocationComposer.from_job_invocation(composer.job_invocation, { :host_ids => [host.id] })
+          new_composer.search_query.must_equal("name ^ (#{host.name})")
+        end
+
         it 'builds new targeting object which keeps search query' do
           new_composer.targeting.wont_equal existing.targeting
           new_composer.search_query.must_equal existing.targeting.search_query

data/test/unit/job_invocation_test.rb

@@ -1,7 +1,6 @@
 require 'test_plugin_helper'
 
-describe JobInvocation do
-
+class JobInvocationTest < ActiveSupport::TestCase
   let(:job_invocation) { FactoryGirl.build(:job_invocation) }
   let(:template) { FactoryGirl.create(:job_template, :with_input) }
 

data/test/unit/job_template_effective_user_test.rb

@@ -1,6 +1,6 @@
 require 'test_plugin_helper'
 
-describe JobTemplateEffectiveUser do
+class JobTemplateEffectiveUserTest < ActiveSupport::TestCase
   let(:job_template) { FactoryGirl.build(:job_template, :job_category => '') }
   let(:effective_user) { job_template.effective_user }
 

data/test/unit/job_template_importer_test.rb

@@ -1,6 +1,6 @@
 require 'test_plugin_helper'
 
-describe JobTemplateImporter do
+class JobTemplateImporterTest < ActiveSupport::TestCase
   context 'importing a new template' do
     # JobTemplate tests handle most of this, we just check that the shim
     # correctly loads a template returns a hash
@@ -9,40 +9,58 @@ describe JobTemplateImporter do
     end
 
     let(:result) do
-      name = "Community Service Restart"
+      name = 'Community Service Restart'
+      metadata = {
+        'model' => 'JobTemplate',
+        'kind' => 'job_template',
+        'name' => 'Service Restart',
+        'job_category' => 'Service Restart',
+        'provider_type' => 'SSH',
+        'feature' => remote_execution_feature.label,
+        'template_inputs' => [
+          { 'name' => 'service_name', 'input_type' => 'user', 'required' => true },
+          { 'name' => 'verbose', 'input_type' => 'user' }
+        ]
+      }
       text = <<-END_TEMPLATE
 <%#
-model: JobTemplateImporter
-kind: job_template
-name: Service Restart
-job_category: Service Restart
-provider_type: SSH
-feature: #{remote_execution_feature.label}
-template_inputs:
-- name: service_name
-  input_type: user
-  required: true
-- name: verbose
-  input_type: user
+#{YAML.dump(metadata)}
 %>
 
 service <%= input("service_name") %> restart
 END_TEMPLATE
 
-      # This parameter is unused but foreman_templates will supply it
-      # so we test it's accepted
-      metadata = "unused"
-
       JobTemplateImporter.import!(name, text, metadata)
     end
 
-    let(:template) { JobTemplate.find_by_name 'Community Service Restart' }
+    let(:template) { JobTemplate.find_by name: 'Community Service Restart' }
 
     it 'returns a valid foreman_templates hash' do
       result[:status].must_equal true
       result[:result].must_equal '  Created Template :Community Service Restart'
-      result[:old].must_equal nil
+      result[:old].must_be_nil
       result[:new].must_equal template.template.squish
     end
   end
+
+  context 'updating locked template' do
+    it 'does not update locked template' do
+      name = 'Locked job template'
+      template = FactoryGirl.create(:job_template, :locked => true, :name => name)
+      res = JobTemplateImporter.import!(name, 'some text', 'metadata')
+      assert_equal "Skipping Template #{template.id}:#{template.name} - template is locked", res[:result]
+    end
+
+    it 'updates locked template' do
+      name = 'Locked job template again'
+      metadata = {
+        'model' => 'JobTemplate',
+        'kind' => 'job_template',
+        'name' => name
+      }
+      template = FactoryGirl.create(:job_template, :locked => true, :name => name)
+      res = JobTemplateImporter.import!(name, 'some text', metadata, true)
+      assert_equal "  Updated Template #{template.id}:Locked job template again", res[:result]
+    end
+  end
 end

data/test/unit/job_template_test.rb

@@ -1,6 +1,6 @@
 require 'test_plugin_helper'
 
-describe JobTemplate do
+class JobTemplateTest < ActiveSupport::TestCase
   context 'when creating a template' do
     let(:job_template) { FactoryGirl.build(:job_template, :job_category => '') }
     let(:template_with_inputs) do
@@ -96,7 +96,7 @@ describe JobTemplate do
       service <%= input("service_name") %> restart
       END_TEMPLATE
 
-      JobTemplate.import!(template, :default => true)
+      JobTemplate.import_raw!(template, :default => true)
     end
 
     let(:template_with_input_sets) do
@@ -114,7 +114,7 @@ describe JobTemplate do
       service <%= input("service_name") %> restart
       END_TEMPLATE
 
-      JobTemplate.import!(template_with_input_sets, :default => true)
+      JobTemplate.import_raw!(template_with_input_sets, :default => true)
     end
 
     it 'sets the name' do
@@ -162,7 +162,7 @@ describe JobTemplate do
       echo input(:banner_message)
       END_TEMPLATE
 
-      JobTemplate.import!(template, :default => true)
+      JobTemplate.import_raw!(template, :default => true)
     end
 
     let(:existing) do
@@ -184,7 +184,7 @@ describe JobTemplate do
       ping -c 5 <%= input("hostname") %>
       END_TEMPLATE
 
-      JobTemplate.import!(template, :default => true)
+      JobTemplate.import_raw!(template, :default => true)
     end
 
     let(:updated) do
@@ -213,12 +213,12 @@ describe JobTemplate do
 
     it 'will not overwrite by default' do
       existing
-      refute JobTemplate.import!(updated)
+      refute JobTemplate.import_raw!(updated)
     end
 
     let(:synced_template) do
       existing
-      JobTemplate.import!(updated, :update => true)
+      JobTemplate.import_raw!(updated, :update => true)
       existing.reload
     end
 
@@ -263,7 +263,7 @@ describe JobTemplate do
       old_name = exportable_template.name
       exportable_template.update_attributes(:name => "#{old_name}_renamed")
 
-      imported = JobTemplate.import!(erb)
+      imported = JobTemplate.import_raw!(erb)
       imported.name.must_equal old_name
       imported.template_inputs.first.to_export.must_equal exportable_template.template_inputs.first.to_export
     end

data/test/unit/remote_execution_feature_test.rb

@@ -1,6 +1,6 @@
 require 'test_plugin_helper'
 
-describe RemoteExecutionFeature do
+class RemoteExecutionFeatureTest < ActiveSupport::TestCase
   should validate_presence_of(:name)
   should validate_presence_of(:label)
   should validate_uniqueness_of(:name)
@@ -40,10 +40,10 @@ describe RemoteExecutionFeature do
       input_value.value.must_equal 'zsh'
       input_value.template_input.name.must_equal 'package'
 
-      composer.targeting.search_query.must_equal "name = #{host.name}"
+      composer.targeting.search_query.must_equal "name ^ (#{host.name})"
     end
 
-    it "updates the feature when attributes change" do
+    it 'updates the feature when attributes change' do
       updated_feature = RemoteExecutionFeature.register(install_feature.label, N_('Katello: Install package'),
                                                         :description => 'New description',
                                                         :provided_inputs => ['package', 'force'])
@@ -63,19 +63,19 @@ describe RemoteExecutionFeature do
       refute feature.host_action_button
     end
 
-    it "creates a feature with host action flag" do
+    it 'creates a feature with host action flag' do
       feature = RemoteExecutionFeature.register('new_feature_that_does_not_exist_button', 'name', :host_action_button => true)
       feature.must_be :persisted?
       assert feature.host_action_button
     end
 
-    it "created feature with host action flag can be found using named scope" do
+    it 'created feature with host action flag can be found using named scope' do
       feature = RemoteExecutionFeature.register('new_feature_that_does_not_exist_button', 'name', :host_action_button => true)
       assert_includes RemoteExecutionFeature.with_host_action_button, feature
     end
 
 
-    it "updates a feature if it exists" do
+    it 'updates a feature if it exists' do
       existing = FactoryGirl.create(:remote_execution_feature, :name => 'existing_feature_withou_action_button')
       feature = RemoteExecutionFeature.register(existing.label, existing.name, :host_action_button => true)
       feature.must_be :persisted?