Merge pull request #706 from tphoney/rubocopification

[puppet-modules/puppetlabs-apt.git] / spec / acceptance / apt_spec.rb

diff --git a/spec/acceptance/apt_spec.rb b/spec/acceptance/apt_spec.rb
index 52415f5afaecb4e0cfe28fbe2af689c3ffad3f77..e8950d1fbda992144e63ac653eb817148ad649f6 100644 (file)
--- a/spec/acceptance/apt_spec.rb
+++ b/spec/acceptance/apt_spec.rb
@@ -2,10 +2,9 @@ require 'spec_helper_acceptance'
 
 MAX_TIMEOUT_RETRY              = 3
 TIMEOUT_RETRY_WAIT             = 5
-TIMEOUT_ERROR_MATCHER    = /no valid OpenPGP data found/
+TIMEOUT_ERROR_MATCHER = %r{no valid OpenPGP data found}
 
 describe 'apt class' do
-
   context 'reset' do
     it 'fixes the sources.list' do
       shell('cp /etc/apt/sources.list /tmp')
@@ -13,7 +12,7 @@ describe 'apt class' do
   end
 
   context 'all the things' do
-    it 'should work with no errors' do
+    it 'works with no errors' do
       pp = <<-EOS
       if $::lsbdistcodename == 'lucid' {
         $sources = undef
@@ -33,8 +32,8 @@ describe 'apt class' do
       class { 'apt':
         update => {
           'frequency' => 'always',
-          'timeout'   => '400',
-          'tries'     => '3',
+          'timeout'   => 400,
+          'tries'     => 3,
         },
         purge => {
           'sources.list'   => true,
@@ -46,14 +45,14 @@ describe 'apt class' do
       }
       EOS
 
-      #Apply the manifest (Retry if timeout error is received from key pool)
+      # Apply the manifest (Retry if timeout error is received from key pool)
       retry_on_error_matching(MAX_TIMEOUT_RETRY, TIMEOUT_RETRY_WAIT, TIMEOUT_ERROR_MATCHER) do
-        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, catch_failures: true)
       end
 
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
-    it 'should still work' do
+    it 'stills work' do
       shell('apt-get update')
       shell('apt-get -y --force-yes upgrade')
     end
@@ -64,5 +63,4 @@ describe 'apt class' do
       shell('cp /tmp/sources.list /etc/apt')
     end
   end
-
 end