(CONT-773) Rubocop Auto Fixes 6-10

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

diff --git a/spec/unit/facter/apt_dist_has_updates_spec.rb b/spec/unit/facter/apt_dist_has_updates_spec.rb
index 7846632a5ae20b9bfaf4c6fc2cf8ca10f28da815..b5b05b6f054705c7ccc4dcadaa6c0b3a743a9d1a 100644 (file)
--- a/spec/unit/facter/apt_dist_has_updates_spec.rb
+++ b/spec/unit/facter/apt_dist_has_updates_spec.rb
@@ -1,16 +1,17 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apt_has_dist_updates fact' do
   subject { Facter.fact(:apt_has_dist_updates).value }
 
-  after(:each) { Facter.clear }
+  before(:each) { Facter.clear }
 
   describe 'on non-Debian distro' do
     before(:each) do
-      # Adding temporary workaround for this ticket https://tickets.puppetlabs.com/browse/IAC-1143
-      Facter.clear
       allow(Facter.fact(:osfamily)).to receive(:value).once.and_return('Redhat')
     end
+
     it { is_expected.to be_nil }
   end
 
@@ -20,6 +21,7 @@ describe 'apt_has_dist_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
 
@@ -27,15 +29,16 @@ describe 'apt_has_dist_updates fact' do
     before(:each) do
       allow(Facter.fact(:osfamily)).to receive(:value).once.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)
-      allow(Facter::Util::Resolution).to receive(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return('test')
+      allow(Facter::Core::Execution).to receive(:execute).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return('test')
       apt_output = "Inst extremetuxracer [2015f-0+deb8u1] (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
                    "Conf extremetuxracer (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
-                   "Inst planet.rb [13-1.1] (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n" \
-                   "Conf planet.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 dist-upgrade 2>&1').and_return(apt_output)
+                   "Inst planet.rb [13-1.1] (22-2~bpo8+1 Debian Backports:stretch-backports [all])\n" \
+                   "Conf planet.rb (22-2~bpo8+1 Debian Backports:stretch-backports [all])\n"
+      allow(Facter::Core::Execution).to receive(:execute).with('/usr/bin/apt-get -s -o Debug::NoLocking=true dist-upgrade 2>&1').and_return(apt_output)
     end
+
     it { is_expected.to be true }
   end
 end