Skip to content

Commit 9fdf754

Browse files
dploegerThomasMinor
authored andcommitted
Rubocop fixes
1 parent aeef7fb commit 9fdf754

File tree

2 files changed

+14
-15
lines changed

2 files changed

+14
-15
lines changed

spec/classes/mod/cache_disk_spec.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
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 /\nCacheEnable disk /something\nCacheRoot "/var/cache/apache2/mod_cache_disk"})
40+
.with(content: %r{CacheEnable disk /\nCacheEnable disk /something\nCacheRoot "/var/cache/apache2/mod_cache_disk"})
4141
}
4242
end
4343

@@ -51,7 +51,7 @@
5151

5252
it {
5353
expect(subject).to contain_file('cache_disk.conf')
54-
.with(content: %r{#{default_config}\nCacheDirLength 2})
54+
.with(content: %r{#{default_config}\nCacheDirLength 2})
5555
}
5656
end
5757

@@ -65,7 +65,7 @@
6565

6666
it {
6767
expect(subject).to contain_file('cache_disk.conf')
68-
.with(content: %r{#{default_config}\nCacheDirLevels 2})
68+
.with(content: %r{#{default_config}\nCacheDirLevels 2})
6969
}
7070
end
7171
end
@@ -90,7 +90,7 @@
9090

9191
it {
9292
expect(subject).to contain_file('cache_disk.conf')
93-
.with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/httpd/proxy"})
93+
.with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/httpd/proxy"})
9494
}
9595
end
9696

@@ -114,7 +114,7 @@
114114

115115
it {
116116
expect(subject).to contain_file('cache_disk.conf')
117-
.with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/mod_cache_disk"})
117+
.with(content: %r{CacheEnable disk /\nCacheRoot "/var/cache/mod_cache_disk"})
118118
}
119119
end
120120
end

spec/classes/mod/cache_spec.rb

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
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
@@ -24,7 +24,7 @@
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

@@ -37,7 +37,7 @@
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

@@ -50,7 +50,7 @@
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

@@ -63,7 +63,7 @@
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

@@ -76,7 +76,7 @@
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

@@ -89,7 +89,7 @@
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

@@ -102,9 +102,8 @@
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
110109
end

0 commit comments

Comments
 (0)