Merge pull request #735 from pmcmaw/rubocop

[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 e8950d1fbda992144e63ac653eb817148ad649f6..550574867b5deef5053118d77ed05ed60e5b6f50 100644 (file)
--- a/spec/acceptance/apt_spec.rb
+++ b/spec/acceptance/apt_spec.rb
@@ -4,16 +4,7 @@ MAX_TIMEOUT_RETRY              = 3
 TIMEOUT_RETRY_WAIT             = 5
 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')
-    end
-  end
-
-  context 'all the things' do
-    it 'works with no errors' do
-      pp = <<-EOS
+everything_everything_pp = <<-MANIFEST
       if $::lsbdistcodename == 'lucid' {
         $sources = undef
       } else {
@@ -43,14 +34,23 @@ describe 'apt class' do
         },
         sources => $sources,
       }
-      EOS
+  MANIFEST
 
+describe 'apt class' do
+  context 'with reset' do
+    it 'fixes the sources.list' do
+      shell('cp /etc/apt/sources.list /tmp')
+    end
+  end
+
+  context 'with all the things' do
+    it 'works with no errors' do
       # 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(everything_everything_pp, catch_failures: true)
       end
 
-      apply_manifest(pp, catch_failures: true)
+      apply_manifest(everything_everything_pp, catch_failures: true)
     end
     it 'stills work' do
       shell('apt-get update')
@@ -58,7 +58,7 @@ describe 'apt class' do
     end
   end
 
-  context 'reset' do
+  context 'with reset' do
     it 'fixes the sources.list' do
       shell('cp /tmp/sources.list /etc/apt')
     end