X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fclasses%2Fapt_update_spec.rb;h=675bbd2c9bd5eca9adee11484421891488a62df1;hb=1db434a418d8375321a08a12964d42cec91c8bfa;hp=e178d40f508ec7fe385e43514ae1ee1c8be70bda;hpb=c7013c082891edae1543c6244f1f0719dae98d13;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/classes/apt_update_spec.rb b/spec/classes/apt_update_spec.rb
index e178d40..675bbd2 100644
--- a/spec/classes/apt_update_spec.rb
+++ b/spec/classes/apt_update_spec.rb
@@ -1,14 +1,13 @@
-#!/usr/bin/env rspec
 require 'spec_helper'
 
 describe 'apt::update', type: :class do
-  context "and apt::update['frequency']='always'" do
+  context "when apt::update['frequency']='always'" 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,
     }.each_pair do |desc, factval|
-      context "and $::apt_update_last_success indicates #{desc}" do
+      context "when $::apt_update_last_success indicates #{desc}" do
         let(:facts) do
           {
             os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
@@ -19,7 +18,7 @@ describe 'apt::update', type: :class do
             puppetversion: Puppet.version,
           }
         end
-        let (:pre_condition) do
+        let(:pre_condition) do
           "class{'::apt': update => {'frequency' => 'always' },}"
         end
 
@@ -39,7 +38,7 @@ describe 'apt::update', type: :class do
           puppetversion: Puppet.version,
         }
       end
-      let (:pre_condition) { "class{ '::apt': update => {'frequency' => 'always' },}" }
+      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
@@ -47,13 +46,13 @@ describe 'apt::update', type: :class do
       end
     end
   end
-  context "and apt::update['frequency']='reluctantly'" do
+  context "when apt::update['frequency']='reluctantly'" 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,
     }.each_pair do |desc, factval|
-      context "and $::apt_update_last_success indicates #{desc}" do
+      context "when $::apt_update_last_success indicates #{desc}" do
         let(:facts) do
           {
             os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
@@ -64,7 +63,7 @@ describe 'apt::update', type: :class do
             puppetversion: Puppet.version,
           }
         end
-        let (:pre_condition) { "class{ '::apt': update => {'frequency' => 'reluctantly' },}" }
+        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)
@@ -82,7 +81,7 @@ describe 'apt::update', type: :class do
           puppetversion: Puppet.version,
         }
       end
-      let (:pre_condition) { "class{ '::apt': update => {'frequency' => 'reluctantly' },}" }
+      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)
@@ -91,9 +90,9 @@ describe 'apt::update', type: :class do
     end
   end
   %w[daily weekly].each do |update_frequency|
-    context "and apt::update['frequency'] has the value of #{update_frequency}" do
+    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|
-        context "and $::apt_update_last_success indicates #{desc}" do
+        context "when $::apt_update_last_success indicates #{desc}" do
           let(:facts) do
             {
               os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
@@ -104,7 +103,7 @@ describe 'apt::update', type: :class do
               puppetversion: Puppet.version,
             }
           end
-          let (:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" }
+          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
@@ -123,7 +122,7 @@ describe 'apt::update', type: :class do
             puppetversion: Puppet.version,
           }
         end
-        let (:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" }
+        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)
@@ -141,7 +140,7 @@ describe 'apt::update', type: :class do
             puppetversion: Puppet.version,
           }
         end
-        let (:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" }
+        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