(IAC-1143) Remove temporary fix.

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

diff --git a/spec/unit/facter/apt_package_updates_spec.rb b/spec/unit/facter/apt_package_updates_spec.rb
index d7587ca99632312cfa4760e26f8e4ee213057809..4c81d0c0884900c048f48d801b830742d26b92b3 100644 (file)
--- a/spec/unit/facter/apt_package_updates_spec.rb
+++ b/spec/unit/facter/apt_package_updates_spec.rb
@@ -2,33 +2,28 @@ require 'spec_helper'
 
 describe 'apt_package_updates fact' do
   subject { Facter.fact(:apt_package_updates).value }
-  after(:each) { Facter.clear }
+
+  before(:each) { Facter.clear }
 
   describe 'when apt has no updates' do
-    before { 
-      Facter.fact(:apt_has_updates).stubs(:value).returns false
-    }
+    before(:each) do
+      allow(Facter.fact(:apt_has_updates)).to receive(:value).and_return(false)
+    end
     it { is_expected.to be nil }
   end
 
   describe 'when apt has updates' do
-    before { 
-      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/bin/apt-get').returns true
-      Facter::Util::Resolution.expects(:exec).with('/usr/bin/apt-get -s upgrade 2>&1').returns ""+
-        "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"
-    }
-    it {
-      if Facter.version < '2.0.0'
-        is_expected.to eq('tzdata,unhide.rb')
-      else
-        is_expected.to eq(['tzdata','unhide.rb'])
-      end
-    }
+    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 eq(['tzdata', 'unhide.rb']) }
   end
 end