features/support/env.rb in berkshelf-1.1.6 vs features/support/env.rb in berkshelf-1.2.0.rc1

@@ -5,11 +5,10 @@
 
 Spork.prefork do
   require 'rspec'
   require 'pp'
   require 'aruba/cucumber'
-  require 'vcr'
 
   APP_ROOT = File.expand_path('../../../', __FILE__)
 
   ENV["BERKSHELF_PATH"] = File.join(APP_ROOT, "tmp", "berkshelf")
   ENV["BERKSHELF_CHEF_CONFIG"] = File.join(APP_ROOT, "spec", "knife.rb")
@@ -24,31 +23,27 @@
     git_ssh.close
   end
 
   ENV["GIT_SSH"] = git_ssh_path
 
-
   Dir[File.join(APP_ROOT, "spec/support/**/*.rb")].each {|f| require f}
 
-  Around do |scenario, block|
-    VCR.use_cassette(scenario.name) do
-      block.call
-    end
-  end
+  World(Berkshelf::TestGenerators)
 
   Before do
     clean_cookbook_store
+    generate_berks_config(File.join(ENV["BERKSHELF_PATH"], 'config.json'))
     @aruba_io_wait_seconds = 5
     @aruba_timeout_seconds = 16
   end
 
   Before('@slow_process') do
     @aruba_timeout_seconds = 60
     @aruba_io_wait_seconds = 10
   end
 
   def cookbook_store
-    Pathname.new(File.join(ENV["BERKSHELF_PATH"],"cookbooks"))
+    Pathname.new(File.join(ENV["BERKSHELF_PATH"], "cookbooks"))
   end
 
   def clean_cookbook_store
     FileUtils.rm_rf(cookbook_store)
     FileUtils.mkdir_p(cookbook_store)