Skip to content

Commit 19d3ea5

Browse files
committed
Updated spec tests for disk_cache
1 parent b0dc882 commit 19d3ea5

File tree

2 files changed

+8
-26
lines changed

2 files changed

+8
-26
lines changed

manifests/mod/disk_cache.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
class apache::mod::disk_cache (
2121
$cache_root = undef,
2222
$cache_ignore_headers = undef,
23-
$default_cache_enable = true,
23+
Boolean $default_cache_enable = true,
2424
) {
2525
include apache
2626
if $cache_root {

spec/classes/mod/disk_cache_spec.rb

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
it { is_expected.to compile }
6262
it { is_expected.to contain_class('apache::mod::disk_cache') }
6363
it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
64-
it { is_expected.to contain_apache_mod('cache_disk') }
64+
it { is_expected.to contain_apache__mod('cache_disk') }
6565
it {
6666
is_expected.to contain_file('disk_cache.conf')
6767
.with(content: %r{CacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
@@ -81,7 +81,7 @@
8181
it { is_expected.to compile }
8282
it { is_expected.to contain_class('apache::mod::disk_cache') }
8383
it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
84-
it { is_expected.to contain_apache_mod('cache_disk') }
84+
it { is_expected.to contain_apache__mod('cache_disk') }
8585
it {
8686
is_expected.to contain_file('disk_cache.conf')
8787
.with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/apache2\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
@@ -98,13 +98,7 @@
9898

9999
let(:params) { { 'default_cache_enable' => 'foo' } }
100100

101-
it { is_expected.to compile }
102-
it { is_expected.to contain_class('apache::mod::disk_cache') }
103-
it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
104-
it { is_expected.to contain_apache_mod('cache_disk') }
105-
it {
106-
is_expected.to raise_error(Puppet::Error, 'default_cache_enable must be true or false')
107-
}
101+
it { is_expected.not_to compile }
108102
end
109103
end
110104

@@ -198,13 +192,7 @@
198192

199193
let(:params) { { 'default_cache_enable' => 'foo' } }
200194

201-
it { is_expected.to compile }
202-
it { is_expected.to contain_class('apache::mod::disk_cache') }
203-
it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
204-
it { is_expected.to contain_apache_mod('cache_disk') }
205-
it {
206-
is_expected.to raise_error(Puppet::Error, 'default_cache_enable must be true or false')
207-
}
195+
it { is_expected.not_to compile }
208196
end
209197
end
210198
context 'on a FreeBSD OS' do
@@ -266,7 +254,7 @@
266254
it { is_expected.to compile }
267255
it { is_expected.to contain_class('apache::mod::disk_cache') }
268256
it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
269-
it { is_expected.to contain_apache_mod('cache_disk') }
257+
it { is_expected.to contain_apache__mod('cache_disk') }
270258
it {
271259
is_expected.to contain_file('disk_cache.conf')
272260
.with(content: %r{CacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
@@ -286,7 +274,7 @@
286274
it { is_expected.to compile }
287275
it { is_expected.to contain_class('apache::mod::disk_cache') }
288276
it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
289-
it { is_expected.to contain_apache_mod('cache_disk') }
277+
it { is_expected.to contain_apache__mod('cache_disk') }
290278
it {
291279
is_expected.to contain_file('disk_cache.conf')
292280
.with(content: %r{CacheEnable disk \/\nCacheRoot \"\/var\/cache\/mod_cache_disk\"\nCacheDirLevels 2\nCacheDirLength 1\n})
@@ -303,13 +291,7 @@
303291

304292
let(:params) { { 'default_cache_enable' => 'foo' } }
305293

306-
it { is_expected.to compile }
307-
it { is_expected.to contain_class('apache::mod::disk_cache') }
308-
it { is_expected.to contain_class('apache::mod::cache').that_comes_before('Class[Apache::Mod::Disk_cache]') }
309-
it { is_expected.to contain_apache_mod('cache_disk') }
310-
it {
311-
is_expected.to raise_error(Puppet::Error, 'default_cache_enable must be true or false')
312-
}
294+
it { is_expected.not_to compile }
313295
end
314296
end
315297
end

0 commit comments

Comments
 (0)