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 #640 from ocadotechnology/dpkg_admin_lock
[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 5b9e23f2a198e08f1641160421f8a427ede42e32..dab9d16586ff342cbfba2a43ac4d302b7b8e1330 100644
(file)
--- a/
spec/defines/key_compat_spec.rb
+++ b/
spec/defines/key_compat_spec.rb
@@
-26,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
@@
-50,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
@@
-70,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
@@
-81,9
+78,9
@@
describe 'apt::key', :type => :define do
describe 'set a bunch of things!' do
let :params do {
:content => 'GPG key content',
describe 'set a bunch of things!' do
let :params do {
:content => 'GPG key content',
- :
key_
source => 'http://apt.puppetlabs.com/pubkey.gpg',
- :
key_
server => 'pgp.mit.edu',
- :
key_
options => 'debug',
+ :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
@@
-103,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({
@@
-116,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
@@
-129,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
@@
-144,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/)
@@
-153,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/)
@@
-162,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/)
@@
-171,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
@@
-181,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
@@
-191,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
@@
-201,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
@@
-211,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
@@
-220,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/)
@@
-237,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/)
@@
-249,13
+246,13
@@
describe 'apt::key', :type => :define do
:content => [],
} end
it 'fails' do
:content => [],
} end
it 'fails' do
- expect { subject.call }.to raise_error(/expects a
String value
/)
+ 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/)
@@
-264,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(/expects a
String value
/)
+ expect { subject.call }.to raise_error(/expects a/)
end
end
end
end