X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fdefines%2Fkey_spec.rb;h=6a5a89ffd04ade005baa1946e9146b38c12e7a63;hb=ecb9bfe4edcb4c285c8c86e39ff047641b814b8e;hp=13616d97acc14f73c8d6dd84c5fb6b2402fb39a6;hpb=4815fa1f5482814e1d1a7e1626277aa35e3fc67c;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/defines/key_spec.rb b/spec/defines/key_spec.rb
index 13616d9..6a5a89f 100644
--- a/spec/defines/key_spec.rb
+++ b/spec/defines/key_spec.rb
@@ -1,19 +1,55 @@
 require 'spec_helper'
 
+GPG_KEY_ID = '6F6B15509CF8E59E6E469F327F438280EF8D349F'.freeze
+
+title_key_example = { id: GPG_KEY_ID,
+                      ensure: 'present',
+                      source: nil,
+                      server: 'keyserver.ubuntu.com',
+                      content: nil,
+                      options: nil }
+
+def default_apt_key_example(title)
+  { id: title,
+    ensure: 'present',
+    source: nil,
+    server: 'keyserver.ubuntu.com',
+    content: nil,
+    options: nil }
+end
+
+def bunch_things_apt_key_example(title, params)
+  { id: title,
+    ensure: 'present',
+    source: 'http://apt.puppetlabs.com/pubkey.gpg',
+    server: 'pgp.mit.edu',
+    content: params[:content],
+    options: 'debug' }
+end
+
+def absent_apt_key(title)
+  { id: title,
+    ensure: 'absent',
+    source: nil,
+    server: 'keyserver.ubuntu.com',
+    content: nil,
+    keyserver: nil }
+end
+
 describe 'apt::key' do
   let :pre_condition do
     'class { "apt": }'
   end
 
-  let(:facts) { {
-    :os => { :family => 'Debian', :name => 'Debian', :release => { :major => '7', :full => '7.0' }},
-    :lsbdistid       => 'Debian',
-    :osfamily        => 'Debian',
-    :lsbdistcodename => 'wheezy',
-    :puppetversion   => Puppet.version,
-  } }
-
-  GPG_KEY_ID = '6F6B15509CF8E59E6E469F327F438280EF8D349F'
+  let(:facts) do
+    {
+      os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
+      lsbdistid: 'Debian',
+      osfamily: 'Debian',
+      lsbdistcodename: 'wheezy',
+      puppetversion: Puppet.version,
+    }
+  end
 
   let :title do
     GPG_KEY_ID
@@ -22,14 +58,7 @@ describe 'apt::key' do
   describe 'normal operation' do
     describe 'default options' do
       it 'contains the apt_key' do
-        is_expected.to contain_apt_key(title).with({
-          :id      => title,
-          :ensure  => 'present',
-          :source  => nil,
-          :server  => 'keyserver.ubuntu.com',
-          :content => nil,
-          :options => nil,
-        })
+        is_expected.to contain_apt_key(title).with(default_apt_key_example(title))
       end
       it 'contains the apt_key present anchor' do
         is_expected.to contain_anchor("apt_key #{title} present")
@@ -41,19 +70,14 @@ describe 'apt::key' do
         'puppetlabs'
       end
 
-      let :params do {
-        :id => GPG_KEY_ID,
-      } end
+      let :params do
+        {
+          id: GPG_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,
-          :options => nil,
-        })
+        is_expected.to contain_apt_key(title).with(title_key_example)
       end
       it 'contains the apt_key present anchor' do
         is_expected.to contain_anchor("apt_key #{GPG_KEY_ID} present")
@@ -61,19 +85,14 @@ describe 'apt::key' do
     end
 
     describe 'ensure => absent' do
-      let :params do {
-        :ensure => 'absent',
-      } end
+      let :params do
+        {
+          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,
-          :keyserver => nil,
-        })
+        is_expected.to contain_apt_key(title).with(absent_apt_key(title))
       end
       it 'contains the apt_key absent anchor' do
         is_expected.to contain_anchor("apt_key #{title} absent")
