X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Funit%2Ffacter%2Fapt_dist_package_security_updates_spec.rb;h=4033a28ddec3d21bbd2c7e139755557ebdb75955;hb=5d65109ca18ef1f9368d169ae641dac0570eebc5;hp=316dbfc6ffc0df4e756f5f6bbdbadb2796a771fc;hpb=b3d11489d54019191f2e6eb7313bee062ee8f60e;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/unit/facter/apt_dist_package_security_updates_spec.rb b/spec/unit/facter/apt_dist_package_security_updates_spec.rb
index 316dbfc..4033a28 100644
--- a/spec/unit/facter/apt_dist_package_security_updates_spec.rb
+++ b/spec/unit/facter/apt_dist_package_security_updates_spec.rb
@@ -3,24 +3,24 @@ require 'spec_helper'
 describe 'apt_package_security_dist_updates fact' do
   subject { Facter.fact(:apt_package_security_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 }
   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
-      Facter::Util::Resolution.expects(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true dist-upgrade 2>&1').returns apt_get_upgrade_output
+      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)
+      allow(Facter::Util::Resolution).to receive(:exec).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)
+      allow(Facter::Util::Resolution).to receive(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true dist-upgrade 2>&1').and_return(apt_get_upgrade_output)
     end
 
     describe 'on Debian' do
@@ -33,13 +33,7 @@ describe 'apt_package_security_dist_updates fact' do
           "Conf vim (7.52.1-5+deb9u2 Debian-Security:9/stable [amd64])\n" \
       end
 
-      it {
-        if Facter.version < '2.0.0'
-          is_expected.to eq('vim')
-        else
-          is_expected.to eq(['vim'])
-        end
-      }
+      it { is_expected.to eq(['vim']) }
     end
 
     describe 'on Ubuntu' do
@@ -52,13 +46,7 @@ describe 'apt_package_security_dist_updates fact' do
           "Conf onioncircuits (2:3.3.10-4ubuntu2.3 Ubuntu:16.04/xenial-updates [amd64])\n"
       end
 
-      it {
-        if Facter.version < '2.0.0'
-          is_expected.to eq('extremetuxracer,vim')
-        else
-          is_expected.to eq(%w[extremetuxracer vim])
-        end
-      }
+      it { is_expected.to eq(['extremetuxracer', 'vim']) }
     end
   end
 end