fix issues with tests

voxpupuli · Jul 28, 2015 · afb3a1a · afb3a1a
1 parent 0d5169a
commit afb3a1a
Showing 1 changed file with 10 additions and 17 deletions.
diff --git a/spec/defines/jenkins_credentials_spec.rb b/spec/defines/jenkins_credentials_spec.rb
@@ -17,12 +17,10 @@
       :ensure   => 'present',
       :password => 'mypass',
     }}
-    it { should contain_exec('create-jenkins-credentials-mycreds').with({
-      :command    => "#{helper_cmd} create_or_update_credentials #{title} 'mypass' '' 'Managed by Puppet' ''",
-      :unless     => "#{helper_cmd} credential_info #{title} | grep #{title}",
-      :tries      => '3',
-      :try_sleep  => '5',
-      :require    => 'Class[Jenkins::Cli_helper]',
+    it { should contain_jenkins__cli__exec('create-jenkins-credentials-mycreds').with({
+      :command    => [ "create_or_update_credentials" , "#{title}", "'mypass'",
+                       "''", "'Managed by Puppet'", "''" ],
+      :unless     => "\$HELPER_CMD credential_info #{title} | grep #{title}",
     })}
   end
 
@@ -31,11 +29,8 @@
       :ensure   => 'absent',
       :password => 'mypass',
     }}
-    it { should contain_exec('delete-jenkins-credentials-mycreds').with({
-      :command    => "#{helper_cmd} delete_credentials #{title}",
-      :tries      => '3',
-      :try_sleep  => '5',
-      :require    => 'Class[Jenkins::Cli_helper]',
+    it { should contain_jenkins__cli__exec('delete-jenkins-credentials-mycreds').with({
+      :command    => [ "delete_credentials", "#{title}" ],
     })}
   end
 
@@ -45,12 +40,10 @@
       :password => 'mypass',
       :uuid     => 'e94d3b98-5ba4-43b9-89ed-79a08ea97f6f',
     }}
-    it { should contain_exec('create-jenkins-credentials-mycreds').with({
-      :command    => "#{helper_cmd} create_or_update_credentials #{title} 'mypass' 'e94d3b98-5ba4-43b9-89ed-79a08ea97f6f' 'Managed by Puppet' ''",
-      :unless     => "#{helper_cmd} credential_info #{title} | grep #{title}",
-      :tries      => '3',
-      :try_sleep  => '5',
-      :require    => 'Class[Jenkins::Cli_helper]',
+    it { should contain_jenkins__cli__exec('create-jenkins-credentials-mycreds').with({
+      :command    => [ "create_or_update_credentials" , "#{title}", "'mypass'",
+                       "'e94d3b98-5ba4-43b9-89ed-79a08ea97f6f'", "'Managed by Puppet'", "''" ],
+      :unless     => "\$HELPER_CMD credential_info #{title} | grep #{title}",
     })}
   end