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 #494 from mhaskel/cleanup-backports
[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 cda5900c035a3174aa782d8d8e34d678534b6eb5..a7db4e61e3f54ffed20db74884cf93ef63304525 100644
(file)
--- a/
spec/defines/conf_spec.rb
+++ b/
spec/defines/conf_spec.rb
@@
-1,6
+1,9
@@
require 'spec_helper'
describe 'apt::conf', :type => :define do
require 'spec_helper'
describe 'apt::conf', :type => :define do
- let(:facts) { { :lsbdistid => 'Debian' } }
+ let :pre_condition do
+ 'class { "apt": }'
+ end
+ let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian', :lsbdistcodename => 'wheezy' } }
let :title do
'norecommends'
end
let :title do
'norecommends'
end
@@
-17,15
+20,9
@@
describe 'apt::conf', :type => :define do
"/etc/apt/apt.conf.d/00norecommends"
end
"/etc/apt/apt.conf.d/00norecommends"
end
- it { should contain_apt__conf('norecommends').with({
- 'priority' => '00',
- 'content' => "Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n"
- })
- }
-
- it { should contain_file(filename).with({
+ it { is_expected.to contain_file(filename).with({
'ensure' => 'present',
'ensure' => 'present',
- 'content' =>
"Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n"
,
+ 'content' =>
/Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;/
,
'owner' => 'root',
'group' => 'root',
'mode' => '0644',
'owner' => 'root',
'group' => 'root',
'mode' => '0644',
@@
-46,9
+43,9
@@
describe 'apt::conf', :type => :define do
"/etc/apt/apt.conf.d/00norecommends"
end
"/etc/apt/apt.conf.d/00norecommends"
end
- it {
should
contain_file(filename).with({
+ it {
is_expected.to
contain_file(filename).with({
'ensure' => 'absent',
'ensure' => 'absent',
- 'content' =>
"Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n"
,
+ 'content' =>
/Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;/
,
'owner' => 'root',
'group' => 'root',
'mode' => '0644',
'owner' => 'root',
'group' => 'root',
'mode' => '0644',