Update spec tests for pinned plugin

voxpupuli · May 14, 2014 · 9d8930b · 9d8930b
1 parent f033c23
commit 9d8930b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
@@ -74,23 +74,26 @@
     exec { "create-pinnedfile-${name}" :
       command => "touch ${plugin_dir}/${name}.jpi.pinned",
       cwd     => $plugin_dir,
-      require => File[$plugin_dir],
       path    => ['/usr/bin', '/usr/sbin', '/bin'],
       onlyif  => "test -f ${plugin_dir}/${name}.jpi -a ! -f ${plugin_dir}/${name}.jpi.pinned",
-      before  => Exec["download-${name}"],
+      require => File[$plugin_dir],
     }
 
     exec { "download-${name}" :
       command    => "rm -rf ${name} ${name}.[hj]pi && wget --no-check-certificate ${base_url}${plugin}",
       cwd        => $plugin_dir,
-      require    => [File[$plugin_dir], Package['wget']],
       path       => ['/usr/bin', '/usr/sbin', '/bin'],
+      require    => [
+        File[$plugin_dir],
+        Package['wget'],
+        Exec["create-pinnedfile-${name}"],
+      ],
     }
 
     file { "${plugin_dir}/${plugin}" :
-      require => Exec["download-${name}"],
       owner   => 'jenkins',
       mode    => '0644',
+      require => Exec["download-${name}"],
       notify  => Service['jenkins'],
     }
   }

diff --git a/spec/defines/jenkins_plugin_spec.rb b/spec/defines/jenkins_plugin_spec.rb
@@ -9,18 +9,24 @@
   it { should contain_user('jenkins').with('home' => '/var/lib/jenkins') }
 
   describe 'without version' do
+    let(:facts) { { :jenkins_plugins => '' } }
+
     it { should contain_exec('download-myplug').with(
-      :command      => 'rm -rf myplug myplug.* && wget --no-check-certificate http://updates.jenkins-ci.org/latest/myplug.hpi',
+      :command      => 'rm -rf myplug myplug.[hj]pi && wget --no-check-certificate http://updates.jenkins-ci.org/latest/myplug.hpi',
       :environment  => nil
     )}
     it { should contain_file('/var/lib/jenkins/plugins/myplug.hpi')}
   end
 
   describe 'with version' do
     let(:params) { { :version => '1.2.3' } }
+    let(:facts) { { :jenkins_plugins => '' } }
 
+    it { should contain_exec('create-pinnedfile-myplug').with(
+      :command      => 'touch /var/lib/jenkins/plugins/myplug.jpi.pinned'
+    )}
     it { should contain_exec('download-myplug').with(
-      :command      => 'rm -rf myplug myplug.* && wget --no-check-certificate http://updates.jenkins-ci.org/download/plugins/myplug/1.2.3/myplug.hpi',
+      :command      => 'rm -rf myplug myplug.[hj]pi && wget --no-check-certificate http://updates.jenkins-ci.org/download/plugins/myplug/1.2.3/myplug.hpi',
       :environment  => nil
     ) }
     it { should contain_file('/var/lib/jenkins/plugins/myplug.hpi')}