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 #609 from hfm/fix-regexp
[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 872bcadcd66560240e0e8c3a18e4d7255ab81dce..2faee9e5345da1be8b3a4dc3356abca6c1bd3b54 100644
(file)
--- a/
spec/defines/key_compat_spec.rb
+++ b/
spec/defines/key_compat_spec.rb
@@
-1,27
+1,34
@@
require 'spec_helper'
describe 'apt::key', :type => :define do
require 'spec_helper'
describe 'apt::key', :type => :define do
- let(:facts) { { :lsbdistid => 'Debian' } }
+ let(:facts) { {
+ :lsbdistid => 'Debian',
+ :osfamily => 'Debian',
+ } }
GPG_KEY_ID = '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30'
let :title do
GPG_KEY_ID
end
GPG_KEY_ID = '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30'
let :title do
GPG_KEY_ID
end
+ let :pre_condition do
+ 'include apt'
+ end
+
describe 'normal operation' do
describe 'default options' do
describe 'normal operation' do
describe 'default options' do
- it
'contains the apt_key' do
-
should
contain_apt_key(title).with({
+ it
{
+
is_expected.to
contain_apt_key(title).with({
:id => title,
:ensure => 'present',
:source => nil,
:id => title,
:ensure => 'present',
:source => nil,
- :server =>
nil
,
+ :server =>
'keyserver.ubuntu.com'
,
:content => nil,
:keyserver_options => nil,
})
:content => nil,
:keyserver_options => nil,
})
- end
+ }
it 'contains the apt_key present anchor' do
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
end
end
@@
-35,17
+42,17
@@
describe 'apt::key', :type => :define do
} end
it 'contains the apt_key' do
} end
it 'contains the apt_key' do
-
should
contain_apt_key(title).with({
+
is_expected.to
contain_apt_key(title).with({
:id => GPG_KEY_ID,
:ensure => 'present',
:source => nil,
:id => GPG_KEY_ID,
:ensure => 'present',
:source => nil,
- :server =>
nil
,
+ :server =>
'keyserver.ubuntu.com'
,
:content => nil,
:keyserver_options => nil,
})
end
it 'contains the apt_key present anchor' do
:content => nil,
:keyserver_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
end
end
@@
-55,17
+62,17
@@
describe 'apt::key', :type => :define do
} end
it 'contains the apt_key' do
} end
it 'contains the apt_key' do
-
should
contain_apt_key(title).with({
+
is_expected.to
contain_apt_key(title).with({
:id => title,
:ensure => 'absent',
:source => nil,
:id => title,
:ensure => 'absent',
:source => nil,
- :server =>
nil
,
+ :server =>
'keyserver.ubuntu.com'
,
:content => nil,
:keyserver_options => nil,
})
end
it 'contains the apt_key absent anchor' do
:content => nil,
:keyserver_options => 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
end
end
@@
-78,7
+85,7
@@
describe 'apt::key', :type => :define do
} end
it 'contains the apt_key' do
} end
it 'contains the apt_key' do
-
should
contain_apt_key(title).with({
+
is_expected.to
contain_apt_key(title).with({
:id => title,
:ensure => 'present',
:source => 'http://apt.puppetlabs.com/pubkey.gpg',
:id => title,
:ensure => 'present',
:source => 'http://apt.puppetlabs.com/pubkey.gpg',
@@
-88,7
+95,7
@@
describe 'apt::key', :type => :define do
})
end
it 'contains the apt_key present anchor' do
})
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
end
end
@@
-97,7
+104,7
@@
describe 'apt::key', :type => :define do
:key_server => 'p-gp.m-it.edu',
} end
it 'contains the apt_key' do
:key_server => 'p-gp.m-it.edu',
} end
it 'contains the apt_key' do
-
should
contain_apt_key(title).with({
+
is_expected.to
contain_apt_key(title).with({
:id => title,
:server => 'p-gp.m-it.edu',
})
:id => title,
:server => 'p-gp.m-it.edu',
})
@@
-111,7
+118,7
@@
describe 'apt::key', :type => :define do
}
end
it 'contains the apt_key' do
}
end
it 'contains the apt_key' do
-
should
contain_apt_key(title).with({
+
is_expected.to
contain_apt_key(title).with({
:id => title,
:server => 'hkp://pgp.mit.edu',
})
:id => title,
:server => 'hkp://pgp.mit.edu',
})
@@
-124,7
+131,7
@@
describe 'apt::key', :type => :define do
}
end
it 'contains the apt_key' do
}
end
it 'contains the apt_key' do
-
should
contain_apt_key(title).with({
+
is_expected.to
contain_apt_key(title).with({
:id => title,
:server => 'hkp://pgp.mit.edu:80',
})
:id => title,
:server => 'hkp://pgp.mit.edu:80',
})
@@
-276,36
+283,42
@@
describe 'apt::key', :type => :define do
describe 'duplication' do
context 'two apt::key resources for same key, different titles' do
let :pre_condition do
describe 'duplication' do
context 'two apt::key resources for same key, different titles' do
let :pre_condition do
- "apt::key { 'duplicate': key => '#{title}', }"
+ "
#{super()}\n
apt::key { 'duplicate': key => '#{title}', }"
end
end
- it 'contains t
wo apt::key resources
' do
-
should
contain_apt__key('duplicate').with({
+ it 'contains t
he duplicate apt::key resource
' do
+
is_expected.to
contain_apt__key('duplicate').with({
:key => title,
:ensure => 'present',
})
:key => title,
:ensure => 'present',
})
- should contain_apt__key(title).with({
+ end
+
+ it 'contains the original apt::key resource' do
+ is_expected.to contain_apt__key(title).with({
:id => title,
:ensure => 'present',
})
end
:id => title,
:ensure => 'present',
})
end
- it 'contains
only a singl
e apt_key' do
-
should
contain_apt_key('duplicate').with({
+ it 'contains
the nativ
e apt_key' do
+
is_expected.to
contain_apt_key('duplicate').with({
:id => title,
:ensure => 'present',
:source => nil,
:id => title,
:ensure => 'present',
:source => nil,
- :server =>
nil
,
+ :server =>
'keyserver.ubuntu.com'
,
:content => nil,
:keyserver_options => nil,
})
:content => nil,
:keyserver_options => nil,
})
- should_not contain_apt_key(title)
+ end
+
+ it 'does not contain the original apt_key' do
+ is_expected.not_to contain_apt_key(title)
end
end
context 'two apt::key resources, different ensure' do
let :pre_condition do
end
end
context 'two apt::key resources, different ensure' do
let :pre_condition do
- "apt::key { 'duplicate': key => '#{title}', ensure => 'absent', }"
+ "
#{super()}\n
apt::key { 'duplicate': key => '#{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/)