summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorDavid Schmitt <david.schmitt@puppet.com>2017-02-20 10:46:50 +0000
committerDavid Schmitt <david.schmitt@puppet.com>2017-02-20 11:23:54 +0000
commit2c6c2ff62db3cb9ee3b8bf755f66da4918783d28 (patch)
treedbc1bdadc281b9e2de295ff0dd725acf803e38b9 /spec
parentdb8c1fbb2394d93fe3156b17c840455f1b3e2c76 (diff)
Fix acceptance test failure "Hiera is not a class"
Due to [BKR-969](https://tickets.puppetlabs.com/browse/BKR-969) the global `Hiera` symbol is corrupted. Loading puppet before beaker fixes that.
Diffstat (limited to 'spec')
-rwxr-xr-xspec/acceptance/zip_spec.rb1
-rwxr-xr-xspec/spec_helper_acceptance.rb1
2 files changed, 1 insertions, 1 deletions
diff --git a/spec/acceptance/zip_spec.rb b/spec/acceptance/zip_spec.rb
index 139079e..7e586e2 100755
--- a/spec/acceptance/zip_spec.rb
+++ b/spec/acceptance/zip_spec.rb
@@ -1,6 +1,5 @@
#! /usr/bin/env ruby -S rspec
require 'spec_helper_acceptance'
-require 'puppet'
describe 'zip function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
describe 'success' do
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 89e64d4..27edff8 100755
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,4 +1,5 @@
#! /usr/bin/env ruby -S rspec
+require 'puppet'
require 'beaker-rspec'
require 'beaker/puppet_install_helper'
require 'beaker/module_install_helper'