Merge pull request #1104 from kenyon/refresh-on-expired-subkeys

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

diff --git a/spec/unit/facter/apt_has_updates_spec.rb b/spec/unit/facter/apt_has_updates_spec.rb
index f7a1ca9dbd1209885a1fc5825139223e2e7dc433..77a95b4391708ca66011752bbb6b518a2c051c26 100644 (file)
--- a/spec/unit/facter/apt_has_updates_spec.rb
+++ b/spec/unit/facter/apt_has_updates_spec.rb
@@ -1,14 +1,17 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apt_has_updates fact' do
   subject { Facter.fact(:apt_has_updates).value }
 
-  after(:each) { Facter.clear }
+  before(:each) { Facter.clear }
 
   describe 'on non-Debian distro' do
     before(:each) do
       allow(Facter.fact(:osfamily)).to receive(:value).once.and_return('Redhat')
     end
+
     it { is_expected.to be_nil }
   end
 
@@ -18,6 +21,7 @@ describe 'apt_has_updates fact' do
       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
 
@@ -25,14 +29,15 @@ describe 'apt_has_updates fact' do
     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(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: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)
+                   "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 be true }
   end
 end