Merge pull request #867 from eimlav/pdksync_modules-9482

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

diff --git a/spec/unit/facter/apt_package_security_updates_spec.rb b/spec/unit/facter/apt_package_security_updates_spec.rb
index b6a713f18697f46a1899da4602be8556aca4d838..53b91bcaa06943ca7433019c06c1690527602142 100644 (file)
--- a/spec/unit/facter/apt_package_security_updates_spec.rb
+++ b/spec/unit/facter/apt_package_security_updates_spec.rb
@@ -7,18 +7,18 @@ describe 'apt_package_security_updates fact' do
 
   describe 'when apt has no updates' do
     before(:each) do
-      Facter.fact(:apt_has_updates).stubs(:value).returns false
+      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(: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 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(apt_get_upgrade_output)
     end
 
     describe 'on Debian' do
@@ -31,13 +31,7 @@ describe 'apt_package_security_updates fact' do
           "Conf curl (7.52.1-5+deb9u2 Debian-Security:9/stable [amd64])\n" \
       end
 
-      it {
-        if Facter.version < '2.0.0'
-          is_expected.to eq('curl')
-        else
-          is_expected.to eq(['curl'])
-        end
-      }
+      it { is_expected.to eq(['curl']) }
     end
 
     describe 'on Ubuntu' do
@@ -50,13 +44,7 @@ describe 'apt_package_security_updates fact' do
           "Conf procps (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('tzdata,curl')
-        else
-          is_expected.to eq(%w[tzdata curl])
-        end
-      }
+      it { is_expected.to eq(['tzdata', 'curl']) }
     end
   end
 end