X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fdefines%2Fkey_spec.rb;h=ce433a3bf3d89b86f87ea9ae2ad5eb3088b32da9;hb=2b536b6a200e8f4f7f7ae37ec091abd06ca4cb70;hp=005c95e4698ab6c426186e4d23b39e8fc4a92cc3;hpb=23149c9a3a25b347cebcc70c5c501b02709ce69a;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/defines/key_spec.rb b/spec/defines/key_spec.rb
index 005c95e..ce433a3 100644
--- a/spec/defines/key_spec.rb
+++ b/spec/defines/key_spec.rb
@@ -1,8 +1,21 @@
 require 'spec_helper'
 
-describe 'apt::key', :type => :define do
-  let(:facts) { { :lsbdistid => 'Debian' } }
-  GPG_KEY_ID = '4BD6EC30'
+describe 'apt::key' do
+  let :pre_condition do
+    'class { "apt": }'
+  end
+
+  let(:facts) do
+    {
+      os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
+      lsbdistid: 'Debian',
+      osfamily: 'Debian',
+      lsbdistcodename: 'wheezy',
+      puppetversion: Puppet.version,
+    }
+  end
+
+  GPG_KEY_ID = '6F6B15509CF8E59E6E469F327F438280EF8D349F'.freeze
 
   let :title do
     GPG_KEY_ID
@@ -10,24 +23,16 @@ describe 'apt::key', :type => :define do
 
   describe 'normal operation' do
     describe 'default options' do
-      it 'contains the apt::key' do
-        should contain_apt__key(title).with({
-          :key    => title,
-          :ensure => 'present',
-        })
-      end
       it 'contains the apt_key' do
-        should contain_apt_key(title).with({
-          :id                => title,
-          :ensure            => 'present',
-          :source            => nil,
-          :server            => nil,
-          :content           => nil,
-          :keyserver_options => nil,
-        })
+        is_expected.to contain_apt_key(title).with(id: title,
+                                                   ensure: 'present',
+                                                   source: nil,
+                                                   server: 'keyserver.ubuntu.com',
+                                                   content: nil,
+                                                   options: nil)
       end
       it 'contains the apt_key present anchor' do
-        should contain_anchor("apt_key #{title} present")
+        is_expected.to contain_anchor("apt_key #{title} present")
       end
     end
 
@@ -36,377 +41,315 @@ describe 'apt::key', :type => :define do
         'puppetlabs'
       end
 
-      let :params do {
-        :key => GPG_KEY_ID,
-      } end
-
-      it 'contains the apt::key' do
-        should contain_apt__key(title).with({
-          :key    => GPG_KEY_ID,
-          :ensure => 'present',
-        })
+      let :params do
+        {
+          id: GPG_KEY_ID,
+        }
       end
+
       it 'contains the apt_key' do
-        should contain_apt_key(title).with({
-          :id                => GPG_KEY_ID,
-          :ensure            => 'present',
-          :source            => nil,
-          :server            => nil,
-          :content           => nil,
-          :keyserver_options => nil,
-        })
+        is_expected.to contain_apt_key(title).with(id: GPG_KEY_ID,
+                                                   ensure: 'present',
+                                                   source: nil,
+                                                   server: 'keyserver.ubuntu.com',
+                                                   content: nil,
+                                                   options: nil)
       end
       it 'contains the apt_key present anchor' do
-        should contain_anchor("apt_key #{GPG_KEY_ID} present")
+        is_expected.to contain_anchor("apt_key #{GPG_KEY_ID} present")
       end
     end
 
     describe 'ensure => absent' do
-      let :params do {
-        :ensure => 'absent',
-      } end
-
-      it 'contains the apt::key' do
-        should contain_apt__key(title).with({
-          :key          => title,
-          :ensure       => 'absent',
-        })
+      let :params do
+        {
+          ensure: 'absent',
+        }
       end
+
       it 'contains the apt_key' do
-        should contain_apt_key(title).with({
-          :id                => title,
-          :ensure            => 'absent',
-          :source            => nil,
-          :server            => nil,
-          :content           => nil,
-          :keyserver_options => nil,
-        })
+        is_expected.to contain_apt_key(title).with(id: title,
+                                                   ensure: 'absent',
+                                                   source: nil,
+                                                   server: 'keyserver.ubuntu.com',
+                                                   content: nil,
+                                                   keyserver: nil)
       end
       it 'contains the apt_key absent anchor' do
