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 #1101 from david22swan/CONT-773/main/puppet_8
[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 aee585588c1d2e08cddd4c433db61e43db41a066..613c7fd99942eaca89baf50fc318b67e3cc2c685 100644
(file)
--- a/
spec/defines/key_compat_spec.rb
+++ b/
spec/defines/key_compat_spec.rb
@@
-1,3
+1,5
@@
+# frozen_string_literal: true
+
require 'spec_helper'
def contains_apt_key_example(title)
require 'spec_helper'
def contains_apt_key_example(title)
@@
-19,19
+21,26
@@
def apt_key_example(title)
end
describe 'apt::key', type: :define do
end
describe 'apt::key', type: :define do
- GPG_KEY_ID = '6F6B15509CF8E59E6E469F327F438280EF8D349F'.freeze
-
+ let(:key_id) { '6F6B15509CF8E59E6E469F327F438280EF8D349F' }
let(:facts) do
{
let(:facts) do
{
- os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
- lsbdistid: 'Debian',
- osfamily: 'Debian',
- puppetversion: Puppet.version,
+ os: {
+ family: 'Debian',
+ name: 'Debian',
+ release: {
+ major: '9',
+ full: '9.0'
+ },
+ distro: {
+ codename: 'stretch',
+ id: 'Debian'
+ }
+ }
}
end
let :title do
}
end
let :title do
- GPG_KEY_ID
+ key_id
end
let :pre_condition do
end
let :pre_condition do
@@
-41,14
+50,15
@@
describe 'apt::key', type: :define do
describe 'normal operation' do
describe 'default options' do
it {
describe 'normal operation' do
describe 'default options' do
it {
-
is_expected
.to contain_apt_key(title).with(id: title,
- ensure: 'present',
- source: nil,
- server: 'keyserver.ubuntu.com',
- content: nil)
+
expect(subject)
.to contain_apt_key(title).with(id: title,
+
ensure: 'present',
+
source: nil,
+
server: 'keyserver.ubuntu.com',
+
content: nil)
}
}
+
it 'contains the apt_key present anchor' do
it 'contains the apt_key present anchor' do
-
is_expected
.to contain_anchor("apt_key #{title} present")
+
expect(subject)
.to contain_anchor("apt_key #{title} present")
end
end
end
end
@@
-59,38
+69,40
@@
describe 'apt::key', type: :define do
let :params do
{
let :params do
{
- id:
GPG_KEY_ID,
+ id:
key_id
}
end
it 'contains the apt_key' do
}
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)
+
expect(subject).to contain_apt_key(title).with(id: key_id
,
+
ensure: 'present',
+
source: nil,
+
server: 'keyserver.ubuntu.com',
+
content: nil)
end
end
+
it 'contains the apt_key present anchor' do
it 'contains the apt_key present anchor' do
-
is_expected.to contain_anchor("apt_key #{GPG_KEY_ID
} present")
+
expect(subject).to contain_anchor("apt_key #{key_id
} present")
end
end
describe 'ensure => absent' do
let :params do
{
end
end
describe 'ensure => absent' do
let :params do
{
- ensure: 'absent'
,
+ ensure: 'absent'
}
end
it 'contains the apt_key' do
}
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)
+
expect(subject)
.to contain_apt_key(title).with(id: title,
+
ensure: 'absent',
+
source: nil,
+
server: 'keyserver.ubuntu.com',
+
content: nil)
end
end
+
it 'contains the apt_key absent anchor' do
it 'contains the apt_key absent anchor' do
-
is_expected
.to contain_anchor("apt_key #{title} absent")
+
expect(subject)
.to contain_anchor("apt_key #{title} absent")
end
end
end
end
@@
-100,53
+112,55
@@
describe 'apt::key', type: :define do
content: 'GPG key content',
source: 'http://apt.puppetlabs.com/pubkey.gpg',
server: 'pgp.mit.edu',
content: 'GPG key content',
source: 'http://apt.puppetlabs.com/pubkey.gpg',
server: 'pgp.mit.edu',
- options: 'debug'
,
+ options: 'debug'
}
end
it 'contains the apt_key' do
}
end
it 'contains the apt_key' do
-
is_expected
.to contain_apt_key(title).with(contains_apt_key_example(title))
+
expect(subject)
.to contain_apt_key(title).with(contains_apt_key_example(title))
end
end
+
it 'contains the apt_key present anchor' do
it 'contains the apt_key present anchor' do
-
is_expected
.to contain_anchor("apt_key #{title} present")
+
expect(subject)
.to contain_anchor("apt_key #{title} present")
end
end
context 'when domain has dash' do
let(:params) do
{
end
end
context 'when domain has dash' do
let(:params) do
{
- server: 'p-gp.m-it.edu'
,
+ server: 'p-gp.m-it.edu'
}
end
it 'contains the apt_key' do
}
end
it 'contains the apt_key' do
-
is_expected
.to contain_apt_key(title).with(id: title,
- server: 'p-gp.m-it.edu')
+
expect(subject)
.to contain_apt_key(title).with(id: title,
+
server: 'p-gp.m-it.edu')
end
end
context 'with url' do
let :params do
{
end
end
context 'with url' do
let :params do
{
- server: 'hkp://pgp.mit.edu'
,
+ server: 'hkp://pgp.mit.edu'
}
end
it 'contains the apt_key' do
}
end
it 'contains the apt_key' do
-
is_expected
.to contain_apt_key(title).with(id: title,
- server: 'hkp://pgp.mit.edu')
+
expect(subject)
.to contain_apt_key(title).with(id: title,
+
server: 'hkp://pgp.mit.edu')
end
end
end
end
+
context 'with url and port number' do
let :params do
{
context 'with url and 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
}
end
it 'contains the apt_key' do
-
is_expected
.to contain_apt_key(title).with(id: title,
- server: 'hkp://pgp.mit.edu:80')
+
expect(subject)
.to contain_apt_key(title).with(id: title,
+
server: 'hkp://pgp.mit.edu:80')
end
end
end
end
end
end
@@
-155,171
+169,178
@@
describe 'apt::key', type: :define do
context 'when domain begins with a dash' do
let(:params) do
{
context 'when domain begins with a dash' do
let(:params) do
{
- server: '-pgp.mit.edu'
,
+ server: '-pgp.mit.edu'
}
end
it 'fails' do
}
end
it 'fails' do
-
is_expected
.to raise_error(%r{expects a match})
+
expect(subject)
.to raise_error(%r{expects a match})
end
end
context 'when domain begins with dot' do
let(:params) do
{
end
end
context 'when domain begins with dot' do
let(:params) do
{
- server: '.pgp.mit.edu'
,
+ server: '.pgp.mit.edu'
}
end
it 'fails' do
}
end
it 'fails' do
-
is_expected
.to raise_error(%r{expects a match})
+
expect(subject)
.to raise_error(%r{expects a match})
end
end
context 'when domain ends with dot' do
let(:params) do
{
end
end
context 'when domain ends with dot' do
let(:params) do
{
- server: 'pgp.mit.edu.'
,
+ server: 'pgp.mit.edu.'
}
end
it 'fails' do
}
end
it 'fails' do
-
is_expected
.to raise_error(%r{expects a match})
+
expect(subject)
.to raise_error(%r{expects a match})
end
end
end
end
+
context 'when url character limit is exceeded' do
let :params do
{
context 'when url character limit is exceeded' do
let :params do
{
- server: 'hkp://pgpiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii.mit.edu'
,
+ server: 'hkp://pgpiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii.mit.edu'
}
end
it 'fails' do
}
end
it 'fails' do
-
is_expected
.to raise_error(%r{expects a match})
+
expect(subject)
.to raise_error(%r{expects a match})
end
end
end
end
+
context 'with incorrect port number url' do
let :params 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
}
end
it 'fails' do
-
is_expected
.to raise_error(%r{expects a match})
+
expect(subject)
.to raise_error(%r{expects a match})
end
end
end
end
- context 'with incorrect protocol for url' do
+
+ context 'with incorrect protocol for url' do
let :params do
{
let :params do
{
- server: 'abc://pgp.mit.edu:80'
,
+ server: 'abc://pgp.mit.edu:80'
}
end
it 'fails' do
}
end
it 'fails' do
-
is_expected
.to raise_error(%r{expects a match})
+
expect(subject)
.to raise_error(%r{expects a match})
end
end
end
end
+
context 'with missing port number url' do
let :params 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
}
end
it 'fails' do
-
is_expected
.to raise_error(%r{expects a match})
+
expect(subject)
.to raise_error(%r{expects a match})
end
end
end
end
+
context 'with url ending with a dot' do
let :params 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
}
end
it 'fails' do
-
is_expected
.to raise_error(%r{expects a match})
+
expect(subject)
.to raise_error(%r{expects a match})
end
end
end
end
+
context 'with url begin with a dash' do
let(:params) do
{
context 'with url begin with a dash' do
let(:params) do
{
- server: 'hkp://-pgp.mit.edu'
,
+ server: 'hkp://-pgp.mit.edu'
}
end
it 'fails' do
}
end
it 'fails' do
-
is_expected
.to raise_error(%r{expects a match})
+
expect(subject)
.to raise_error(%r{expects a match})
end
end
end
end
+
context 'with invalid key' do
let :title do
'Out of rum. Why? Why are we out of rum?'
end
it 'fails' do
context 'with invalid key' do
let :title do
'Out of rum. Why? Why are we out of rum?'
end
it 'fails' do
-
is_expected
.to raise_error(%r{expects a match})
+
expect(subject)
.to raise_error(%r{expects a match})
end
end
context 'with invalid source' do
let :params do
{
end
end
context 'with invalid source' do
let :params do
{
- source: 'afp://puppetlabs.com/key.gpg'
,
+ source: 'afp://puppetlabs.com/key.gpg'
}
end
it 'fails' do
}
end
it 'fails' do
-
is_expected.to raise_error(%r{expects a match
})
+
expect(subject).to raise_error(%r{evaluating a Resource
})
end
end
context 'with invalid content' do
let :params do
{
end
end
context 'with invalid content' do
let :params do
{
- content: []
,
+ content: []
}
end
it 'fails' do
}
end
it 'fails' do
-
is_expected
.to raise_error(%r{expects a})
+
expect(subject)
.to raise_error(%r{expects a})
end
end
context 'with invalid server' do
let :params do
{
end
end
context 'with invalid server' do
let :params do
{
- server: 'two bottles of rum'
,
+ server: 'two bottles of rum'
}
end
it 'fails' do
}
end
it 'fails' do
-
is_expected
.to raise_error(%r{expects a match})
+
expect(subject)
.to raise_error(%r{expects a match})
end
end
context 'with invalid keyserver_options' do
let :params do
{
end
end
context 'with invalid keyserver_options' do
let :params do
{
- options: {}
,
+ options: {}
}
end
it 'fails' do
}
end
it 'fails' do
-
is_expected
.to raise_error(%r{expects a})
+
expect(subject)
.to raise_error(%r{expects a})
end
end
context 'with invalid ensure' do
let :params do
{
end
end
context 'with invalid ensure' do
let :params do
{
- ensure: 'foo'
,
+ ensure: 'foo'
}
end
it 'fails' do
}
end
it 'fails' do
-
is_expected.to raise_error(%r{Enum\['absent', 'present
'\]})
+
expect(subject).to raise_error(%r{Enum\['absent', 'present', 'refreshed
'\]})
end
end
end
end
@@
-329,21
+350,21
@@
describe 'apt::key', type: :define do
end
it 'contains the duplicate apt::key resource' do
end
it 'contains the duplicate apt::key resource' do
-
is_expected
.to contain_apt__key('duplicate').with(id: title,
- ensure: 'present')
+
expect(subject)
.to contain_apt__key('duplicate').with(id: title,
+
ensure: 'present')
end
it 'contains the original apt::key resource' do
end
it 'contains the original apt::key resource' do
-
is_expected
.to contain_apt__key(title).with(id: title,
- ensure: 'present')
+
expect(subject)
.to contain_apt__key(title).with(id: title,
+
ensure: 'present')
end
it 'contains the native apt_key' do
end
it 'contains the native apt_key' do
-
is_expected
.to contain_apt_key('duplicate').with(apt_key_example(title))
+
expect(subject)
.to contain_apt_key('duplicate').with(apt_key_example(title))
end
it 'does not contain the original apt_key' do
end
it 'does not contain the original apt_key' do
-
is_expected
.not_to contain_apt_key(title)
+
expect(subject)
.not_to contain_apt_key(title)
end
end
end
end
@@
-353,7
+374,7
@@
describe 'apt::key', type: :define do
end
it 'informs the user of the impossibility' do
end
it 'informs the user of the impossibility' do
-
is_expected
.to raise_error(%r{already ensured as absent})
+
expect(subject)
.to raise_error(%r{already ensured as absent})
end
end
end
end
end
end