Merge pull request puppetlabs#80 from eimlav/modules-8717

david22swan · web-flow · commit 64e12b3b74f9 · 2019-03-04T16:45:53.000Z
(MODULES-8717) Fix dependency issue with BoltSpec
diff --git a/spec/acceptance/init_spec.rb b/spec/acceptance/init_spec.rb
@@ -1,7 +1,5 @@
 # run a test task
 require 'spec_helper_acceptance'
-require 'beaker-task_helper/inventory'
-require 'bolt_spec/run'
 
 describe 'service task' do
   include Beaker::TaskHelper::Inventory
diff --git a/spec/acceptance/linux_spec.rb b/spec/acceptance/linux_spec.rb
@@ -1,7 +1,5 @@
 # run a test task
 require 'spec_helper_acceptance'
-require 'beaker-task_helper/inventory'
-require 'bolt_spec/run'
 
 describe 'linux service task', unless: fact('osfamily') == 'windows' do
   include Beaker::TaskHelper::Inventory
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -1,3 +1,5 @@
+require 'beaker-task_helper/inventory'
+require 'bolt_spec/run'
 require 'beaker-pe'
 require 'beaker-puppet'
 require 'puppet'

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+require 'beaker-task_helper/inventory'`
	`2`	`+require 'bolt_spec/run'`
`1`	`3`	`require 'beaker-pe'`
`2`	`4`	`require 'beaker-puppet'`
`3`	`5`	`require 'puppet'`