X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fdefines%2Fkey_spec.rb;h=d1960630e89e95cc2242a4d4ce49453226e91ce4;hb=cc63cdf61a4fa48ee4717135f23857f839315b3b;hp=d668780eaa99fd11adade8a408794ebc737579b9;hpb=4ea96b8d7ec3dd0d6acabb1d7718f96b8def614c;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/defines/key_spec.rb b/spec/defines/key_spec.rb
index d668780..d196063 100644
--- a/spec/defines/key_spec.rb
+++ b/spec/defines/key_spec.rb
@@ -43,10 +43,10 @@ describe 'apt::key' 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
@@ -117,7 +117,7 @@ describe 'apt::key' do
       end
     end
 
-    context 'domain with dash' do
+    context 'when domain with dash' do
       let(:params) do
         {
           server: 'p-gp.m-it.edu',
@@ -130,7 +130,7 @@ describe 'apt::key' do
       end
     end
 
-    context 'url' do
+    context 'with url' do
       let :params do
         {
           server: 'hkp://pgp.mit.edu',
@@ -142,7 +142,7 @@ describe 'apt::key' do
                                                    server: 'hkp://pgp.mit.edu')
       end
     end
-    context 'url with port number' do
+    context 'when url with port number' do
       let :params do
         {
           server: 'hkp://pgp.mit.edu:80',
@@ -157,7 +157,7 @@ describe 'apt::key' do
   end
 
   describe 'validation' do
-    context 'domain begin with dash' do
+    context 'when domain begin with dash' do
       let(:params) do
         {
           server: '-pgp.mit.edu',
@@ -169,7 +169,7 @@ describe 'apt::key' do
       end
     end
 
-    context 'domain begin with dot' do
+    context 'when domain begin with dot' do
       let(:params) do
         {
           server: '.pgp.mit.edu',
@@ -181,7 +181,7 @@ describe 'apt::key' do
       end
     end
 
-    context 'domain end with dot' do
+    context 'when domain end with dot' do
       let(:params) do
         {
           server: 'pgp.mit.edu.',
@@ -192,7 +192,7 @@ describe 'apt::key' do
         is_expected .to raise_error(%r{expects a match})
       end
     end
-    context 'exceed character url' do
+    context 'when character url exceeded' do
       let :params do
         {
           server: 'hkp://pgpiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii.mit.edu',
@@ -203,7 +203,7 @@ describe 'apt::key' do
         is_expected.to raise_error(%r{expects a match})
       end
     end
-    context 'incorrect port number url' do
+    context 'with incorrect port number url' do
       let :params do
         {
           server: 'hkp://pgp.mit.edu:8008080',
@@ -214,7 +214,7 @@ describe 'apt::key' do
         is_expected.to raise_error(%r{expects a match})
       end
     end
-    context 'incorrect protocol for  url' do
+    context 'with incorrect protocol for url' do
       let :params do
         {
           server: 'abc://pgp.mit.edu:80',
@@ -225,7 +225,7 @@ describe 'apt::key' do
         is_expected.to raise_error(%r{expects a match})
       end
     end
-    context 'missing port number url' do
+    context 'with missing port number url' do
       let :params do
         {
           server: 'hkp://pgp.mit.edu:',
@@ -236,7 +236,7 @@ describe 'apt::key' do
         is_expected.to raise_error(%r{expects a match})
       end
     end
-    context 'url ending with a dot' do
+    context 'with url ending with a dot' do
       let :params do
         {
           server: 'hkp://pgp.mit.edu.',
@@ -247,7 +247,7 @@ describe 'apt::key' do
         is_expected.to raise_error(%r{expects a match})
       end
     end
-    context 'url begin with a dash' do
+    context 'when url begins with a dash' do
       let(:params) do
         {
           server: 'hkp://-pgp.mit.edu',
@@ -258,7 +258,7 @@ describe 'apt::key' do
         is_expected.to raise_error(%r{expects a match})
       end
     end
-    context 'invalid key' do
+    context 'with invalid key' do
       let :title do
         'Out of rum. Why? Why are we out of rum?'
       end
@@ -268,7 +268,7 @@ describe 'apt::key' do
       end
     end
 
-    context 'invalid source' do
+    context 'with invalid source' do
       let :params do
         {
           source: 'afp://puppetlabs.com/key.gpg',
@@ -280,7 +280,7 @@ describe 'apt::key' do
       end
     end
 
-    context 'invalid content' do
+    context 'with invalid content' do
       let :params do
         {
           content: [],
@@ -292,7 +292,7 @@ describe 'apt::key' do
       end
     end
 
-    context 'invalid server' do
+    context 'with invalid server' do
       let :params do
         {
           server: 'two bottles of rum',
@@ -304,7 +304,7 @@ describe 'apt::key' do
       end
     end
 
-    context 'invalid options' do
+    context 'with invalid options' do
       let :params do
         {
           options: {},
@@ -316,8 +316,8 @@ describe 'apt::key' do
       end
     end
 
-    context 'invalid ensure' do
-      %w[foo aabsent absenta apresent presenta].each do |param|
+    context 'with invalid ensure' do
+      ['foo', 'aabsent', 'absenta', 'apresent', 'presenta'].each do |param|
         let :params do
           {
             ensure: param,