Skip to content

Commit 4bba02c

Browse files
committed
Do not shadow facts variable in vhost spec tests
This properly separates the os_facts variable from the facts let block, according to current best practices.
1 parent 436308d commit 4bba02c

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

spec/defines/vhost_spec.rb

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
describe 'apache::vhost', type: :define do
66
describe 'os-independent items' do
7-
on_supported_os.each do |os, facts|
7+
on_supported_os.each do |os, os_facts|
88
let(:apache_name) { facts[:os]['family'] == 'RedHat' ? 'httpd' : 'apache2' }
99

1010
let :pre_condition do
@@ -24,7 +24,7 @@
2424

2525
context "on #{os} " do
2626
let :facts do
27-
facts
27+
os_facts
2828
end
2929

3030
describe 'basic assumptions' do
@@ -34,9 +34,9 @@
3434
it { is_expected.to contain_class('apache::params') }
3535
it { is_expected.to contain_apache__listen(params[:port]) }
3636
# namebased virualhost is only created on apache 2.2 and older
37-
if (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i < 7) ||
38-
(facts[:os]['name'] == 'Amazon') ||
39-
(facts[:os]['name'] == 'SLES' && facts[:os]['release']['major'].to_i < 12)
37+
if (os_facts[:os]['family'] == 'RedHat' && os_facts[:os]['release']['major'].to_i < 7) ||
38+
(os_facts[:os]['name'] == 'Amazon') ||
39+
(os_facts[:os]['name'] == 'SLES' && os_facts[:os]['release']['major'].to_i < 12)
4040
it { is_expected.to contain_apache__namevirtualhost("*:#{params[:port]}") }
4141
end
4242
end
@@ -586,7 +586,7 @@
586586
'require' => 'Package[httpd]',
587587
'notify' => 'Class[Apache::Service]')
588588
}
589-
if facts[:os]['release']['major'].to_i >= 18 && facts[:os]['name'] == 'Ubuntu'
589+
if os_facts[:os]['release']['major'].to_i >= 18 && os_facts[:os]['name'] == 'Ubuntu'
590590
it {
591591
is_expected.to contain_file('30-rspec.example.com.conf symlink').with('ensure' => 'link',
592592
'path' => "/etc/#{apache_name}/sites-enabled/30-rspec.example.com.conf")
@@ -1703,8 +1703,8 @@
17031703
it { is_expected.to compile }
17041704
it { is_expected.to contain_concat('25-rspec.example.com.conf') }
17051705
# this works only with apache 2.4 and newer
1706-
if (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i > 6) ||
1707-
(facts[:os]['name'] == 'SLES' && facts[:os]['release']['major'].to_i > 11)
1706+
if (os_facts[:os]['family'] == 'RedHat' && os_facts[:os]['release']['major'].to_i > 6) ||
1707+
(os_facts[:os]['name'] == 'SLES' && os_facts[:os]['release']['major'].to_i > 11)
17081708
it {
17091709
is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
17101710
content: %r{^\s+Require all granted$},
@@ -1717,9 +1717,9 @@
17171717

17181718
# the following style is only present on Apache 2.2
17191719
# That is used in SLES 11, RHEL6, Amazon Linux
1720-
if (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i < 7) ||
1721-
(facts[:os]['name'] == 'Amazon') ||
1722-
(facts[:os]['name'] == 'SLES' && facts[:os]['release']['major'].to_i < 12)
1720+
if (os_facts[:os]['family'] == 'RedHat' && os_facts[:os]['release']['major'].to_i < 7) ||
1721+
(os_facts[:os]['name'] == 'Amazon') ||
1722+
(os_facts[:os]['name'] == 'SLES' && os_facts[:os]['release']['major'].to_i < 12)
17231723
context 'apache 2.2 access controls on directories' do
17241724
let :params do
17251725
{
@@ -1760,7 +1760,7 @@
17601760
end
17611761

17621762
# this setup uses fastcgi wich isn't available on RHEL 7 / RHEL 8 / Debian / Ubuntu
1763-
unless facts[:os]['family'] == 'Debian' || (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i >= 7)
1763+
unless os_facts[:os]['family'] == 'Debian' || (os_facts[:os]['family'] == 'RedHat' && os_facts[:os]['release']['major'].to_i >= 7)
17641764
describe 'fastcgi options' do
17651765
let :params do
17661766
{

0 commit comments

Comments
 (0)