Skip to content

Commit 6b7536f

Browse files
committed
Nest contexts in php_spec.rb
This uses rspec context nesting to get a better description.
1 parent 012ce45 commit 6b7536f

File tree

1 file changed

+26
-24
lines changed

1 file changed

+26
-24
lines changed

spec/classes/mod/php_spec.rb

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,20 @@
6262
content: "LoadModule php7_module /usr/lib/apache2/modules/libphp7.3.so\n",
6363
)
6464
}
65-
end
66-
context 'on buster with experimental php8.0' do
67-
let :params do
68-
{ php_version: '8.0' }
69-
end
7065

71-
it { is_expected.to contain_apache__mod('php') }
72-
it { is_expected.to contain_package('libapache2-mod-php8.0') }
73-
it {
74-
is_expected.to contain_file('php.load').with(
75-
content: "LoadModule php_module /usr/lib/apache2/modules/libphp.so\n",
76-
)
77-
}
66+
context 'with experimental php8.0' do
67+
let :params do
68+
{ php_version: '8.0' }
69+
end
70+
71+
it { is_expected.to contain_apache__mod('php') }
72+
it { is_expected.to contain_package('libapache2-mod-php8.0') }
73+
it {
74+
is_expected.to contain_file('php.load').with(
75+
content: "LoadModule php_module /usr/lib/apache2/modules/libphp.so\n",
76+
)
77+
}
78+
end
7879
end
7980
when '11'
8081
context 'on bullseye' do
@@ -85,19 +86,20 @@
8586
content: "LoadModule php7_module /usr/lib/apache2/modules/libphp7.4.so\n",
8687
)
8788
}
88-
end
89-
context 'on bullseye with experimental php8.0' do
90-
let :params do
91-
{ php_version: '8.0' }
92-
end
9389

94-
it { is_expected.to contain_apache__mod('php') }
95-
it { is_expected.to contain_package('libapache2-mod-php8.0') }
96-
it {
97-
is_expected.to contain_file('php.load').with(
98-
content: "LoadModule php_module /usr/lib/apache2/modules/libphp.so\n",
99-
)
100-
}
90+
context 'with experimental php8.0' do
91+
let :params do
92+
{ php_version: '8.0' }
93+
end
94+
95+
it { is_expected.to contain_apache__mod('php') }
96+
it { is_expected.to contain_package('libapache2-mod-php8.0') }
97+
it {
98+
is_expected.to contain_file('php.load').with(
99+
content: "LoadModule php_module /usr/lib/apache2/modules/libphp.so\n",
100+
)
101+
}
102+
end
101103
end
102104
when '16.04'
103105
context 'on xenial' do

0 commit comments

Comments
 (0)