Merge remote-tracking branch 'upstream/master' into 1.7.x-merge

[puppet-modules/puppetlabs-apt.git] / spec / unit / facter / apt_updates_spec.rb

diff --git a/spec/unit/facter/apt_updates_spec.rb b/spec/unit/facter/apt_updates_spec.rb
index 2f343bd8a10dc1bca214fc1acd6a9e30da913ce2..7e9b77f84f695cecb108c9cc9897ea7254d411a6 100644 (file)
--- a/spec/unit/facter/apt_updates_spec.rb
+++ b/spec/unit/facter/apt_updates_spec.rb
@@ -4,21 +4,22 @@ describe 'apt_updates fact' do
   subject { Facter.fact(:apt_updates).value }
   after(:each) { Facter.clear }
 
-  describe 'on Debian based distro missing update-notifier-common' do
+  describe 'when apt has no updates' do
     before { 
-    Facter.fact(:osfamily).stubs(:value).returns 'Debian'
-    File.stubs(:executable?).returns false
-  }
-  it { should == nil }
+      Facter.fact(:apt_has_updates).stubs(:value).returns false
+    }
+    it { should be nil }
   end
 
-  describe 'on Debian based distro' do
+  describe 'when apt has updates' do
     before { 
-    Facter.fact(:osfamily).stubs(:value).returns 'Debian'
-    File.stubs(:executable?).returns true
-    Facter::Util::Resolution.stubs(:exec).returns '14;7'
-  }
-  it { should == 14 }
+      Facter.fact(:osfamily).stubs(:value).returns 'Debian'
+      File.stubs(:executable?) # Stub all other calls
+      Facter::Util::Resolution.stubs(:exec) # Catch all other calls
+      File.expects(:executable?).with('/usr/lib/update-notifier/apt-check').returns true
+      Facter::Util::Resolution.expects(:exec).with('/usr/lib/update-notifier/apt-check 2>&1').returns "14;7"
+    }
+    it { should == 14 }
   end
 
 end