X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fdefines%2Fkey_compat_spec.rb;h=613c7fd99942eaca89baf50fc318b67e3cc2c685;hb=refs%2Fheads%2Frelease-prep;hp=2d02bed531d79cff09a4a3e30d7366193e15ff51;hpb=f610bedc5f33db5fdee2ad49eeda95268ab0b9a5;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/defines/key_compat_spec.rb b/spec/defines/key_compat_spec.rb
index 2d02bed..613c7fd 100644
--- a/spec/defines/key_compat_spec.rb
+++ b/spec/defines/key_compat_spec.rb
@@ -1,18 +1,46 @@
+# frozen_string_literal: true
+
 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
+  let(:key_id) { '6F6B15509CF8E59E6E469F327F438280EF8D349F' }
   let(:facts) do
     {
-      os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
-      lsbdistid: 'Debian',
-      osfamily: 'Debian',
-      puppetversion: Puppet.version,
+      os: {
+        family: 'Debian',
+        name: 'Debian',
+        release: {
+          major: '9',
+          full: '9.0'
+        },
+        distro: {
+          codename: 'stretch',
+          id: 'Debian'
+        }
+      }
     }
   end
-  GPG_KEY_ID = '6F6B15509CF8E59E6E469F327F438280EF8D349F'.freeze
 
   let :title do
-    GPG_KEY_ID
+    key_id
   end
 
   let :pre_condition do
@@ -22,14 +50,15 @@ describe 'apt::key', type: :define do
   describe 'normal operation' do
     describe 'default options' do
       it {
-        is_expected.to contain_apt_key(title).with(id: title,
-                                                   ensure: 'present',
-                                                   source: nil,
-                                                   server: 'keyserver.ubuntu.com',
-                                                   content: nil)
+        expect(subject).to contain_apt_key(title).with(id: title,
+                                                       ensure: 'present',
+                                                       source: nil,
+                                                       server: 'keyserver.ubuntu.com',
+                                                       content: nil)
       }
+
       it 'contains the apt_key present anchor' do
-        is_expected.to contain_anchor("apt_key #{title} present")
+        expect(subject).to contain_anchor("apt_key #{title} present")
       end
     end
 
@@ -40,38 +69,40 @@ describe 'apt::key', type: :define do
 
       let :params do
         {
-          id: GPG_KEY_ID,
+          id: key_id
         }
       end
 
       it 'contains the apt_key' do
-        is_expected.to contain_apt_key(title).with(id: GPG_KEY_ID,
-                                                   ensure: 'present',
-                                                   source: nil,
-                                                   server: 'keyserver.ubuntu.com',
-                                                   content: nil)
+        expect(subject).to contain_apt_key(title).with(id: key_id,
+                                                       ensure: 'present',
+                                                       source: nil,
+                                                       server: 'keyserver.ubuntu.com',
+                                                       content: nil)
       end
+
       it 'contains the apt_key present anchor' do
-        is_expected.to contain_anchor("apt_key #{GPG_KEY_ID} present")
+        expect(subject).to contain_anchor("apt_key #{key_id} present")
       end
     end
 
     describe 'ensure => absent' do
       let :params do
         {
-          ensure: 'absent',
+          ensure: 'absent'
         }
       end
 
       it 'contains the apt_key' do
-        is_expected.to contain_apt_key(title).with(id: title,
-                                                   ensure: 'absent',
-                                                   source: nil,
-                                                   server: 'keyserver.ubuntu.com',
-                                                   content: nil)
+        expect(subject).to contain_apt_key(title).with(id: title,
+                                                       ensure: 'absent',
+                                                       source: nil,
+                                                       server: 'keyserver.ubuntu.com',
+                                                       content: nil)
       end
+
       it 'contains the apt_key absent anchor' do
-        is_expected.to contain_anchor("apt_key #{title} absent")
+        expect(subject).to contain_anchor("apt_key #{title} absent")
       end
     end
 
@@ -81,272 +112,269 @@ describe 'apt::key', type: :define do
           content: 'GPG key content',
           source: 'http://apt.puppetlabs.com/pubkey.gpg',
           server: 'pgp.mit.edu',
-          options: 'debug',
+          options: 'debug'
         }
       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')
+        expect(subject).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")
+        expect(subject).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',
+          server: 'p-gp.m-it.edu'
         }
       end
 
       it 'contains the apt_key' do
-        is_expected.to contain_apt_key(title).with(id: title,
-                                                   server: 'p-gp.m-it.edu')
+        expect(subject).to contain_apt_key(title).with(id: title,
+                                                       server: 'p-gp.m-it.edu')
       end
     end
 
