Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge pull request #681 from HelenCampbell/emptystringing
[puppet-modules/puppetlabs-apt.git]
/
spec
/
defines
/
key_compat_spec.rb
diff --git
a/spec/defines/key_compat_spec.rb
b/spec/defines/key_compat_spec.rb
index 2faee9e5345da1be8b3a4dc3356abca6c1bd3b54..dab9d16586ff342cbfba2a43ac4d302b7b8e1330 100644
(file)
--- a/
spec/defines/key_compat_spec.rb
+++ b/
spec/defines/key_compat_spec.rb
@@
-2,10
+2,12
@@
require 'spec_helper'
describe 'apt::key', :type => :define do
let(:facts) { {
describe 'apt::key', :type => :define do
let(:facts) { {
- :lsbdistid => 'Debian',
- :osfamily => 'Debian',
+ :os => { :family => 'Debian', :name => 'Debian', :release => { :major => '7', :full => '7.0' }},
+ :lsbdistid => 'Debian',
+ :osfamily => 'Debian',
+ :puppetversion => Puppet.version,
} }
} }
- GPG_KEY_ID = '
47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30
'
+ GPG_KEY_ID = '
6F6B15509CF8E59E6E469F327F438280EF8D349F
'
let :title do
GPG_KEY_ID
let :title do
GPG_KEY_ID
@@
-24,7
+26,6
@@
describe 'apt::key', :type => :define do
:source => nil,
:server => 'keyserver.ubuntu.com',
:content => nil,
:source => nil,
:server => 'keyserver.ubuntu.com',
:content => nil,
- :keyserver_options => nil,
})
}
it 'contains the apt_key present anchor' do
})
}
it 'contains the apt_key present anchor' do
@@
-38,7
+39,7
@@
describe 'apt::key', :type => :define do
end
let :params do {
end
let :params do {
- :
key
=> GPG_KEY_ID,
+ :
id
=> GPG_KEY_ID,
} end
it 'contains the apt_key' do
} end
it 'contains the apt_key' do
@@
-48,7
+49,6
@@
describe 'apt::key', :type => :define do
:source => nil,
:server => 'keyserver.ubuntu.com',
:content => nil,
:source => nil,
:server => 'keyserver.ubuntu.com',
:content => nil,
- :keyserver_options => nil,
})
end
it 'contains the apt_key present anchor' do
})
end
it 'contains the apt_key present anchor' do
@@
-68,7
+68,6
@@
describe 'apt::key', :type => :define do
:source => nil,
:server => 'keyserver.ubuntu.com',
:content => nil,
:source => nil,
:server => 'keyserver.ubuntu.com',
:content => nil,
- :keyserver_options => nil,
})
end
it 'contains the apt_key absent anchor' do
})
end
it 'contains the apt_key absent anchor' do
@@
-78,10
+77,10
@@
describe 'apt::key', :type => :define do
describe 'set a bunch of things!' do
let :params do {
describe 'set a bunch of things!' do
let :params do {
- :
key_
content => 'GPG key content',
- :
key_
source => 'http://apt.puppetlabs.com/pubkey.gpg',
- :
key_
server => 'pgp.mit.edu',
- :
key_
options => 'debug',
+ :content => 'GPG key content',
+ :source => 'http://apt.puppetlabs.com/pubkey.gpg',
+ :server => 'pgp.mit.edu',
+ :options => 'debug',
} end
it 'contains the apt_key' do
} end
it 'contains the apt_key' do
@@
-90,7
+89,7
@@
describe 'apt::key', :type => :define do
:ensure => 'present',
:source => 'http://apt.puppetlabs.com/pubkey.gpg',
:server => 'pgp.mit.edu',
:ensure => 'present',
:source => 'http://apt.puppetlabs.com/pubkey.gpg',
:server => 'pgp.mit.edu',
- :content => params[:
key_
content],
+ :content => params[:content],
:options => 'debug',
})
end
:options => 'debug',
})
end
@@
-101,7
+100,7
@@
describe 'apt::key', :type => :define do
context "domain with dash" do
let(:params) do{
context "domain with dash" do
let(:params) do{
- :
key_
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({
} end
it 'contains the apt_key' do
is_expected.to contain_apt_key(title).with({
@@
-114,7
+113,7
@@
describe 'apt::key', :type => :define do
context "url" do
let :params do
{
context "url" do
let :params do
{
- :
key_
server => 'hkp://pgp.mit.edu',
+ :server => 'hkp://pgp.mit.edu',
}
end
it 'contains the apt_key' do
}
end
it 'contains the apt_key' do
@@
-127,7
+126,7
@@
describe 'apt::key', :type => :define do
context "url with port number" do
let :params do
{
context "url with port number" do
let :params do
{
- :
key_
server => 'hkp://pgp.mit.edu:80',
+ :server => 'hkp://pgp.mit.edu:80',
}
end
it 'contains the apt_key' do
}
end
it 'contains the apt_key' do
@@
-142,7
+141,7
@@
describe 'apt::key', :type => :define do
describe 'validation' do
context "domain begin with dash" do
let(:params) do{
describe 'validation' do
context "domain begin with dash" do
let(:params) do{
- :
key_
server => '-pgp.mit.edu',
+ :server => '-pgp.mit.edu',
} end
it 'fails' do
expect { subject.call } .to raise_error(/does not match/)
} end
it 'fails' do
expect { subject.call } .to raise_error(/does not match/)
@@
-151,7
+150,7
@@
describe 'apt::key', :type => :define do
context "domain begin with dot" do
let(:params) do{
context "domain begin with dot" do
let(:params) do{
- :
key_
server => '.pgp.mit.edu',
+ :server => '.pgp.mit.edu',
} end
it 'fails' do
expect { subject.call } .to raise_error(/does not match/)
} end
it 'fails' do
expect { subject.call } .to raise_error(/does not match/)
@@
-160,7
+159,7
@@
describe 'apt::key', :type => :define do
context "domain end with dot" do
let(:params) do{
context "domain end with dot" do
let(:params) do{
- :
key_
server => "pgp.mit.edu.",
+ :server => "pgp.mit.edu.",
} end
it 'fails' do
expect { subject.call } .to raise_error(/does not match/)
} end
it 'fails' do
expect { subject.call } .to raise_error(/does not match/)
@@
-169,7
+168,7
@@
describe 'apt::key', :type => :define do
context "exceed character url" do
let :params do
{
context "exceed character url" do
let :params do
{
- :
key_
server => 'hkp://pgpiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii.mit.edu'
+ :server => 'hkp://pgpiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii.mit.edu'
}
end
it 'fails' do
}
end
it 'fails' do
@@
-179,7
+178,7
@@
describe 'apt::key', :type => :define do
context "incorrect port number url" do
let :params do
{
context "incorrect port number url" do
let :params do
{
- :
key_
server => 'hkp://pgp.mit.edu:8008080'
+ :server => 'hkp://pgp.mit.edu:8008080'
}
end
it 'fails' do
}
end
it 'fails' do
@@
-189,7
+188,7
@@
describe 'apt::key', :type => :define do
context "incorrect protocol for url" do
let :params do
{
context "incorrect protocol for url" do
let :params do
{
- :
key_
server => 'abc://pgp.mit.edu:80'
+ :server => 'abc://pgp.mit.edu:80'
}
end
it 'fails' do
}
end
it 'fails' do
@@
-199,7
+198,7
@@
describe 'apt::key', :type => :define do
context "missing port number url" do
let :params do
{
context "missing port number url" do
let :params do
{
- :
key_
server => 'hkp://pgp.mit.edu:'
+ :server => 'hkp://pgp.mit.edu:'
}
end
it 'fails' do
}
end
it 'fails' do
@@
-209,7
+208,7
@@
describe 'apt::key', :type => :define do
context "url ending with a dot" do
let :params do
{
context "url ending with a dot" do
let :params do
{
- :
key_
server => 'hkp://pgp.mit.edu.'
+ :server => 'hkp://pgp.mit.edu.'
}
end
it 'fails' do
}
end
it 'fails' do
@@
-218,7
+217,7
@@
describe 'apt::key', :type => :define do
end
context "url begin with a dash" do
let(:params) do{
end
context "url begin with a dash" do
let(:params) do{
- :
key_
server => "hkp://-pgp.mit.edu",
+ :server => "hkp://-pgp.mit.edu",
} end
it 'fails' do
expect { subject.call }.to raise_error(/does not match/)
} end
it 'fails' do
expect { subject.call }.to raise_error(/does not match/)
@@
-235,7
+234,7
@@
describe 'apt::key', :type => :define do
context 'invalid source' do
let :params do {
context 'invalid source' do
let :params do {
- :
key_
source => 'afp://puppetlabs.com/key.gpg',
+ :source => 'afp://puppetlabs.com/key.gpg',
} end
it 'fails' do
expect { subject.call }.to raise_error(/does not match/)
} end
it 'fails' do
expect { subject.call }.to raise_error(/does not match/)
@@
-244,16
+243,16
@@
describe 'apt::key', :type => :define do
context 'invalid content' do
let :params do {
context 'invalid content' do
let :params do {
- :
key_
content => [],
+ :content => [],
} end
it 'fails' do
} end
it 'fails' do
- expect { subject.call }.to raise_error(/
is not a string
/)
+ expect { subject.call }.to raise_error(/
expects a
/)
end
end
context 'invalid server' do
let :params do {
end
end
context 'invalid server' do
let :params do {
- :
key_
server => 'two bottles of rum',
+ :server => 'two bottles of rum',
} end
it 'fails' do
expect { subject.call }.to raise_error(/does not match/)
} end
it 'fails' do
expect { subject.call }.to raise_error(/does not match/)
@@
-262,10
+261,10
@@
describe 'apt::key', :type => :define do
context 'invalid keyserver_options' do
let :params do {
context 'invalid keyserver_options' do
let :params do {
- :
key_
options => {},
+ :options => {},
} end
it 'fails' do
} end
it 'fails' do
- expect { subject.call }.to raise_error(/
is not a string
/)
+ expect { subject.call }.to raise_error(/
expects a
/)
end
end
end
end
@@
-276,19
+275,19
@@
describe 'apt::key', :type => :define do
}
end
it 'fails' do
}
end
it 'fails' do
- expect { subject.call }.to raise_error(/
does not match
/)
+ expect { subject.call }.to raise_error(/
Enum\['absent', 'present'\]
/)
end
end
describe 'duplication' do
context 'two apt::key resources for same key, different titles' do
let :pre_condition do
end
end
describe 'duplication' do
context 'two apt::key resources for same key, different titles' do
let :pre_condition do
- "#{super()}\napt::key { 'duplicate':
key
=> '#{title}', }"
+ "#{super()}\napt::key { 'duplicate':
id
=> '#{title}', }"
end
it 'contains the duplicate apt::key resource' do
is_expected.to contain_apt__key('duplicate').with({
end
it 'contains the duplicate apt::key resource' do
is_expected.to contain_apt__key('duplicate').with({
- :
key
=> title,
+ :
id
=> title,
:ensure => 'present',
})
end
:ensure => 'present',
})
end
@@
-318,7
+317,7
@@
describe 'apt::key', :type => :define do
context 'two apt::key resources, different ensure' do
let :pre_condition do
context 'two apt::key resources, different ensure' do
let :pre_condition do
- "#{super()}\napt::key { 'duplicate':
key
=> '#{title}', ensure => 'absent', }"
+ "#{super()}\napt::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
it 'informs the user of the impossibility' do
expect { subject.call }.to raise_error(/already ensured as absent/)