foreman_remote_execution 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66bde99bb7667a338eddcafc4ace45a5a033b8bd
-  data.tar.gz: d55a2a2d6789076c01948424f8a9548e7ed1d2de
+  metadata.gz: f8d8e0e19bc92e9e21f80c8a6e3e92be602746bf
+  data.tar.gz: 0b1fec43cafcb5cf997572113a54b581f715e465
 SHA512:
-  metadata.gz: b99fca6b8d6d9f576cc42414f6c37e91b2121887cf696692d2beec4264ac776c4d2f16c983366c914917023724ce2e8548b1ef6caeef7b7883f10380f8bba344
-  data.tar.gz: 85dd26a1fbbc873a0a0493672922d73067d5d73cf33d610115357a3abd59570776bb6cc06ea38b32986f08b64c914db146a61561c81718e5c1b056989dc1342c
+  metadata.gz: b10f8a9378e50fb25140a93a37141791f5080ee4f92027a005b1e68b8561fbc756d8780b90240f4bddd0cd50b38927f7ed849c94155ae59a3812341b0045dc2d
+  data.tar.gz: f0e678cf3bd185d40de34820c4d1e35cefc0d7429daedfff0d2440cb7744b49f97925259d74e1cf3743cb02492e7eedc916ca0e96d56543ae9d5055cf6d53f35

data/app/models/job_template.rb

@@ -8,6 +8,7 @@ class JobTemplate < ::Template
 
   audited :allow_mass_assignment => true
   has_many :audits, :as => :auditable, :class_name => Audited.audit_class.name
+  has_many :template_invocations, :dependent => :destroy, :foreign_key => 'template_id'
 
   # these can't be shared in parent class, scoped search can't handle STI properly
   # tested with scoped_search 3.2.0

data/app/views/job_templates/index.html.erb

@@ -1,4 +1,4 @@
-<%= include_javascript %>
+<%= include_javascript if SETTINGS[:version].short == '1.9' %>
 <%= javascript 'lookup_keys' %>
 <%= javascript 'template_input' %>
 

data/app/views/template_inputs/_form.html.erb

@@ -5,7 +5,7 @@
                               remove_child_link('x', f, {:rel => 'twipsy', "data-title" => _('remove template input'), :'data-placement' => 'left', :class => 'fr badge badge-danger'}).html_safe do %>
       <%= text_f f, :name %>
       <%= checkbox_f f, :required %>
-      <%= selectable_f f, :input_type, template_input_types_options, {}, :class => 'input_type_selector' %>
+      <%= selectable_f f, :input_type, template_input_types_options, {}, :class => 'input_type_selector without_select2' %>
       <div class="fact_input_type custom_input_type_fields" style="<%= f.object.fact_template_input? ? '' : 'display:none' %>">
         <%= text_f f, :fact_name, :class => 'fact_input_type', :required => true %>
       </div>

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/test/unit/input_template_renderer_test.rb

@@ -276,7 +276,8 @@ describe InputTemplateRenderer do
           context 'with existing variable implemented as smart variable' do
             let(:puppet_class) { FactoryGirl.create(:puppetclass, :environments => [environment], :hosts => [renderer.host]) }
             let(:lookup_key) do
-              FactoryGirl.create(:lookup_key,
+              lookup_key_factory = SETTINGS[:version].short == '1.9' ? :lookup_key : :variable_lookup_key
+              FactoryGirl.create(lookup_key_factory,
                                  :key => 'client_key',
                                  :puppetclass => puppet_class,
                                  :overrides => {"fqdn=#{renderer.host.fqdn}" => "RSA KEY"})
@@ -359,10 +360,12 @@ describe InputTemplateRenderer do
               FactoryGirl.create(:puppetclass, :environments => [environment], :hosts => [renderer.host], :name => 'nginx')
             end
             let(:lookup_key) do
-              FactoryGirl.create(:lookup_key, :as_smart_class_param, :with_override,
+              lookup_key_factory = SETTINGS[:version].short == '1.9' ? :lookup_key : :puppetclass_lookup_key
+              FactoryGirl.create(lookup_key_factory, :as_smart_class_param,
                                  :key => 'version',
                                  :puppetclass => puppet_class,
                                  :path => 'fqdn',
+                                 :override => true,
                                  :overrides => {"fqdn=#{renderer.host.fqdn}" => "1.4.7"})
             end
 

data/test/unit/job_template_test.rb

@@ -51,4 +51,16 @@ describe JobTemplate do
       template.default.must_equal true
     end
   end
+
+  context 'there is existing template invocation of a job template' do
+    let(:job_invocation) { FactoryGirl.create(:job_invocation, :with_template) }
+    let(:job_template) { job_invocation.template_invocations.first.template }
+
+    describe 'job template deletion' do
+      it 'succeeds' do
+        job_template.template_invocations.wont_be_empty
+        assert job_template.destroy
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails