X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Funit%2Ffacter%2Fapt_has_updates_spec.rb;h=5c06c2fb9cf2ad15f755ea5d21bb3c469c231624;hb=b3d11489d54019191f2e6eb7313bee062ee8f60e;hp=b6eee265f77cbcb9e97854322053757c64319040;hpb=dc746734f17faa996e8441d176143945e8347330;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 b6eee26..5c06c2f 100644
--- a/spec/unit/facter/apt_has_updates_spec.rb
+++ b/spec/unit/facter/apt_has_updates_spec.rb
@@ -2,55 +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 {
+    before(:each) do
       Facter.fact(:osfamily).expects(:value).at_least(1).returns 'RedHat'
-    }
-    it { is_expected.to be_nil }
-  end
-
-  describe 'on Debian based distro missing update-notifier-common' do
-    before {
-      Facter.fact(:osfamily).expects(:value).at_least(1).returns 'Debian'
-      File.stubs(:executable?) # Stub all other calls
-      File.expects(:executable?).with('/usr/lib/update-notifier/apt-check').returns false
-    }
-    it { is_expected.to be_nil }
-  end
-
-  describe 'on Debian based distro with broken packages' do
-    before {
-      Facter.fact(:osfamily).expects(:value).at_least(1).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 "E: Error: BrokenCount > 0"
-    }
+    end
     it { is_expected.to be_nil }
   end
 
-  describe 'on Debian based distro with unknown error with semicolons' do
-    before {
+  describe 'on Debian based distro missing apt-get' do
+    before(:each) do
       Facter.fact(:osfamily).expects(:value).at_least(1).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 "E: Unknown Error: 'This error contains something that could be parsed like 4;3' (10)"
-    }
+      File.expects(:executable?).with('/usr/bin/apt-get').returns false
+    end
     it { is_expected.to be_nil }
   end
 
   describe 'on Debian based distro' do
-    before {
+    before(:each) do
       Facter.fact(:osfamily).expects(:value).at_least(1).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 "4;3"
-    }
+      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"
+      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 be true }
   end
 end
-