X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fdefines%2Fkey_compat_spec.rb;h=47b03d4fe50533ea25fe4c9acfb59f98520c0def;hb=da1a6d0aef5e6b22c25bc0b60a2fd6be603e677c;hp=2d02bed531d79cff09a4a3e30d7366193e15ff51;hpb=2b536b6a200e8f4f7f7ae37ec091abd06ca4cb70;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/defines/key_compat_spec.rb b/spec/defines/key_compat_spec.rb
index 2d02bed..47b03d4 100644
--- a/spec/defines/key_compat_spec.rb
+++ b/spec/defines/key_compat_spec.rb
@@ -1,15 +1,33 @@
 require 'spec_helper'
 
+def contains_apt_key_example(title)
+  { id: title,
+    ensure: 'present',
+    source: 'http://apt.puppetlabs.com/pubkey.gpg',
+    server: 'pgp.mit.edu',
+    content: params[:content],
+    options: 'debug' }
+end
+
+def apt_key_example(title)
+  { id: title,
+    ensure: 'present',
+    source: nil,
+    server: 'keyserver.ubuntu.com',
+    content: nil,
+    keyserver_options: nil }
+end
+
 describe 'apt::key', type: :define do
+  GPG_KEY_ID = '6F6B15509CF8E59E6E469F327F438280EF8D349F'.freeze
+
   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',
-      puppetversion: Puppet.version,
     }
   end
-  GPG_KEY_ID = '6F6B15509CF8E59E6E469F327F438280EF8D349F'.freeze
 
   let :title do
     GPG_KEY_ID
@@ -86,19 +104,14 @@ describe 'apt::key', type: :define do
       end
 
       it 'contains the apt_key' do
-        is_expected.to contain_apt_key(title).with(id: title,
-                                                   ensure: 'present',
-                                                   source: 'http://apt.puppetlabs.com/pubkey.gpg',
-                                                   server: 'pgp.mit.edu',
-                                                   content: params[:content],
-                                                   options: 'debug')
+        is_expected.to contain_apt_key(title).with(contains_apt_key_example(title))
       end
       it 'contains the apt_key present anchor' do
         is_expected.to contain_anchor("apt_key #{title} present")
       end
     end
 