@@ -81,250 +100,267 @@ describe 'apt::key' do
     end
 
     describe 'set a bunch of things!' do
-      let :params do {
-        :content => 'GPG key content',
-        :source  => 'http://apt.puppetlabs.com/pubkey.gpg',
-        :server  => 'pgp.mit.edu',
-        :options => 'debug',
-      } end
+      let :params do
+        {
+          content: 'GPG key content',
+          source: 'http://apt.puppetlabs.com/pubkey.gpg',
+          server: 'pgp.mit.edu',
+          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',
-        })
+        is_expected.to contain_apt_key(title).with(bunch_things_apt_key_example(title, params))
       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
-      let(:params) do{
-        :server => 'p-gp.m-it.edu',
-      } end
+    context 'when domain with dash' do
+      let(:params) do
+        {
+          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',
-        })
+        is_expected.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',
-        })
+        is_expected.to contain_apt_key(title).with(id: title,
+                                                   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',
+          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',
-        })
+        is_expected.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
-      let(:params) do{
-        :server => '-pgp.mit.edu',
-      } end
+    context 'when domain begin with dash' do
+      let(:params) do
+        {
+          server: '-pgp.mit.edu',
+        }
+      end
+
       it 'fails' do
-        expect { subject.call } .to raise_error(/does not match/)
+        is_expected .to raise_error(%r{expects a match})
       end
     end
 
-    context "domain begin with dot" do
-      let(:params) do{
-        :server => '.pgp.mit.edu',
-      } end
+    context 'when domain begin with dot' do
+      let(:params) do
+        {
+          server: '.pgp.mit.edu',
+        }
+      end
+
       it 'fails' do
-        expect { subject.call } .to raise_error(/does not match/)
+        is_expected .to raise_error(%r{expects a match})
       end
     end
 
-    context "domain end with dot" do
-      let(:params) do{
-        :server => "pgp.mit.edu.",
-      } end
+    context 'when domain end with dot' do
+      let(:params) do
+        {
+          server: 'pgp.mit.edu.',
+        }
+      end
+
       it 'fails' do
-        expect { subject.call } .to raise_error(/does not match/)
+        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'
+          server: 'hkp://pgpiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii.mit.edu',
         }
       end
+
       it 'fails' do
-        expect { subject.call }.to raise_error(/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'
+          server: 'hkp://pgp.mit.edu:8008080',
         }
       end
+
       it 'fails' do
-        expect { subject.call }.to raise_error(/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'
+          server: 'abc://pgp.mit.edu:80',
         }
       end
+
       it 'fails' do
-        expect { subject.call }.to raise_error(/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:'
+          server: 'hkp://pgp.mit.edu:',
         }
       end
+
       it 'fails' do
-        expect { subject.call }.to raise_error(/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.'
+          server: 'hkp://pgp.mit.edu.',
         }
       end
+
       it 'fails' do
-        expect { subject.call }.to raise_error(/does not match/)
+        is_expected.to raise_error(%r{expects a match})
       end
     end
-    context "url begin with a dash" do
-      let(:params) do{
-        :server => "hkp://-pgp.mit.edu",
-      } end
+    context 'when url begins with a dash' do
+      let(:params) do
+        {
+          server: 'hkp://-pgp.mit.edu',
+        }
+      end
+
       it 'fails' do