-        should contain_anchor("apt_key #{title} absent")
+        is_expected.to contain_anchor("apt_key #{title} absent")
       end
     end
 
-    describe 'key_content =>' do
-      let :params do {
-        :key_content => 'GPG key content',
-      } end
-
-      it 'contains the apt::key' do
-        should contain_apt__key(title).with({
-          :key         => title,
-          :ensure      => 'present',
-          :key_content => params[:key_content],
-        })
+    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
+
       it 'contains the apt_key' do
-        should contain_apt_key(title).with({
-          :id                => title,
-          :ensure            => 'present',
-          :source            => nil,
-          :server            => nil,
-          :content           => params[:key_content],
-          :keyserver_options => nil,
-        })
+        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')
       end
       it 'contains the apt_key present anchor' do
-        should contain_anchor("apt_key #{title} present")
+        is_expected.to contain_anchor("apt_key #{title} present")
       end
     end
 
-    describe 'key_source =>' do
-      let :params do {
-        :key_source => 'http://apt.puppetlabs.com/pubkey.gpg',
-      } end
-
-      it 'contains the apt::key' do
-        should contain_apt__key(title).with({
-          :key         => title,
-          :ensure      => 'present',
-          :key_source => params[:key_source],
-        })
+    context 'domain with dash' do
+      let(:params) do
+        {
+          server: 'p-gp.m-it.edu',
+        }
       end
+
       it 'contains the apt_key' do
-        should contain_apt_key(title).with({
-          :id                => title,
-          :ensure            => 'present',
-          :source            => params[:key_source],
-          :server            => nil,
-          :content           => nil,
-          :keyserver_options => nil,
-        })
-      end
-      it 'contains the apt_key present anchor' do
-        should contain_anchor("apt_key #{title} present")
+        is_expected.to contain_apt_key(title).with(id: title,
+                                                   server: 'p-gp.m-it.edu')
       end
     end
 
-    describe 'key_server =>' do
-    	context 'domain name' do
-        let :params do {
-          :key_server => 'pgp.mit.edu',
-      	} end
-
-      	it 'contains the apt::key' do
-          should contain_apt__key(title).with({
-            :key         => title,
-            :ensure      => 'present',
-            :key_server  => 'pgp.mit.edu',
-          })
-      	end
-      	it 'contains the apt_key' do
-          should contain_apt_key(title).with({
-            :id                => title,
-            :ensure            => 'present',
-            :source            => nil,
-            :server            => params[:key_server],
-            :content           => nil,
-            :keyserver_options => nil,
-          })
-      	end
-      	it 'contains the apt_key present anchor' do
-          should contain_anchor("apt_key #{title} present")
-      	end
-			end
-
-      context "domain with dash" do
-        let(:params) do{
-          :key_server => 'p-gp.m-it.edu',
-        } end
-        it "should contain apt::key" do
-          should contain_apt__key(title).with({
-            :key        => title,
-            :ensure     => 'present',
-            :key_server => 'p-gp.m-it.edu',
-          })
-        end
+    context 'url' do
+      let :params do
+        {
+          server: 'hkp://pgp.mit.edu',
+        }
       end
 
-      context "domain begin with dash" do
-        let(:params) do{
-          :key_server => '-pgp.mit.edu',
-        } end
-        it 'fails' do
-          expect { subject } .to raise_error(/does not match/)
-        end
+      it 'contains the apt_key' do
+        is_expected.to contain_apt_key(title).with(id: title,
+                                                   server: 'hkp://pgp.mit.edu')
+      end
+    end
+    context 'url with port number' do
+      let :params do
+        {
+          server: 'hkp://pgp.mit.edu:80',
+        }
       end
 
-      context "domain begin with dot" do
-        let(:params) do{
-          :key_server => '.pgp.mit.edu',
-        } end
-        it 'fails' do
-          expect { subject } .to raise_error(/does not match/)
-        end
+      it 'contains the apt_key' do
+        is_expected.to contain_apt_key(title).with(id: title,
+                                                   server: 'hkp://pgp.mit.edu:80')
       end
+    end
+  end
 
