features/support/env.rb in berkshelf-4.3.5 vs features/support/env.rb in berkshelf-5.0.0
- old
+ new
@@ -24,11 +24,13 @@
Berkshelf::RSpec::ChefServer.stop
Berkshelf::API::RSpec::Server.stop unless windows?
end
Before do
+
# Legacy ENV variables until we can move over to all InProcess
+ Berkshelf.instance_variable_set(:@berkshelf_path, nil)
ENV['BERKSHELF_PATH'] = berkshelf_path.to_s
ENV['BERKSHELF_CONFIG'] = Berkshelf.config.path.to_s
ENV['BERKSHELF_CHEF_CONFIG'] = chef_config_path.to_s
aruba.config.command_launcher = :in_process
@@ -61,9 +63,10 @@
end
Before('@spawn') do
aruba.config.command_launcher = :spawn
+ Berkshelf.instance_variable_set(:@berkshelf_path, nil)
set_environment_variable('BERKSHELF_PATH', berkshelf_path.to_s)
set_environment_variable('BERKSHELF_CONFIG', Berkshelf.config.path.to_s)
set_environment_variable('BERKSHELF_CHEF_CONFIG', chef_config_path.to_s)
end