Skip to content

Commit 5caec66

Browse files
committed
Simplify mod::php unit tests
1 parent b3f5f8c commit 5caec66

File tree

1 file changed

+1
-17
lines changed

1 file changed

+1
-17
lines changed

spec/classes/mod/php_spec.rb

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,6 @@
2121
end
2222

2323
case facts[:os]['release']['major']
24-
when '9'
25-
context 'on stretch' do
26-
it { is_expected.to contain_apache__mod('php7.0') }
27-
it { is_expected.to contain_package('libapache2-mod-php7.0') }
28-
29-
it {
30-
expect(subject).to contain_file('php7.0.load').with(
31-
content: "LoadModule php7_module /usr/lib/apache2/modules/libphp7.0.so\n",
32-
)
33-
}
34-
end
3524
when '10'
3625
context 'on buster' do
3726
it { is_expected.to contain_apache__mod('php7.3') }
@@ -290,12 +279,7 @@
290279
end
291280

292281
# all the following tests are for legacy php/apache versions. They don't work on modern ubuntu and redhat 8
293-
next if (facts[:os]['release']['major'].to_i >= 15 && facts[:os]['name'] == 'SLES') ||
294-
(facts[:os]['family'] == 'Debian') ||
295-
(facts[:os]['release']['major'].to_i >= 8 && (facts[:os]['name'] == 'RedHat' || facts[:os]['name'] == 'CentOS' ||
296-
facts[:os]['name'] == 'Rocky' || facts[:os]['name'] == 'AlmaLinux'))
297-
298-
describe 'OS independent tests' do
282+
describe 'OS independent tests', unless: (facts[:os]['family'] in ['Debian', 'RedHat']) || (facts[:os]['release']['major'].to_i >= 15 && facts[:os]['name'] == 'SLES') do
299283
context 'with content param' do
300284
let :params do
301285
{ content: 'somecontent' }

0 commit comments

Comments
 (0)