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=f414503ac3f341d6a5fcaef7b4ba1121b39030df;hpb=4513a5845c2a18aece7e17ad82612ec4da3efaa0;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/defines/key_compat_spec.rb b/spec/defines/key_compat_spec.rb
index f414503..613c7fd 100644
--- a/spec/defines/key_compat_spec.rb
+++ b/spec/defines/key_compat_spec.rb
@@ -21,8 +21,7 @@ def apt_key_example(title)
 end
 
 describe 'apt::key', type: :define do
-  GPG_KEY_ID = '6F6B15509CF8E59E6E469F327F438280EF8D349F'
-
+  let(:key_id) { '6F6B15509CF8E59E6E469F327F438280EF8D349F' }
   let(:facts) do
     {
       os: {
@@ -30,18 +29,18 @@ describe 'apt::key', type: :define do
         name: 'Debian',
         release: {
           major: '9',
-          full: '9.0',
+          full: '9.0'
         },
         distro: {
           codename: 'stretch',
-          id: 'Debian',
-        },
-      },
+          id: 'Debian'
+        }
+      }
     }
   end
 
   let :title do
-    GPG_KEY_ID
+    key_id
   end
 
   let :pre_condition do
@@ -70,12 +69,12 @@ describe 'apt::key', type: :define do
 
       let :params do
         {
-          id: GPG_KEY_ID,
+          id: key_id
         }
       end
 
       it 'contains the apt_key' do
-        expect(subject).to contain_apt_key(title).with(id: GPG_KEY_ID,
+        expect(subject).to contain_apt_key(title).with(id: key_id,
                                                        ensure: 'present',
                                                        source: nil,
                                                        server: 'keyserver.ubuntu.com',
@@ -83,14 +82,14 @@ describe 'apt::key', type: :define do
       end
 
       it 'contains the apt_key present anchor' do
-        expect(subject).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
 
@@ -113,7 +112,7 @@ 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
 
@@ -129,7 +128,7 @@ describe 'apt::key', type: :define do
     context 'when domain has dash' do
       let(:params) do
         {
-          server: 'p-gp.m-it.edu',
+          server: 'p-gp.m-it.edu'
         }
       end
 
@@ -142,7 +141,7 @@ describe 'apt::key', type: :define do
     context 'with url' do
       let :params do
         {
-          server: 'hkp://pgp.mit.edu',
+          server: 'hkp://pgp.mit.edu'
         }
       end
 
@@ -155,7 +154,7 @@ describe 'apt::key', type: :define do
     context 'with url and port number' do
       let :params do
         {
-          server: 'hkp://pgp.mit.edu:80',
+          server: 'hkp://pgp.mit.edu:80'
         }
       end
 
@@ -170,7 +169,7 @@ describe 'apt::key', type: :define do
     context 'when domain begins with a dash' do
       let(:params) do
         {
-          server: '-pgp.mit.edu',
+          server: '-pgp.mit.edu'
         }
       end
 
@@ -182,7 +181,7 @@ describe 'apt::key', type: :define do
     context 'when domain begins with dot' do
       let(:params) do
         {
-          server: '.pgp.mit.edu',
+          server: '.pgp.mit.edu'
         }
       end
 
@@ -194,7 +193,7 @@ describe 'apt::key', type: :define do
     context 'when domain ends with dot' do
       let(:params) do
         {
-          server: 'pgp.mit.edu.',
+          server: 'pgp.mit.edu.'
         }
       end
 
@@ -206,7 +205,7 @@ describe 'apt::key', type: :define do
     context 'when url character limit is exceeded' do
       let :params do
         {
-          server: 'hkp://pgpiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii.mit.edu',
+          server: 'hkp://pgpiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii.mit.edu'
         }
       end
 
@@ -218,7 +217,7 @@ describe 'apt::key', type: :define do
     context 'with incorrect port number url' do
       let :params do
         {
-          server: 'hkp://pgp.mit.edu:8008080',
+          server: 'hkp://pgp.mit.edu:8008080'
         }
       end
 
@@ -230,7 +229,7 @@ describe 'apt::key', type: :define do
     context 'with incorrect protocol for url' do
       let :params do
         {
-          server: 'abc://pgp.mit.edu:80',
+          server: 'abc://pgp.mit.edu:80'
         }
       end
 
@@ -242,7 +241,7 @@ describe 'apt::key', type: :define do
     context 'with missing port number url' do
       let :params do
         {
-          server: 'hkp://pgp.mit.edu:',
+          server: 'hkp://pgp.mit.edu:'
         }
       end
 
@@ -254,7 +253,7 @@ describe 'apt::key', type: :define do
     context 'with url ending with a dot' do
       let :params do
         {
-          server: 'hkp://pgp.mit.edu.',
+          server: 'hkp://pgp.mit.edu.'
         }
       end
 
@@ -266,7 +265,7 @@ describe 'apt::key', type: :define do
     context 'with url begin with a dash' do
       let(:params) do
         {
-          server: 'hkp://-pgp.mit.edu',
+          server: 'hkp://-pgp.mit.edu'
         }
       end
 
@@ -288,7 +287,7 @@ describe 'apt::key', type: :define do
     context 'with invalid source' do
       let :params do
         {
-          source: 'afp://puppetlabs.com/key.gpg',
+          source: 'afp://puppetlabs.com/key.gpg'
         }
       end
 
@@ -300,7 +299,7 @@ describe 'apt::key', type: :define do
     context 'with invalid content' do
       let :params do
         {
-          content: [],
+          content: []
         }
       end
 
@@ -312,7 +311,7 @@ describe 'apt::key', type: :define do
     context 'with invalid server' do
       let :params do
         {
-          server: 'two bottles of rum',
+          server: 'two bottles of rum'
         }
       end
 
@@ -324,7 +323,7 @@ describe 'apt::key', type: :define do
     context 'with invalid keyserver_options' do
       let :params do
         {
-          options: {},
+          options: {}
         }
       end
 
@@ -336,7 +335,7 @@ describe 'apt::key', type: :define do
     context 'with invalid ensure' do
       let :params do
         {
-          ensure: 'foo',
+          ensure: 'foo'
         }
       end