Merge pull request #799 from eimlav/string-fix

[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 bc51aee6472579756fd999fc5547f8338477c233..1bc1fda0483d7f40c9f4f1b7b26dd4beb5740266 100644 (file)
--- a/spec/unit/facter/apt_package_security_updates_spec.rb
+++ b/spec/unit/facter/apt_package_security_updates_spec.rb
@@ -2,59 +2,57 @@ require 'spec_helper'
 
 describe 'apt_package_security_updates fact' do
   subject { Facter.fact(:apt_package_security_updates).value }
+
   after(:each) { Facter.clear }
 
   describe 'when apt has no updates' do
-    before { 
+    before(:each) do
       Facter.fact(:apt_has_updates).stubs(:value).returns false
-    }
+    end
     it { is_expected.to be nil }
   end
 
   describe 'when apt has updates' do
-    before { 
+    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
-    }
+    end
 
     describe 'on Debian' do
       let(:apt_get_upgrade_output) do
-        "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"
+        "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" \
+          "Inst curl [7.52.1-5] (7.52.1-5+deb9u2 Debian-Security:9/stable [amd64]) []\n" \
+          "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('tzdata')
-        else
-          is_expected.to eq(['tzdata'])
-        end
-      }
+      if Facter.version < '2.0.0'
+        it { is_expected.to eq('curl') }
+      else
+        it { is_expected.to eq(['curl']) }
+      end
     end
 
     describe 'on Ubuntu' do
       let(:apt_get_upgrade_output) do
-        "Inst tzdata [2016f-0ubuntu0.16.04] (2016j-0ubuntu0.16.04 Ubuntu:16.04/xenial-security, Ubuntu:16.04/xenial-updates [all])\n"+
-        "Conf tzdata (2016j-0ubuntu0.16.04 Ubuntu:16.04/xenial-security, Ubuntu:16.04/xenial-updates [all])\n"+
-        "Inst curl [7.47.0-1ubuntu2] (7.47.0-1ubuntu2.2 Ubuntu:16.04/xenial-security [amd64]) []\n"+
-        "Conf curl (7.47.0-1ubuntu2.2 Ubuntu:16.04/xenial-security [amd64])\n"+
-        "Inst procps [2:3.3.10-4ubuntu2] (2:3.3.10-4ubuntu2.3 Ubuntu:16.04/xenial-updates [amd64])\n"+
-        "Conf procps (2:3.3.10-4ubuntu2.3 Ubuntu:16.04/xenial-updates [amd64])\n"
+        "Inst tzdata [2016f-0ubuntu0.16.04] (2016j-0ubuntu0.16.04 Ubuntu:16.04/xenial-security, Ubuntu:16.04/xenial-updates [all])\n" \
+          "Conf tzdata (2016j-0ubuntu0.16.04 Ubuntu:16.04/xenial-security, Ubuntu:16.04/xenial-updates [all])\n" \
+          "Inst curl [7.47.0-1ubuntu2] (7.47.0-1ubuntu2.2 Ubuntu:16.04/xenial-security [amd64]) []\n" \
+          "Conf curl (7.47.0-1ubuntu2.2 Ubuntu:16.04/xenial-security [amd64])\n" \
+          "Inst procps [2:3.3.10-4ubuntu2] (2:3.3.10-4ubuntu2.3 Ubuntu:16.04/xenial-updates [amd64])\n" \
+          "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(['tzdata', 'curl'])
-        end
-      }
+      if Facter.version < '2.0.0'
+        it { is_expected.to eq('tzdata,curl') }
+      else
+        it { is_expected.to eq(['tzdata', 'curl']) }
+      end
     end
-
   end
 end