-      context "domain end with dot" do
-        let(:params) do{
-          :key_server => "pgp.mit.edu.",
-        } end
-        it 'fails' do
-          expect { subject } .to raise_error(/does not match/)
-        end
+  describe 'validation' do
+    context 'domain begin with dash' do
+      let(:params) do
+        {
+          server: '-pgp.mit.edu',
+        }
       end
 
-      context "url" do
-        let (:params) do{
-          :key_server => 'hkp://pgp.mit.edu',
-        } end
-        it "should contain apt::key" do
-         should contain_apt__key(title).with({
-           :key         => title,
-           :ensure      => 'present',
-           :key_server  => 'hkp://pgp.mit.edu',
-         })
-        end
+      it 'fails' do
+        expect { subject.call } .to raise_error(%r{does not match})
       end
-      context "url with port number" do
-        let (:params) do{
-          :key_server => 'hkp://pgp.mit.edu:80',
-        } end
-        it "should contain apt::key" do
-         should contain_apt__key(title).with({
-            :key        => title,
-            :ensure     => 'present',
-            :key_server => 'hkp://pgp.mit.edu:80',
-         })
-        end
+    end
+
+    context 'domain begin with dot' do
+      let(:params) do
+        {
+          server: '.pgp.mit.edu',
+        }
       end
 
-      context "incorrect port number url" do
-        let (:params) do{
-          :key_server => 'hkp://pgp.mit.edu:8008080'
-        } end
-        it 'fails' do
-          expect { subject }.to raise_error(/does not match/)
-        end
+      it 'fails' do
+        expect { subject.call } .to raise_error(%r{does not match})
       end
-      context "incorrect protocol for  url" do
-        let (:params) do{
-          :key_server => 'abc://pgp.mit.edu:80'
-        } end
-        it 'fails' do
-          expect { subject }.to raise_error(/does not match/)
-        end
+    end
+
+    context 'domain end with dot' do
+      let(:params) do
+        {
+          server: 'pgp.mit.edu.',
+        }
       end
-      context "missing port number url" do
-        let (:params) do{
-          :key_server => 'hkp://pgp.mit.edu:'
-        } end
-        it 'fails' do
-          expect { subject }.to raise_error(/does not match/)
-        end
+
+      it 'fails' do
+        expect { subject.call } .to raise_error(%r{does not match})
       end
-      context "url ending with a dot" do
-        let (:params) do{
-          :key_server => 'hkp://pgp.mit.edu.'
-        } end
-        it 'fails' do
-          expect { subject }.to raise_error(/does not match/)
-        end
+    end
+    context 'exceed character url' do
+      let :params do
+        {
+          server: 'hkp://pgpiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii.mit.edu',
+        }
       end
-      context "url begin with a dash" do
-        let(:params) do{
-          :key_server => "hkp://-pgp.mit.edu",
-        } end
-        it 'fails' do
-          expect { subject }.to raise_error(/does not match/)
-        end
+
+      it 'fails' do
+        expect { subject.call }.to raise_error(%r{does not match})
       end
-      context "url with dash" do
-        let(:params) do{
-          :key_server => 'hkp://p-gp.m-it.edu',
-        } end
-        it "should contain apt::key" do
-          should contain_apt__key(title).with({
-            :key        => title,
-            :ensure     => 'present',
-            :key_server => 'hkp://p-gp.m-it.edu',
-          })
-        end
+    end
+    context 'incorrect port number url' do
+      let :params do
+        {
+          server: 'hkp://pgp.mit.edu:8008080',
+        }
       end
-      context "exceed characher url" do
-        let (:params) do{
-          :key_server => 'hkp://pgpiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii.mit.edu'
-        } end
-        it 'fails' do
-          expect { subject }.to raise_error(/does not match/)
-        end
+
+      it 'fails' do
+        expect { subject.call }.to raise_error(%r{does not match})
+      end
+    end
+    context 'incorrect protocol for  url' do
+      let :params do
+        {
+          server: 'abc://pgp.mit.edu:80',
+        }
       end
-		end
 
-    describe 'key_options =>' do
-      let :params do {
-        :key_options => 'debug',
-      } end
+      it 'fails' do
+        expect { subject.call }.to raise_error(%r{does not match})
+      end
+    end
+    context 'missing port number url' do
+      let :params do
+        {
+          server: 'hkp://pgp.mit.edu:',
+        }
+      end
 
