X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Funit%2Ffacter%2Fapt_has_updates_spec.rb;h=f7a1ca9dbd1209885a1fc5825139223e2e7dc433;hb=8038d0a43280307c67cff5c610cb6c023683a10a;hp=691fb32280308af603eb66a8a2b8132cfed9e090;hpb=06cffcdd09bcf2e623db3160b29f77dc396c33d2;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/unit/facter/apt_has_updates_spec.rb b/spec/unit/facter/apt_has_updates_spec.rb
index 691fb32..f7a1ca9 100644
--- a/spec/unit/facter/apt_has_updates_spec.rb
+++ b/spec/unit/facter/apt_has_updates_spec.rb
@@ -2,33 +2,37 @@ require 'spec_helper'
 
 describe 'apt_has_updates fact' do
   subject { Facter.fact(:apt_has_updates).value }
+
   after(:each) { Facter.clear }
 
   describe 'on non-Debian distro' do
-    before {
-      Facter.fact(:osfamily).expects(:value).returns 'RedHat'
-    }
-    it { should be_nil }
+    before(:each) do
+      allow(Facter.fact(:osfamily)).to receive(:value).once.and_return('Redhat')
+    end
+    it { is_expected.to be_nil }
   end
 
-  describe 'on Debian based distro missing update-notifier-common' do
-    before {
-      Facter.fact(:osfamily).expects(:value).returns 'Debian'
-      File.stubs(:executable?) # Stub all other calls
-      File.expects(:executable?).with('/usr/lib/update-notifier/apt-check').returns false
-    }
-    it { should be_nil }
+  describe 'on Debian based distro missing apt-get' do
+    before(:each) do
+      allow(Facter.fact(:osfamily)).to receive(:value).once.and_return('Debian')
+      allow(File).to receive(:executable?) # Stub all other calls
+      allow(File).to receive(:executable?).with('/usr/bin/apt-get').and_return(false)
+    end
+    it { is_expected.to be_nil }
   end
 
   describe 'on Debian based distro' do
-    before {
-      Facter.fact(:osfamily).expects(: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>/dev/null').returns "4;3"
-    }
-    it { should be true }
+    before(:each) do
+      allow(Facter.fact(:osfamily)).to receive(:value).and_return('Debian')
+      allow(File).to receive(:executable?) # Stub all other calls
+      allow(Facter::Util::Resolution).to receive(:exec) # Catch all other calls
+      allow(File).to receive(:executable?).with('/usr/bin/apt-get').and_return(true)
+      apt_output = "Inst tzdata [2015f-0+deb8u1] (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
+                   "Conf tzdata (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
+                   "Inst unhide.rb [13-1.1] (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n" \
+                   "Conf unhide.rb (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n"
+      allow(Facter::Util::Resolution).to receive(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return(apt_output)
+    end
+    it { is_expected.to be true }
   end
 end
-