summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaula McMaw <paula@puppet.com>2017-02-21 10:54:34 +0000
committerGitHub <noreply@github.com>2017-02-21 10:54:34 +0000
commit8b510120701769258f8b58807953daaf3e73ced9 (patch)
treef8675b7aa81395d725a991b67d30f8497033b247
parente64a9d697838d44c01afb5b6cd88c2e3a729f285 (diff)
parent2c6c2ff62db3cb9ee3b8bf755f66da4918783d28 (diff)
Merge pull request #720 from DavidS/fix-hiera-is-not-a-class
Fix acceptance test failure "Hiera is not a class"
-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'