Skip to content

Commit

Permalink
WIP: Fix beaker tests
Browse files Browse the repository at this point in the history
`fact` no longer works with symbols.
  • Loading branch information
alexjfisher committed Oct 1, 2018
1 parent 26b27a8 commit 0b6cc32
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ group :system_tests do
gem 'serverspec', :require => false
gem 'beaker-hostgenerator', '>= 1.1.10', :require => false
gem 'beaker-docker', :require => false
gem 'beaker-puppet', :require => false
gem 'beaker-puppet', :require => false, :git => 'https://github.com/alexjfisher/beaker-puppet.git', :branch => 'fact_on'
gem 'beaker-puppet_install_helper', :require => false
gem 'beaker-module_install_helper', :require => false
gem 'rbnacl', '>= 4', :require => false if RUBY_VERSION >= '2.2.6'
Expand Down
4 changes: 2 additions & 2 deletions spec/acceptance/class_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ class { '::collectd::plugin::rabbitmq': }
apply_manifest(pp, catch_changes: true)
end

if fact(:osfamily) == 'Debian'
if fact('osfamily') == 'Debian'
describe file('/etc/collectd/conf.d/10-rabbitmq.conf') do
it { is_expected.to be_file }
it { is_expected.to contain 'TypesDB "/usr/local/share/collectd-rabbitmq/types.db.custom"' }
end
end

if fact(:osfamily) == 'RedHat'
if fact('osfamily') == 'RedHat'
describe file('/etc/collectd.d/10-rabbitmq.conf') do
it { is_expected.to be_file }
it { is_expected.to contain 'TypesDB "/usr/share/collectd-rabbitmq/types.db.custom"' }
Expand Down
4 changes: 2 additions & 2 deletions spec/acceptance/curl_json_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
apply_manifest(pp, catch_changes: true)
end

case fact(:osfamily)
case fact('osfamily')
when 'Debian'
curl_json_package = if fact(:lsbdistcodename) == 'precise'
curl_json_package = if fact('lsbdistcodename') == 'precise'
'libyajl1'
else
'libyajl2'
Expand Down

0 comments on commit 0b6cc32

Please sign in to comment.