-    context 'url' do
+    context 'with url' do
       let :params do
         {
-          server: 'hkp://pgp.mit.edu',
+          server: 'hkp://pgp.mit.edu'
         }
       end
 
       it 'contains the apt_key' do
-        is_expected.to contain_apt_key(title).with(id: title,
-                                                   server: 'hkp://pgp.mit.edu')
+        expect(subject).to contain_apt_key(title).with(id: title,
+                                                       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',
+          server: 'hkp://pgp.mit.edu:80'
         }
       end
 
       it 'contains the apt_key' do
-        is_expected.to contain_apt_key(title).with(id: title,
-                                                   server: 'hkp://pgp.mit.edu:80')
+        expect(subject).to contain_apt_key(title).with(id: title,
+                                                       server: 'hkp://pgp.mit.edu:80')
       end
     end
   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',
+          server: '-pgp.mit.edu'
         }
       end
 
       it 'fails' do
-        expect { subject.call } .to raise_error(%r{does not match})
+        expect(subject).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',
+          server: '.pgp.mit.edu'
         }
       end
 
       it 'fails' do
-        expect { subject.call } .to raise_error(%r{does not match})
+        expect(subject).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.',
+          server: 'pgp.mit.edu.'
         }
       end
 
       it 'fails' do
-        expect { subject.call } .to raise_error(%r{does not match})
+        expect(subject).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',
+          server: 'hkp://pgpiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii.mit.edu'
         }
       end
 
       it 'fails' do
-        expect { subject.call }.to raise_error(%r{does not match})
+        expect(subject).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',
+          server: 'hkp://pgp.mit.edu:8008080'
         }
       end
 
       it 'fails' do
-        expect { subject.call }.to raise_error(%r{does not match})
+        expect(subject).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',
+          server: 'abc://pgp.mit.edu:80'
         }
       end
 
       it 'fails' do
-        expect { subject.call }.to raise_error(%r{does not match})
+        expect(subject).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:',
+          server: 'hkp://pgp.mit.edu:'
         }
       end
 
       it 'fails' do
-        expect { subject.call }.to raise_error(%r{does not match})
+        expect(subject).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.',
+          server: 'hkp://pgp.mit.edu.'
         }
       end
 
       it 'fails' do
-        expect { subject.call }.to raise_error(%r{does not match})
+        expect(subject).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',
+          server: 'hkp://-pgp.mit.edu'
         }
       end
 
       it 'fails' do
-        expect { subject.call }.to raise_error(%r{does not match})
+        expect(subject).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})
+        expect(subject).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',
+          source: 'afp://puppetlabs.com/key.gpg'
         }
       end
 
       it 'fails' do
-        expect { subject.call }.to raise_error(%r{does not match})
+        expect(subject).to raise_error(%r{evaluating a Resource})
       end
     end
 
-    context 'invalid content' do
+    context 'with invalid content' do
       let :params do
         {
-          content: [],
+          content: []
         }
       end
 
       it 'fails' do
-        expect { subject.call }.to raise_error(%r{expects a})
+        expect(subject).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',
+          server: 'two bottles of rum'
         }
       end
 
       it 'fails' do
-        expect { subject.call }.to raise_error(%r{does not match})
+        expect(subject).to raise_error(%r{expects a match})
       end
     end
 
-    context 'invalid keyserver_options' do
+    context 'with invalid keyserver_options' do
       let :params do
         {
-          options: {},
+          options: {}
         }
       end
 
       it 'fails' do
-        expect { subject.call }.to raise_error(%r{expects a})
+        expect(subject).to raise_error(%r{expects a})
       end
     end
 
-    context 'invalid ensure' do
+    context 'with invalid ensure' do
       let :params do
         {
-          ensure: 'foo',
+          ensure: 'foo'
         }
       end
 
       it 'fails' do
-        expect { subject.call }.to raise_error(%r{Enum\['absent', 'present'\]})
+        expect(subject).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
+        expect(subject).to contain_apt__key('duplicate').with(id: title,
+                                                              ensure: 'present')
+      end
+
+      it 'contains the original apt::key resource' do
+        expect(subject).to contain_apt__key(title).with(id: title,
+                                                        ensure: 'present')
+      end
+
+      it 'contains the native apt_key' do
+        expect(subject).to contain_apt_key('duplicate').with(apt_key_example(title))
+      end
+
+      it 'does not contain the original apt_key' do
+        expect(subject).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
+        expect(subject).to raise_error(%r{already ensured as absent})
       end
     end
   end