File tree Expand file tree Collapse file tree 2 files changed +14
-15
lines changed Expand file tree Collapse file tree 2 files changed +14
-15
lines changed Original file line number Diff line number Diff line change 3131 describe 'with multiple cache_enable parameters' do
3232 let ( :params ) do
3333 {
34- cache_enable : %w[ / /something ] ,
34+ cache_enable : [ '/' , ' /something' ] ,
3535 }
3636 end
3737
3838 it {
3939 expect ( subject ) . to contain_file ( 'cache_disk.conf' )
40- . with ( content : %r{CacheEnable disk /\n CacheEnable disk /something\n CacheRoot "/var/cache/apache2/mod_cache_disk"} )
40+ . with ( content : %r{CacheEnable disk /\n CacheEnable disk /something\n CacheRoot "/var/cache/apache2/mod_cache_disk"} )
4141 }
4242 end
4343
5151
5252 it {
5353 expect ( subject ) . to contain_file ( 'cache_disk.conf' )
54- . with ( content : %r{#{ default_config } \n CacheDirLength 2} )
54+ . with ( content : %r{#{ default_config } \n CacheDirLength 2} )
5555 }
5656 end
5757
6565
6666 it {
6767 expect ( subject ) . to contain_file ( 'cache_disk.conf' )
68- . with ( content : %r{#{ default_config } \n CacheDirLevels 2} )
68+ . with ( content : %r{#{ default_config } \n CacheDirLevels 2} )
6969 }
7070 end
7171 end
9090
9191 it {
9292 expect ( subject ) . to contain_file ( 'cache_disk.conf' )
93- . with ( content : %r{CacheEnable disk /\n CacheRoot "/var/cache/httpd/proxy"} )
93+ . with ( content : %r{CacheEnable disk /\n CacheRoot "/var/cache/httpd/proxy"} )
9494 }
9595 end
9696
114114
115115 it {
116116 expect ( subject ) . to contain_file ( 'cache_disk.conf' )
117- . with ( content : %r{CacheEnable disk /\n CacheRoot "/var/cache/mod_cache_disk"} )
117+ . with ( content : %r{CacheEnable disk /\n CacheRoot "/var/cache/mod_cache_disk"} )
118118 }
119119 end
120120end
Original file line number Diff line number Diff line change 1212
1313 it {
1414 expect ( subject ) . to contain_file ( 'cache.conf' )
15- . with ( content : '' )
15+ . with ( content : '' )
1616 }
1717
1818 describe 'with cache_ignore_headers' do
2424
2525 it {
2626 expect ( subject ) . to contain_file ( 'cache.conf' )
27- . with ( content : %r{CacheIgnoreHeaders Set-Cookie} )
27+ . with ( content : %r{CacheIgnoreHeaders Set-Cookie} )
2828 }
2929 end
3030
3737
3838 it {
3939 expect ( subject ) . to contain_file ( 'cache.conf' )
40- . with ( content : %r{CacheDefaultExpire 2000} )
40+ . with ( content : %r{CacheDefaultExpire 2000} )
4141 }
4242 end
4343
5050
5151 it {
5252 expect ( subject ) . to contain_file ( 'cache.conf' )
53- . with ( content : %r{CacheMaxExpire 2000} )
53+ . with ( content : %r{CacheMaxExpire 2000} )
5454 }
5555 end
5656
6363
6464 it {
6565 expect ( subject ) . to contain_file ( 'cache.conf' )
66- . with ( content : %r{CacheIgnoreNoLastMod On} )
66+ . with ( content : %r{CacheIgnoreNoLastMod On} )
6767 }
6868 end
6969
7676
7777 it {
7878 expect ( subject ) . to contain_file ( 'cache.conf' )
79- . with ( content : %r{CacheHeader On} )
79+ . with ( content : %r{CacheHeader On} )
8080 }
8181 end
8282
8989
9090 it {
9191 expect ( subject ) . to contain_file ( 'cache.conf' )
92- . with ( content : %r{CacheLock On} )
92+ . with ( content : %r{CacheLock On} )
9393 }
9494 end
9595
102102
103103 it {
104104 expect ( subject ) . to contain_file ( 'cache.conf' )
105- . with ( content : %r{CacheIgnoreCacheControl On} )
105+ . with ( content : %r{CacheIgnoreCacheControl On} )
106106 }
107107 end
108-
109108 end
110109end
You can’t perform that action at this time.
0 commit comments