X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fclasses%2Fapt_update_spec.rb;h=c46771a52d8b226a22101dd005e3c98a96970c96;hb=82e0c388929245a69559261a8aec4ac37edcc567;hp=5a73eb45ec65736dabe20c47113142a560f7edc2;hpb=ec7f4e29c6f57ee9250c65432ee0051282367760;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/classes/apt_update_spec.rb b/spec/classes/apt_update_spec.rb
index 5a73eb4..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
@@ -33,7 +33,7 @@ describe 'apt::update', type: :class do
 
         it 'triggers an apt-get update run' do
           # set the apt_update exec's refreshonly attribute to false
-          is_expected.to contain_exec('apt_update').with('refreshonly' => false)
+          expect(subject).to contain_exec('apt_update').with('refreshonly' => false)
         end
       end
     end
@@ -45,24 +45,24 @@ 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' },}" }
 
       it 'triggers an apt-get update run' do
         # set the apt_update exec\'s refreshonly attribute to false
-        is_expected.to contain_exec('apt_update').with('refreshonly' => false)
+        expect(subject).to contain_exec('apt_update').with('refreshonly' => false)
       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
@@ -89,7 +89,7 @@ describe 'apt::update', type: :class do
 
       it 'skips an apt-get update run' do
         # set the apt_update exec's refreshonly attribute to false
-        is_expected.to contain_exec('apt_update').with('refreshonly' => true)
+        expect(subject).to contain_exec('apt_update').with('refreshonly' => true)
       end
     end
   end
@@ -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,21 +108,21 @@ 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' },}" }
 
         it 'does not trigger an apt-get update run' do
           # don't change the apt_update exec's refreshonly attribute. (it should be true)
-          is_expected.to contain_exec('apt_update').with('refreshonly' => true)
+          expect(subject).to contain_exec('apt_update').with('refreshonly' => true)
         end
       end
     end
@@ -134,27 +134,28 @@ 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' },}" }
 
       it 'does not trigger an apt-get update run' do
         # don't change the apt_update exec's refreshonly attribute. (it should be true)
-        is_expected.to contain_exec('apt_update').with('refreshonly' => true)
+        expect(subject).to contain_exec('apt_update').with('refreshonly' => true)
       end
     end
   end
 
   ['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,21 +164,21 @@ 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}',} }" }
 
           it 'triggers an apt-get update run' do
             # set the apt_update exec\'s refreshonly attribute to false
-            is_expected.to contain_exec('apt_update').with('refreshonly' => false)
+            expect(subject).to contain_exec('apt_update').with('refreshonly' => false)
           end
         end
       end
@@ -189,21 +190,21 @@ 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}',} }" }
 
         it 'does not trigger an apt-get update run' do
           # don't change the apt_update exec\'s refreshonly attribute. (it should be true)
-          is_expected.to contain_exec('apt_update').with('refreshonly' => true)
+          expect(subject).to contain_exec('apt_update').with('refreshonly' => true)
         end
       end
 
@@ -215,21 +216,21 @@ 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}',} }" }
 
         it 'triggers an apt-get update run' do
           # set the apt_update exec\'s refreshonly attribute to false
-          is_expected.to contain_exec('apt_update').with('refreshonly' => false)
+          expect(subject).to contain_exec('apt_update').with('refreshonly' => false)
         end
       end
     end