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
Release prep v9.1.0
[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 3158c16ef41cd842f6f73de870b560343766165e..26638e338a505d5ff15bd83cb77b4d569348f077 100644
(file)
--- a/
spec/defines/conf_spec.rb
+++ b/
spec/defines/conf_spec.rb
@@
-7,10
+7,18
@@
describe 'apt::conf', type: :define do
end
let(:facts) do
{
end
let(:facts) do
{
- os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
- lsbdistid: 'Debian',
- osfamily: 'Debian',
- lsbdistcodename: 'jessie',
+ os: {
+ family: 'Debian',
+ name: 'Debian',
+ release: {
+ major: '9',
+ full: '9.0'
+ },
+ distro: {
+ codename: 'stretch',
+ id: 'Debian'
+ }
+ }
}
end
let :title do
}
end
let :title do
@@
-21,7
+29,7
@@
describe 'apt::conf', type: :define do
let :default_params do
{
priority: '00',
let :default_params do
{
priority: '00',
- content: "Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n"
,
+ content: "Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n"
}
end
let :params do
}
end
let :params do
@@
-33,10
+41,10
@@
describe 'apt::conf', type: :define do
end
it {
end
it {
-
is_expected
.to contain_file(filename).with('ensure' => 'present',
-
'content'
=> %r{Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;},
-
'owner'
=> 'root',
-
'group'
=> 'root')
+
expect(subject)
.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
@@
-59,12
+67,12
@@
describe 'apt::conf', type: :define do
describe 'when creating a preference without content' do
let :params do
{
describe 'when creating a preference without content' do
let :params do
{
- priority: '00'
,
+ priority: '00'
}
end
it 'fails' do
}
end
it 'fails' do
-
is_expected
.to raise_error(%r{pass in content})
+
expect(subject)
.to raise_error(%r{pass in content})
end
end
end
end
@@
-72,7
+80,7
@@
describe 'apt::conf', type: :define do
let :params do
{
ensure: 'absent',
let :params do
{
ensure: 'absent',
- priority: '00'
,
+ priority: '00'
}
end
}
end
@@
-81,9
+89,9
@@
describe 'apt::conf', type: :define do
end
it {
end
it {
-
is_expected
.to contain_file(filename).with('ensure' => 'absent',
-
'owner'
=> 'root',
-
'group'
=> 'root')
+
expect(subject)
.to contain_file(filename).with('ensure' => 'absent',
+
'owner'
=> 'root',
+
'group'
=> 'root')
}
end
end
}
end
end