X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fclasses%2Fapt_update_spec.rb;h=c46771a52d8b226a22101dd005e3c98a96970c96;hb=refs%2Fheads%2Frelease-prep;hp=61335fda20296b2f70c374b686e0ff5478a08eeb;hpb=4513a5845c2a18aece7e17ad82612ec4da3efaa0;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/classes/apt_update_spec.rb b/spec/classes/apt_update_spec.rb
index 61335fd..c46771a 100644
--- a/spec/classes/apt_update_spec.rb
+++ b/spec/classes/apt_update_spec.rb
@@ -7,7 +7,7 @@ describe 'apt::update', type: :class do
     {
       'a recent run' => Time.now.to_i,
       'we are due for a run' => 1_406_660_561,
-      'the update-success-stamp file does not exist' => -1,
+      'the update-success-stamp file does not exist' => -1
     }.each_pair do |desc, factval|
       context "when $apt_update_last_success indicates #{desc}" do
         let(:facts) do
@@ -17,14 +17,14 @@ describe 'apt::update', type: :class do
               name: 'Debian',
               release: {
                 major: '9',
-                full: '9.0',
+                full: '9.0'
               },
               distro: {
                 codename: 'stretch',
-                id: 'Debian',
-              },
+                id: 'Debian'
+              }
             },
-            apt_update_last_success: factval,
+            apt_update_last_success: factval
           }
         end
         let(:pre_condition) do
@@ -45,13 +45,13 @@ describe 'apt::update', type: :class do
             name: 'Debian',
             release: {
               major: '9',
-              full: '9.0',
+              full: '9.0'
             },
             distro: {
               codename: 'stretch',
-              id: 'Debian',
-            },
-          },
+              id: 'Debian'
+            }
+          }
         }
       end
       let(:pre_condition) { "class{ '::apt': update => {'frequency' => 'always' },}" }
@@ -62,7 +62,7 @@ describe 'apt::update', type: :class do
       end
     end
 
-    context 'and Exec[apt_update] refreshonly is overridden to true and has recent run' do
+    context 'when Exec[apt_update] refreshonly is overridden to true and has recent run' do
       let(:facts) do
         {
           os: {
@@ -70,14 +70,14 @@ describe 'apt::update', type: :class do
             name: 'Debian',
             release: {
               major: '9',
-              full: '9.0',
+              full: '9.0'
             },
             distro: {
               codename: 'stretch',
-              id: 'Debian',
-            },
+              id: 'Debian'
+            }
           },
-          apt_update_last_success: Time.now.to_i,
+          apt_update_last_success: Time.now.to_i
         }
       end
       let(:pre_condition) do
@@ -98,7 +98,7 @@ describe 'apt::update', type: :class do
     {
       'a recent run' => Time.now.to_i,
       'we are due for a run' => 1_406_660_561,
-      'the update-success-stamp file does not exist' => -1,
+      'the update-success-stamp file does not exist' => -1
     }.each_pair do |desc, factval|
       context "when $apt_update_last_success indicates #{desc}" do
         let(:facts) do
@@ -108,14 +108,14 @@ describe 'apt::update', type: :class do
               name: 'Debian',
               release: {
                 major: '9',
-                full: '9.0',
+                full: '9.0'
               },
               distro: {
                 codename: 'stretch',
-                id: 'Debian',
-              },
+                id: 'Debian'
+              }
             },
-            apt_update_last_success: factval,
+            apt_update_last_success: factval
           }
         end
         let(:pre_condition) { "class{ '::apt': update => {'frequency' => 'reluctantly' },}" }
@@ -134,13 +134,13 @@ describe 'apt::update', type: :class do
             name: 'Debian',
             release: {
               major: '9',
-              full: '9.0',
+              full: '9.0'
             },
             distro: {
               codename: 'stretch',
-              id: 'Debian',
-            },
-          },
+              id: 'Debian'
+            }
+          }
         }
       end
       let(:pre_condition) { "class{ '::apt': update => {'frequency' => 'reluctantly' },}" }
@@ -154,7 +154,8 @@ describe 'apt::update', type: :class do
 
   ['daily', 'weekly'].each do |update_frequency|
     context "when apt::update['frequency'] has the value of #{update_frequency}" do
-      { 'we are due for a run' => 1_406_660_561, 'the update-success-stamp file does not exist' => -1 }.each_pair do |desc, factval|
+      pair = { 'we are due for a run' => 1_406_660_561, 'the update-success-stamp file does not exist' => -1 }
+      pair.each_pair do |desc, factval|
         context "when $apt_update_last_success indicates #{desc}" do
           let(:facts) do
             {
@@ -163,14 +164,14 @@ describe 'apt::update', type: :class do
                 name: 'Debian',
                 release: {
                   major: '9',
-                  full: '9.0',
+                  full: '9.0'
                 },
                 distro: {
                   codename: 'stretch',
-                  id: 'Debian',
-                },
+                  id: 'Debian'
+                }
               },
-              apt_update_last_success: factval,
+              apt_update_last_success: factval
             }
           end
           let(:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" }
@@ -189,14 +190,14 @@ describe 'apt::update', type: :class do
               name: 'Debian',
               release: {
                 major: '9',
-                full: '9.0',
+                full: '9.0'
               },
               distro: {
                 codename: 'stretch',
-                id: 'Debian',
-              },
+                id: 'Debian'
+              }
             },
-            apt_update_last_success: Time.now.to_i,
+            apt_update_last_success: Time.now.to_i
           }
         end
         let(:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" }
@@ -215,14 +216,14 @@ describe 'apt::update', type: :class do
               name: 'Debian',
               release: {
                 major: '9',
-                full: '9.0',
+                full: '9.0'
               },
               distro: {
                 codename: 'stretch',
-                id: 'Debian',
-              },
+                id: 'Debian'
+              }
             },
-            apt_update_last_success: nil,
+            apt_update_last_success: nil
           }
         end
         let(:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" }