X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Funit%2Ffacter%2Fapt_dist_package_updates_spec.rb;h=43e2d7e7d9adfb8c1f0472992d17fd3406aed95d;hb=refs%2Fheads%2Frelease-prep;hp=557e3b3b2fe9190089d244ce91e3f5181578b26e;hpb=ab5c977b5d66840a74df12a7e64d7dff144acd73;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/unit/facter/apt_dist_package_updates_spec.rb b/spec/unit/facter/apt_dist_package_updates_spec.rb
index 557e3b3..43e2d7e 100644
--- a/spec/unit/facter/apt_dist_package_updates_spec.rb
+++ b/spec/unit/facter/apt_dist_package_updates_spec.rb
@@ -1,37 +1,35 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'apt_package_dist_updates fact' do
   subject { Facter.fact(:apt_package_dist_updates).value }
 
-  after(:each) { Facter.clear }
+  before(:each) { Facter.clear }
 
   describe 'when apt has no updates' do
     before(:each) do
-      Facter.fact(:apt_has_dist_updates).stubs(:value).returns false
+      allow(Facter.fact(:apt_has_dist_updates)).to receive(:value).and_return(false)
     end
-    it { is_expected.to be nil }
+
+    it { is_expected.to be_nil }
   end
 
   describe 'when apt has updates' do
     before(:each) do
-      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 -o Debug::NoLocking=true upgrade 2>&1').returns 'test'
-      File.expects(:executable?).with('/usr/bin/apt-get').returns true
+      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)
+      allow(Facter::Core::Execution).to receive(:execute).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return('test')
+      allow(File).to receive(:executable?).with('/usr/bin/apt-get').and_return(true)
       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"
-      Facter::Util::Resolution.expects(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true dist-upgrade 2>&1').returns apt_output
+                   "Inst planet.rb [13-1.1] (22-2~bpo8+1 Debian Backports:-backports [all])\n" \
+                   "Conf planet.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 dist-upgrade 2>&1').and_return(apt_output)
     end
-    it {
-      if Facter.version < '2.0.0'
-        is_expected.to eq('extremetuxracer,planet.rb')
-      else
-        is_expected.to eq(['extremetuxracer', 'planet.rb'])
-      end
-    }
+
+    it { is_expected.to eq(['extremetuxracer', 'planet.rb']) }
   end
 end