-        expect { subject.call }.to raise_error(/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(/does not match/)
+        is_expected.to raise_error(%r{expects a match})
       end
     end
 
-    context 'invalid source' do
-      let :params do {
-        :source => 'afp://puppetlabs.com/key.gpg',
-      } end
+    context 'with invalid source' do
+      let :params do
+        {
+          source: 'afp://puppetlabs.com/key.gpg',
+        }
+      end
+
       it 'fails' do
-        expect { subject.call }.to raise_error(/does not match/)
+        is_expected.to raise_error(%r{expects a match})
       end
     end
 
-    context 'invalid content' do
-      let :params do {
-        :content => [],
-      } end
+    context 'with invalid content' do
+      let :params do
+        {
+          content: [],
+        }
+      end
+
       it 'fails' do
-        expect { subject.call }.to raise_error(/expects a value of type Undef or String/)
+        is_expected.to raise_error(%r{expects a})
       end
     end
 
-    context 'invalid server' do
-      let :params do {
-        :server => 'two bottles of rum',
-      } end
+    context 'with invalid server' do
+      let :params do
+        {
+          server: 'two bottles of rum',
+        }
+      end
+
       it 'fails' do
-        expect { subject.call }.to raise_error(/does not match/)
+        is_expected.to raise_error(%r{expects a match})
       end
     end
 
-    context 'invalid options' do
-      let :params do {
-        :options => {},
-      } end
+    context 'with invalid options' do
+      let :params do
+        {
+          options: {},
+        }
+      end
+
       it 'fails' do
-        expect { subject.call }.to raise_error(/expects a value of type Undef or String/)
+        is_expected.to raise_error(%r{expects a})
       end
     end
 
-    context 'invalid ensure' do
-      %w(foo aabsent absenta apresent presenta).each do |param|
+    context 'with invalid ensure' do
+      %w[foo aabsent absenta apresent presenta].each do |param|
         let :params do
           {
-            :ensure => param,
+            ensure: param,
           }
-          end
+        end
+
         it 'fails' do
-          expect { subject.call }.to raise_error(/for Enum\['absent', 'present'\], got/)
+          is_expected.to raise_error(%r{for Enum\['absent', 'present'\], got})
         end
       end
     end
 
-    describe 'duplication' do
-      context 'two apt::key resources for same key, different titles' do
-        let :pre_condition do
-          "class { 'apt': }
-          apt::key { 'duplicate': id => '#{title}', }"
-        end
+    describe 'duplication - two apt::key resources for same key, different titles' do
+      let :pre_condition do
+        "class { 'apt': }
+        apt::key { 'duplicate': id => '#{title}', }"
+      end
 
-        it 'contains two apt::key resources' do
-          is_expected.to contain_apt__key('duplicate').with({
-            :id     => title,
-            :ensure => 'present',
-          })
-          is_expected.to contain_apt__key(title).with({
-            :id     => title,
-            :ensure => 'present',
-          })
-        end
+      it 'contains two apt::key resource - duplicate' do
+        is_expected.to contain_apt__key('duplicate').with(id: title,
+                                                          ensure: 'present')
+      end
+      it 'contains two apt::key resource - title' do
+        is_expected.to contain_apt__key(title).with(id: title,
+                                                    ensure: 'present')
+      end
 
-        it 'contains only a single apt_key' do
-          is_expected.to contain_apt_key('duplicate').with({
-            :id      => title,
-            :ensure  => 'present',
-            :source  => nil,
-            :server  => 'keyserver.ubuntu.com',
-            :content => nil,
-            :options => nil,
-          })
-          is_expected.not_to contain_apt_key(title)
-        end
+      it 'contains only a single apt_key - duplicate' do
+        is_expected.to contain_apt_key('duplicate').with(default_apt_key_example(title))
+      end
+      it 'contains only a single apt_key - no title' do
+        is_expected.not_to contain_apt_key(title)
       end
+    end
 
-      context 'two apt::key resources, different ensure' do
-        let :pre_condition do
-          "class { 'apt': }
-          apt::key { 'duplicate': id => '#{title}', ensure => 'absent', }"
-        end
-        it 'informs the user of the impossibility' do
-          expect { subject.call }.to raise_error(/already ensured as absent/)
-        end
+    describe 'duplication - two apt::key resources, different ensure' do
+      let :pre_condition do
+        "class { 'apt': }
+        apt::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