env.rb in berkshelf-1.4.1

- old
+ new

@@ -1,7 +1,5 @@
-ENV['RUBY_ENV'] == 'test'
-
 require 'rubygems'
 require 'bundler'
 require 'spork'
 require "json_spec/cucumber"
 
@@ -10,10 +8,11 @@
   require 'pp'
   require 'aruba/cucumber'
 
   APP_ROOT = File.expand_path('../../../', __FILE__)
 
+  ENV['RUBY_ENV'] = 'test'
   ENV["BERKSHELF_PATH"] = File.join(APP_ROOT, "tmp", "berkshelf")
   ENV["BERKSHELF_CHEF_CONFIG"] = File.join(APP_ROOT, "spec", "knife.rb")
 
   # Workaround for RSA Fingerprint prompt in Travis CI
   git_ssh_path = '/tmp/git_ssh.sh'
@@ -30,9 +29,10 @@
   Dir[File.join(APP_ROOT, "spec/support/**/*.rb")].each {|f| require f}
 
   World(Berkshelf::TestGenerators)
 
   Before do
+    set_env 'RUBY_ENV', 'test'
     clean_cookbook_store
     generate_berks_config(File.join(ENV["BERKSHELF_PATH"], 'config.json'))
     @aruba_io_wait_seconds = 5
     @aruba_timeout_seconds = 16
   end