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 #1058 from puppetlabs/issue-1057
[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 0a450ecf0140095151b7c83504e8c9cac26542e7..d4779375521036c9feb8b77ce3a386f318eca4ec 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,14
+21,22
@@
def apt_key_example(title)
end
describe 'apt::key', type: :define do
end
describe 'apt::key', type: :define do
- GPG_KEY_ID = '6F6B15509CF8E59E6E469F327F438280EF8D349F'
.freeze
+ GPG_KEY_ID = '6F6B15509CF8E59E6E469F327F438280EF8D349F'
let(:facts) do
{
let(:facts) do
{
- os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.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
}
end
@@
-112,7
+122,7
@@
describe 'apt::key', type: :define do
end
end
end
end
- context '
domain with
dash' do
+ context '
when domain has
dash' do
let(:params) do
{
server: 'p-gp.m-it.edu',
let(:params) do
{
server: 'p-gp.m-it.edu',
@@
-125,7
+135,7
@@
describe 'apt::key', type: :define do
end
end
end
end
- context 'url' do
+ context '
with
url' do
let :params do
{
server: 'hkp://pgp.mit.edu',
let :params do
{
server: 'hkp://pgp.mit.edu',
@@
-137,7
+147,7
@@
describe 'apt::key', type: :define do
server: 'hkp://pgp.mit.edu')
end
end
server: 'hkp://pgp.mit.edu')
end
end
- context '
url with
port number' do
+ context '
with url and
port number' do
let :params do
{
server: 'hkp://pgp.mit.edu:80',
let :params do
{
server: 'hkp://pgp.mit.edu:80',
@@
-152,7
+162,7
@@
describe 'apt::key', type: :define do
end
describe 'validation' do
end
describe 'validation' do
- context '
domain begin with
dash' do
+ context '
when domain begins with a
dash' do
let(:params) do
{
server: '-pgp.mit.edu',
let(:params) do
{
server: '-pgp.mit.edu',
@@
-164,7
+174,7
@@
describe 'apt::key', type: :define do
end
end
end
end
- context '
domain begin
with dot' do
+ context '
when domain begins
with dot' do
let(:params) do
{
server: '.pgp.mit.edu',
let(:params) do
{
server: '.pgp.mit.edu',
@@
-176,7
+186,7
@@
describe 'apt::key', type: :define do
end
end
end
end
- context '
domain end
with dot' do
+ context '
when domain ends
with dot' do
let(:params) do
{
server: 'pgp.mit.edu.',
let(:params) do
{
server: 'pgp.mit.edu.',
@@
-187,7
+197,7
@@
describe 'apt::key', type: :define do
is_expected .to raise_error(%r{expects a match})
end
end
is_expected .to raise_error(%r{expects a match})
end
end
- context '
exceed character url
' do
+ context '
when url character limit is exceeded
' do
let :params do
{
server: 'hkp://pgpiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii.mit.edu',
let :params do
{
server: 'hkp://pgpiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii.mit.edu',
@@
-198,7
+208,7
@@
describe 'apt::key', type: :define do
is_expected.to raise_error(%r{expects a match})
end
end
is_expected.to raise_error(%r{expects a match})
end
end
- context 'incorrect port number url' do
+ context '
with
incorrect port number url' do
let :params do
{
server: 'hkp://pgp.mit.edu:8008080',
let :params do
{
server: 'hkp://pgp.mit.edu:8008080',
@@
-209,7
+219,7
@@
describe 'apt::key', type: :define do
is_expected.to raise_error(%r{expects a match})
end
end
is_expected.to raise_error(%r{expects a match})
end
end
- context 'incorrect protocol for url' do
+ context '
with
incorrect protocol for url' do
let :params do
{
server: 'abc://pgp.mit.edu:80',
let :params do
{
server: 'abc://pgp.mit.edu:80',
@@
-220,7
+230,7
@@
describe 'apt::key', type: :define do
is_expected.to raise_error(%r{expects a match})
end
end
is_expected.to raise_error(%r{expects a match})
end
end
- context 'missing port number url' do
+ context '
with
missing port number url' do
let :params do
{
server: 'hkp://pgp.mit.edu:',
let :params do
{
server: 'hkp://pgp.mit.edu:',
@@
-231,7
+241,7
@@
describe 'apt::key', type: :define do
is_expected.to raise_error(%r{expects a match})
end
end
is_expected.to raise_error(%r{expects a match})
end
end
- context 'url ending with a dot' do
+ context '
with
url ending with a dot' do
let :params do
{
server: 'hkp://pgp.mit.edu.',
let :params do
{
server: 'hkp://pgp.mit.edu.',
@@
-242,7
+252,7
@@
describe 'apt::key', type: :define do
is_expected.to raise_error(%r{expects a match})
end
end
is_expected.to raise_error(%r{expects a match})
end
end
- context 'url begin with a dash' do
+ context '
with
url begin with a dash' do
let(:params) do
{
server: 'hkp://-pgp.mit.edu',
let(:params) do
{
server: 'hkp://-pgp.mit.edu',
@@
-253,7
+263,7
@@
describe 'apt::key', type: :define do
is_expected.to raise_error(%r{expects a match})
end
end
is_expected.to raise_error(%r{expects a match})
end
end
- context 'invalid key' do
+ context '
with
invalid key' do
let :title do
'Out of rum. Why? Why are we out of rum?'
end
let :title do
'Out of rum. Why? Why are we out of rum?'
end
@@
-263,7
+273,7
@@
describe 'apt::key', type: :define do
end
end
end
end
- context 'invalid source' do
+ context '
with
invalid source' do
let :params do
{
source: 'afp://puppetlabs.com/key.gpg',
let :params do
{
source: 'afp://puppetlabs.com/key.gpg',
@@
-271,11
+281,11
@@
describe 'apt::key', type: :define do
end
it 'fails' do
end
it 'fails' do
- is_expected.to raise_error(%r{e
xpects a match
})
+ is_expected.to raise_error(%r{e
valuating a Resource
})
end
end
end
end
- context 'invalid content' do
+ context '
with
invalid content' do
let :params do
{
content: [],
let :params do
{
content: [],
@@
-287,7
+297,7
@@
describe 'apt::key', type: :define do
end
end
end
end
- context 'invalid server' do
+ context '
with
invalid server' do
let :params do
{
server: 'two bottles of rum',
let :params do
{
server: 'two bottles of rum',
@@
-299,7
+309,7
@@
describe 'apt::key', type: :define do
end
end
end
end
- context 'invalid keyserver_options' do
+ context '
with
invalid keyserver_options' do
let :params do
{
options: {},
let :params do
{
options: {},
@@
-311,7
+321,7
@@
describe 'apt::key', type: :define do
end
end
end
end
- context 'invalid ensure' do
+ context '
with
invalid ensure' do
let :params do
{
ensure: 'foo',
let :params do
{
ensure: 'foo',
@@
-319,7
+329,7
@@
describe 'apt::key', type: :define do
end
it 'fails' do
end
it 'fails' do
- is_expected.to raise_error(%r{Enum\['absent', 'present'\]})
+ is_expected.to raise_error(%r{Enum\['absent', 'present'
, 'refreshed'
\]})
end
end
end
end