X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Funit%2Ffacter%2Fapt_updates_spec.rb;h=d0a5dbb0febe2a567ebb5fd764c64ee5d7e3d85a;hb=b3d11489d54019191f2e6eb7313bee062ee8f60e;hp=7e9b77f84f695cecb108c9cc9897ea7254d411a6;hpb=95bed8902f31bf84947c4951872f712b3cbd6741;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/unit/facter/apt_updates_spec.rb b/spec/unit/facter/apt_updates_spec.rb
index 7e9b77f..d0a5dbb 100644
--- a/spec/unit/facter/apt_updates_spec.rb
+++ b/spec/unit/facter/apt_updates_spec.rb
@@ -2,24 +2,29 @@ require 'spec_helper'
 
 describe 'apt_updates fact' do
   subject { Facter.fact(:apt_updates).value }
+
   after(:each) { Facter.clear }
 
   describe 'when apt has no updates' do
-    before { 
+    before(:each) do
       Facter.fact(:apt_has_updates).stubs(:value).returns false
-    }
-    it { should be nil }
+    end
+    it { is_expected.to be nil }
   end
 
   describe 'when apt has updates' do
-    before { 
+    before(:each) do
       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 }
+      File.expects(:executable?).with('/usr/bin/apt-get').returns 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"
+      puts apt_output
+      Facter::Util::Resolution.expects(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').returns apt_output
+    end
+    it { is_expected.to eq(2) }
   end
-
 end