-      it 'contains the apt::key' do
-        should contain_apt__key(title).with({
-          :key          => title,
-          :ensure       => 'present',
-          :key_options  => 'debug',
-        })
+      it 'fails' do
+        expect { subject.call }.to raise_error(%r{does not match})
       end
-      it 'contains the apt_key' do
-        should contain_apt_key(title).with({
-          :id                => title,
-          :ensure            => 'present',
-          :source            => nil,
-          :server            => nil,
-          :content           => nil,
-          :keyserver_options => params[:key_options],
-        })
+    end
+    context 'url ending with a dot' do
+      let :params do
+        {
+          server: 'hkp://pgp.mit.edu.',
+        }
       end
-      it 'contains the apt_key present anchor' do
-        should contain_anchor("apt_key #{title} present")
+
+      it 'fails' do
+        expect { subject.call }.to raise_error(%r{does not match})
       end
     end
-  end
+    context 'url begin with a dash' do
+      let(:params) do
+        {
+          server: 'hkp://-pgp.mit.edu',
+        }
+      end
 
-  describe 'validation' do
+      it 'fails' do
+        expect { subject.call }.to raise_error(%r{does not match})
+      end
+    end
     context 'invalid key' do
       let :title do
         'Out of rum. Why? Why are we out of rum?'
       end
+
       it 'fails' do
-        expect { subject }.to raise_error(/does not match/)
+        expect { subject.call }.to raise_error(%r{does not match})
       end
     end
 
     context 'invalid source' do
-      let :params do {
-        :key_source => 'afp://puppetlabs.com/key.gpg',
-      } end
+      let :params do
+        {
+          source: 'afp://puppetlabs.com/key.gpg',
+        }
+      end
+
       it 'fails' do
-        expect { subject }.to raise_error(/does not match/)
+        expect { subject.call }.to raise_error(%r{does not match})
       end
     end
 
     context 'invalid content' do
-      let :params do {
-        :key_content => [],
-      } end
+      let :params do
+        {
+          content: [],
+        }
+      end
+
       it 'fails' do
-        expect { subject }.to raise_error(/is not a string/)
+        expect { subject.call }.to raise_error(%r{expects a})
       end
     end
 
     context 'invalid server' do
-      let :params do {
-        :key_server => 'two bottles of rum',
-      } end
+      let :params do
+        {
+          server: 'two bottles of rum',
+        }
+      end
+
       it 'fails' do
-        expect { subject }.to raise_error(/does not match/)
+        expect { subject.call }.to raise_error(%r{does not match})
       end
     end
 
-    context 'invalid keyserver_options' do
-      let :params do {
-        :key_options => {},
-      } end
+    context 'invalid options' do
+      let :params do
+        {
+          options: {},
+        }
+      end
+
       it 'fails' do
-        expect { subject }.to raise_error(/is not a string/)
+        expect { subject.call }.to raise_error(%r{expects a})
       end
     end
-  end
 
-  describe 'duplication' do
-    context 'two apt::key resources for same key, different titles' do
-      let :pre_condition do
-        "apt::key { 'duplicate': key => #{title}, }"
-      end
-
-      it 'contains two apt::key resources' do
-        should contain_apt__key('duplicate').with({
-          :key    => title,
-          :ensure => 'present',
-        })
-        should contain_apt__key(title).with({
-          :key    => title,
-          :ensure => 'present',
-        })
-      end
-
-      it 'contains only a single apt_key' do
-        should contain_apt_key('duplicate').with({
-          :id                => title,
-          :ensure            => 'present',
-          :source            => nil,
-          :server            => nil,
-          :content           => nil,
-          :keyserver_options => nil,
-        })
-        should_not contain_apt_key(title)
+    context 'invalid ensure' do
+      %w[foo aabsent absenta apresent presenta].each do |param|
+        let :params do
+          {
+            ensure: param,
+          }
+        end
+
+        it 'fails' do
+          expect { subject.call }.to raise_error(%r{for Enum\['absent', 'present'\], got})
+        end
       end
     end
 
-    context 'two apt::key resources, different ensure' do
-      let :pre_condition do
-        "apt::key { 'duplicate': key => #{title}, ensure => 'absent', }"
+    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
+
+        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 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
       end
-      it 'informs the user of the impossibility' do
-        expect { subject }.to raise_error(/already ensured as absent/)
+
+      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(%r{already ensured as absent})
+        end
       end
     end
   end