-    context 'domain with dash' do
+    context 'when domain has dash' do
       let(:params) do
         {
           server: 'p-gp.m-it.edu',
@@ -111,7 +124,7 @@ describe 'apt::key', type: :define do
       end
     end
 
-    context 'url' do
+    context 'with url' do
       let :params do
         {
           server: 'hkp://pgp.mit.edu',
@@ -123,7 +136,7 @@ describe 'apt::key', type: :define do
                                                    server: 'hkp://pgp.mit.edu')
       end
     end
-    context 'url with port number' do
+    context 'with url and port number' do
       let :params do
         {
           server: 'hkp://pgp.mit.edu:80',
@@ -138,7 +151,7 @@ describe 'apt::key', type: :define do
   end
 
   describe 'validation' do
-    context 'domain begin with dash' do
+    context 'when domain begins with a dash' do
       let(:params) do
         {
           server: '-pgp.mit.edu',
@@ -146,11 +159,11 @@ describe 'apt::key', type: :define do
       end
 
       it 'fails' do
-        expect { subject.call } .to raise_error(%r{does not match})
+        is_expected .to raise_error(%r{expects a match})
       end
     end
 
-    context 'domain begin with dot' do
+    context 'when domain begins with dot' do
       let(:params) do
         {
           server: '.pgp.mit.edu',
@@ -158,11 +171,11 @@ describe 'apt::key', type: :define do
       end
 
       it 'fails' do
-        expect { subject.call } .to raise_error(%r{does not match})
+        is_expected .to raise_error(%r{expects a match})
       end
     end
 
-    context 'domain end with dot' do
+    context 'when domain ends with dot' do
       let(:params) do
         {
           server: 'pgp.mit.edu.',
@@ -170,10 +183,10 @@ describe 'apt::key', type: :define do
       end
 
       it 'fails' do
-        expect { subject.call } .to raise_error(%r{does not match})
+        is_expected .to raise_error(%r{expects a match})
       end
     end
-    context 'exceed character url' do
+    context 'when url character limit is exceeded' do
       let :params do
         {
           server: 'hkp://pgpiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii.mit.edu',
@@ -181,10 +194,10 @@ describe 'apt::key', type: :define do
       end
 
       it 'fails' do
-        expect { subject.call }.to raise_error(%r{does not match})
+        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',
@@ -192,10 +205,10 @@ describe 'apt::key', type: :define do
       end
 
       it 'fails' do
-        expect { subject.call }.to raise_error(%r{does not match})
+        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',
@@ -203,10 +216,10 @@ describe 'apt::key', type: :define do
       end
 
       it 'fails' do
-        expect { subject.call }.to raise_error(%r{does not match})
+        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:',
@@ -214,10 +227,10 @@ describe 'apt::key', type: :define do
       end
 
       it 'fails' do
-        expect { subject.call }.to raise_error(%r{does not match})
+        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.',
@@ -225,10 +238,10 @@ describe 'apt::key', type: :define do
       end
 
       it 'fails' do
-        expect { subject.call }.to raise_error(%r{does not match})
+        is_expected.to raise_error(%r{expects a match})
       end
     end
-    context 'url begin with a dash' do
+    context 'with url begin with a dash' do
       let(:params) do
         {
           server: 'hkp://-pgp.mit.edu',
@@ -236,20 +249,20 @@ describe 'apt::key', type: :define do
       end
 
       it 'fails' do
-        expect { subject.call }.to raise_error(%r{does not match})
+        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
 
       it 'fails' do
-        expect { subject.call }.to raise_error(%r{does not match})
+        is_expected.to raise_error(%r{expects a match})
       end
     end
 
-    context 'invalid source' do
+    context 'with invalid source' do
       let :params do
         {
           source: 'afp://puppetlabs.com/key.gpg',
@@ -257,11 +270,11 @@ describe 'apt::key', type: :define do
       end
 
       it 'fails' do
-        expect { subject.call }.to raise_error(%r{does not match})
+        is_expected.to raise_error(%r{evaluating a Resource})
       end
     end
 
-    context 'invalid content' do
+    context 'with invalid content' do
       let :params do
         {
           content: [],
@@ -269,11 +282,11 @@ describe 'apt::key', type: :define do
       end
 
       it 'fails' do
-        expect { subject.call }.to raise_error(%r{expects a})
+        is_expected.to raise_error(%r{expects a})
       end
     end
 
-    context 'invalid server' do
+    context 'with invalid server' do
       let :params do
         {
           server: 'two bottles of rum',
@@ -281,11 +294,11 @@ describe 'apt::key', type: :define do
       end
 
       it 'fails' do
-        expect { subject.call }.to raise_error(%r{does not match})
+        is_expected.to raise_error(%r{expects a match})
       end
     end
 
-    context 'invalid keyserver_options' do
+    context 'with invalid keyserver_options' do
       let :params do
         {
           options: {},
@@ -293,11 +306,11 @@ describe 'apt::key', type: :define do
       end
 
       it 'fails' do
-        expect { subject.call }.to raise_error(%r{expects a})
+        is_expected.to raise_error(%r{expects a})
       end
     end
 
-    context 'invalid ensure' do
+    context 'with invalid ensure' do
       let :params do
         {
           ensure: 'foo',
@@ -305,48 +318,41 @@ describe 'apt::key', type: :define do
       end
 
       it 'fails' do
-        expect { subject.call }.to raise_error(%r{Enum\['absent', 'present'\]})
+        is_expected.to raise_error(%r{Enum\['absent', 'present', 'refreshed'\]})
+      end
+    end
+
+    describe 'duplication - two apt::key resources for same key, different titles' do
+      let :pre_condition do
+        "#{super()}\napt::key { 'duplicate': id => '#{title}', }"
+      end
+
+      it 'contains the duplicate apt::key resource' do
+        is_expected.to contain_apt__key('duplicate').with(id: title,
+                                                          ensure: 'present')
+      end
+
+      it 'contains the original apt::key resource' do
+        is_expected.to contain_apt__key(title).with(id: title,
+                                                    ensure: 'present')
+      end
+
+      it 'contains the native apt_key' do
+        is_expected.to contain_apt_key('duplicate').with(apt_key_example(title))
+      end
+
+      it 'does not contain the original apt_key' do
+        is_expected.not_to contain_apt_key(title)
       end
     end
 
-    describe 'duplication' do
-      context 'two apt::key resources for same key, different titles' do
-        let :pre_condition do
-          "#{super()}\napt::key { 'duplicate': id => '#{title}', }"
-        end
-
-        it 'contains the duplicate apt::key resource' do
-          is_expected.to contain_apt__key('duplicate').with(id: title,
-                                                            ensure: 'present')
-        end
-
-        it 'contains the original apt::key resource' do
-          is_expected.to contain_apt__key(title).with(id: title,
-                                                      ensure: 'present')
-        end
-
-        it 'contains the native apt_key' do
-          is_expected.to contain_apt_key('duplicate').with(id: title,
-                                                           ensure: 'present',
-                                                           source: nil,
-                                                           server: 'keyserver.ubuntu.com',
-                                                           content: nil,
-                                                           keyserver_options: nil)
-        end
-
-        it 'does not contain the original apt_key' do
-          is_expected.not_to contain_apt_key(title)
-        end
-      end
-
-      context 'two apt::key resources, different ensure' do
-        let :pre_condition do
-          "#{super()}\napt::key { 'duplicate': id => '#{title}', ensure => 'absent', }"
-        end
-
-        it 'informs the user of the impossibility' do
-          expect { subject.call }.to raise_error(%r{already ensured as absent})
-        end
+    describe 'duplication - two apt::key resources, different ensure' do
+      let :pre_condition do
+        "#{super()}\napt::key { 'duplicate': id => '#{title}', ensure => 'absent', }"
+      end
+
+      it 'informs the user of the impossibility' do
+        is_expected.to raise_error(%r{already ensured as absent})
       end
     end
   end