X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fclasses%2Fapt_update_spec.rb;h=3fb587eef75c5fe55acb3662fee6fb216a177807;hb=630580d1ce3c609865e31598198e7c55dda9a6ef;hp=9f91d04c1d535740aa13cd11aae6642d7a6222cc;hpb=cd413ee3930368785afc5af3c19347e74f7d99ac;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/classes/apt_update_spec.rb b/spec/classes/apt_update_spec.rb
index 9f91d04..3fb587e 100644
--- a/spec/classes/apt_update_spec.rb
+++ b/spec/classes/apt_update_spec.rb
@@ -1,20 +1,20 @@
 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' } },
+            os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
             lsbdistid: 'Debian',
             osfamily: 'Debian',
             apt_update_last_success: factval,
-            lsbdistcodename: 'wheezy',
+            lsbdistcodename: 'jessie',
             puppetversion: Puppet.version,
           }
         end
@@ -31,10 +31,10 @@ describe 'apt::update', type: :class do
     context 'when $::apt_update_last_success is nil' do
       let(:facts) do
         {
-          os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
+          os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
           lsbdistid: 'Debian',
           osfamily: 'Debian',
-          lsbdistcodename: 'wheezy',
+          lsbdistcodename: 'jessie',
           puppetversion: Puppet.version,
         }
       end
@@ -46,20 +46,20 @@ 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' } },
+            os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
             lsbdistid: 'Debian',
             osfamily: 'Debian',
             apt_update_last_success: factval,
-            lsbdistcodename: 'wheezy',
+            lsbdistcodename: 'jessie',
             puppetversion: Puppet.version,
           }
         end
@@ -74,10 +74,10 @@ describe 'apt::update', type: :class do
     context 'when $::apt_update_last_success is nil' do
       let(:facts) do
         {
-          os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
+          os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
           lsbdistid: 'Debian',
           osfamily: 'Debian',
-          lsbdistcodename: 'wheezy',
+          lsbdistcodename: 'jessie',
           puppetversion: Puppet.version,
         }
       end
@@ -89,17 +89,17 @@ describe 'apt::update', type: :class do
       end
     end
   end
-  %w[daily weekly].each do |update_frequency|
-    context "and apt::update['frequency'] has the value of #{update_frequency}" 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|
-        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' } },
+              os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
               lsbdistid: 'Debian',
               osfamily: 'Debian',
               apt_update_last_success: factval,
-              lsbdistcodename: 'wheezy',
+              lsbdistcodename: 'jessie',
               puppetversion: Puppet.version,
             }
           end
@@ -114,10 +114,10 @@ describe 'apt::update', type: :class do
       context 'when the $::apt_update_last_success fact has a recent value' do
         let(:facts) do
           {
-            os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
+            os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
             lsbdistid: 'Debian',
             osfamily: 'Debian',
-            lsbdistcodename: 'wheezy',
+            lsbdistcodename: 'jessie',
             apt_update_last_success: Time.now.to_i,
             puppetversion: Puppet.version,
           }
@@ -132,10 +132,10 @@ describe 'apt::update', type: :class do
       context 'when $::apt_update_last_success is nil' do
         let(:facts) do
           {
-            os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
+            os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
             lsbdistid: 'Debian',
             osfamily: 'Debian',
-            lsbdistcodename: 'wheezy',
+            lsbdistcodename: 'jessie',
             apt_update_last_success: nil,
             puppetversion: Puppet.version,
           }