From bd3122381e62720113b04fc7547e9ae0037e4b0f Mon Sep 17 00:00:00 2001 From: Lightning Date: Wed, 29 May 2024 14:24:10 +0200 Subject: [PATCH] update spec/spec_helper_acceptance.rb fix order of requires/includes/configures to properly provide facts for spec_helper_acceptance_local.rb --- spec/spec_helper_acceptance.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index ed7412a..71f3a19 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -2,8 +2,8 @@ require 'serverspec' require 'puppet_litmus' -require 'spec_helper_acceptance_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_acceptance_local.rb')) include PuppetLitmus +PuppetLitmus.configure! if ENV['TARGET_HOST'].nil? || ENV['TARGET_HOST'] == 'localhost' puts 'Running tests against this machine !' @@ -79,3 +79,5 @@ Specinfra.configuration.winrm = winrm end end + +require 'spec_helper_acceptance_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_acceptance_local.rb'))