Merge pull request #339 from mhaskel/test_overhaul

[puppet-modules/puppetlabs-apt.git] / spec / defines / force_spec.rb

diff --git a/spec/defines/force_spec.rb b/spec/defines/force_spec.rb
index 829ec4748f788999d34d291e25ab890b7b847139..a3a215c0ca60b93c4d550e8751908129126ba36f 100644 (file)
--- a/spec/defines/force_spec.rb
+++ b/spec/defines/force_spec.rb
@@ -1,5 +1,6 @@
 require 'spec_helper'
 describe 'apt::force', :type => :define do
+  let(:facts) { { :lsbdistid => 'Debian' } }
   let :pre_condition do
     'include apt::params'
   end
@@ -10,27 +11,25 @@ describe 'apt::force', :type => :define do
 
   let :default_params do
     {
-      :release => 'testing',
+      :release => false,
       :version => false
     }
   end
 
   describe "when using default parameters" do
-    let :params do
-      default_params
-    end
-    it { should contain_exec("/usr/bin/apt-get -y -t #{params[:release]} install #{title}").with(
-      :unless => "/usr/bin/test \$(/usr/bin/apt-cache policy -t #{params[:release]} #{title} | /bin/grep -E 'Installed|Candidate' | /usr/bin/uniq -s 14 | /usr/bin/wc -l) -eq 1",
-      :timeout => '300'
+    it { should contain_exec("/usr/bin/apt-get -y  install #{title}").with(
+      :unless    => "/usr/bin/dpkg -s #{title} | grep -q 'Status: install'",
+      :logoutput => 'on_failure',
+      :timeout   => '300'
     ) }
   end
 
-  describe "when specifying false release parameter" do
+  describe "when specifying release parameter" do
     let :params do
-      default_params.merge(:release => false)
+      default_params.merge(:release => 'testing')
     end
-    it { should contain_exec("/usr/bin/apt-get -y  install #{title}").with(
-      :unless  => "/usr/bin/dpkg -s #{title} | grep -q 'Status: install'"
+    it { should contain_exec("/usr/bin/apt-get -y -t #{params[:release]} install #{title}").with(
+      :unless => "/usr/bin/test \$(/usr/bin/apt-cache policy -t #{params[:release]} #{title} | /bin/grep -E 'Installed|Candidate' | /usr/bin/uniq -s 14 | /usr/bin/wc -l) -eq 1"
     ) }
   end
 
@@ -38,20 +37,20 @@ describe 'apt::force', :type => :define do
     let :params do
       default_params.merge(:version => '1')
     end
-    it { should contain_exec("/usr/bin/apt-get -y -t #{params[:release]} install #{title}=#{params[:version]}").with(
-      :unless => "/usr/bin/apt-cache policy -t #{params[:release]} #{title} | /bin/grep -q 'Installed: #{params[:version]}'"
+    it { should contain_exec("/usr/bin/apt-get -y  install #{title}=#{params[:version]}").with(
+      :unless => "/usr/bin/dpkg -s #{title} | grep -q 'Version: #{params[:version]}'"
     ) }
   end
 
-  describe "when specifying false release and version parameters" do
+  describe "when specifying release and version parameters" do
     let :params do
       default_params.merge(
-        :release => false,
+        :release => 'testing',
         :version => '1'
       )
     end
-    it { should contain_exec("/usr/bin/apt-get -y  install #{title}=1").with(
-      :unless => "/usr/bin/dpkg -s #{title} | grep -q 'Version: #{params[:version]}'"
+    it { should contain_exec("/usr/bin/apt-get -y -t #{params[:release]} install #{title}=1").with(
+      :unless => "/usr/bin/apt-cache policy -t #{params[:release]} #{title} | /bin/grep -q 'Installed: #{params[:version]}'"
     ) }
   end
 end