X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Funit%2Ffacter%2Fapt_updates_spec.rb;h=a8eacbf20bcf7e8e937d4e562f2fedc736c78369;hb=1442e42b3591b50887351a50b7a4bef2b16038ab;hp=8c726fc343539f101daab2cc64fe80f3588a9b61;hpb=00a21076d7ac3bfbd2e70a205f22b36a489ec1fb;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 8c726fc..a8eacbf 100644
--- a/spec/unit/facter/apt_updates_spec.rb
+++ b/spec/unit/facter/apt_updates_spec.rb
@@ -1,29 +1,31 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apt_updates fact' do
   subject { Facter.fact(:apt_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"
-    }
+    before(:each) do
+      allow(Facter.fact(:osfamily)).to receive(:value).and_return('Debian')
+      allow(File).to receive(:executable?) # Stub all other calls
+      allow(Facter::Core::Execution).to receive(:execute) # 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:-backports [all])\n" \
+                   "Conf unhide.rb (22-2~bpo8+1 Debian Backports:-backports [all])\n"
+      allow(Facter::Core::Execution).to receive(:execute).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return(apt_output)
+    end
     it { is_expected.to eq(2) }
   end
-
 end