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 #964 from kenyon/use-modern-os-facts
[puppet-modules/puppetlabs-apt.git]
/
spec
/
defines
/
source_compat_spec.rb
diff --git
a/spec/defines/source_compat_spec.rb
b/spec/defines/source_compat_spec.rb
index 12d3d471ca4dbb68971a9e621ac1a7ce6c061c48..c35b630d049a2af8455344c6e74f3f9b32483e9d 100644
(file)
--- a/
spec/defines/source_compat_spec.rb
+++ b/
spec/defines/source_compat_spec.rb
@@
-1,7
+1,9
@@
+# frozen_string_literal: true
+
require 'spec_helper'
describe 'apt::source', type: :define do
require 'spec_helper'
describe 'apt::source', type: :define do
- GPG_KEY_ID = '6F6B15509CF8E59E6E469F327F438280EF8D349F'
.freeze
+ GPG_KEY_ID = '6F6B15509CF8E59E6E469F327F438280EF8D349F'
let :title do
'my_source'
let :title do
'my_source'
@@
-9,10
+11,18
@@
describe 'apt::source', type: :define do
let :facts do
{
let :facts do
{
- os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
- lsbdistid: 'Debian',
- lsbdistcodename: 'jessie',
- osfamily: 'Debian',
+ os: {
+ family: 'Debian',
+ name: 'Debian',
+ release: {
+ major: '8',
+ full: '8.0',
+ },
+ distro: {
+ codename: 'jessie',
+ id: 'Debian',
+ },
+ },
}
end
}
end
@@
-102,13
+112,22
@@
describe 'apt::source', type: :define do
context 'with no release' do
let :facts do
{
context 'with no release' do
let :facts do
{
- os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
- osfamily: 'Debian',
+ os: {
+ family: 'Debian',
+ name: 'Debian',
+ release: {
+ major: '8',
+ full: '8.0',
+ },
+ distro: {
+ id: 'Debian',
+ },
+ },
}
end
it do
}
end
it do
- is_expected.to raise_error(Puppet::Error, %r{
lsbdist
codename fact not available: release parameter required})
+ is_expected.to raise_error(Puppet::Error, %r{
os.distro.
codename fact not available: release parameter required})
end
end
end
end
end
end