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
/
conf_spec.rb
diff --git
a/spec/defines/conf_spec.rb
b/spec/defines/conf_spec.rb
index 16507c2f6fd9adc360d4e25b551a48ab86fd5253..310e15ad5e67a20d41964b001cadf353949dd500 100644
(file)
--- a/
spec/defines/conf_spec.rb
+++ b/
spec/defines/conf_spec.rb
@@
-1,24
+1,35
@@
+# frozen_string_literal: true
+
require 'spec_helper'
require 'spec_helper'
-describe 'apt::conf',
:type =>
:define do
+describe 'apt::conf',
type:
:define do
let :pre_condition do
'class { "apt": }'
end
let :pre_condition do
'class { "apt": }'
end
- let(:facts) { {
- :os => { :family => 'Debian', :name => 'Debian', :release => { :major => '7', :full => '7.0' }},
- :lsbdistid => 'Debian',
- :osfamily => 'Debian',
- :lsbdistcodename => 'wheezy',
- :puppetversion => Puppet.version,
- } }
+ let(:facts) do
+ {
+ os: {
+ family: 'Debian',
+ name: 'Debian',
+ release: {
+ major: '8',
+ full: '8.0',
+ },
+ distro: {
+ codename: 'jessie',
+ id: 'Debian',
+ },
+ },
+ }
+ end
let :title do
'norecommends'
end
let :title do
'norecommends'
end
- describe
"when creating an apt preference"
do
+ describe
'when creating an apt preference'
do
let :default_params do
{
let :default_params do
{
-
:priority =>
'00',
- :content => "Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n"
+
priority:
'00',
+ content: "Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n",
}
end
let :params do
}
end
let :params do
@@
-26,65
+37,61
@@
describe 'apt::conf', :type => :define do
end
let :filename do
end
let :filename do
- "/etc/apt/apt.conf.d/00norecommends"
+ '/etc/apt/apt.conf.d/00norecommends'
end
end
- it { is_expected.to contain_file(filename).with({
- 'ensure' => 'present',
- 'content' => /Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;/,
- 'owner' => 'root',
- 'group' => 'root',
- 'mode' => '0644',
- })
- }
+ it {
+ is_expected.to contain_file(filename).with('ensure' => 'present',
+ 'content' => %r{Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;},
+ 'owner' => 'root',
+ 'group' => 'root')
+ }
- context
"with notify_update = true (default)"
do
+ context
'with notify_update = true (default)'
do
let :params do
default_params
end
let :params do
default_params
end
+
it { is_expected.to contain_apt__setting("conf-#{title}").with_notify_update(true) }
end
it { is_expected.to contain_apt__setting("conf-#{title}").with_notify_update(true) }
end
- context
"with notify_update = false"
do
+ context
'with notify_update = false'
do
let :params do
let :params do
- default_params.merge({
- :notify_update => false
- })
+ default_params.merge(notify_update: false)
end
end
+
it { is_expected.to contain_apt__setting("conf-#{title}").with_notify_update(false) }
end
end
it { is_expected.to contain_apt__setting("conf-#{title}").with_notify_update(false) }
end
end
- describe
"when creating a preference without content"
do
+ describe
'when creating a preference without content'
do
let :params do
{
let :params do
{
-
:priority =>
'00',
+
priority:
'00',
}
end
it 'fails' do
}
end
it 'fails' do
-
expect { subject.call } .to raise_error(/pass in content/
)
+
is_expected.to raise_error(%r{pass in content}
)
end
end
end
end
- describe
"when removing an apt preference"
do
+ describe
'when removing an apt preference'
do
let :params do
{
let :params do
{
-
:ensure =>
'absent',
-
:priority =>
'00',
+
ensure:
'absent',
+
priority:
'00',
}
end
let :filename do
}
end
let :filename do
- "/etc/apt/apt.conf.d/00norecommends"
+ '/etc/apt/apt.conf.d/00norecommends'
end
end
- it { is_expected.to contain_file(filename).with({
- 'ensure' => 'absent',
- 'owner' => 'root',
- 'group' => 'root',
- 'mode' => '0644',
- })
+ it {
+ is_expected.to contain_file(filename).with('ensure' => 'absent',
+ 'owner' => 'root',
+ 'group' => 'root')
}
end
end
}
end
end