features/support/env.rb in berkshelf-1.0.4 vs features/support/env.rb in berkshelf-1.1.0.rc1

@@ -10,13 +10,13 @@
   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, "tmp", "knife.rb")
-  
-  # Workaround for RSA Fingerprint prompt in Travis CI 
+  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'
   unless File.exist? git_ssh_path
     git_ssh = File.new(git_ssh_path, 'w+')
     git_ssh.puts "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no $1 $2"
     git_ssh.chmod 0775
@@ -36,10 +36,10 @@
   end
 
   Before do
     clean_cookbook_store
     @aruba_io_wait_seconds = 5
-    @aruba_timeout_seconds = 8
+    @aruba_timeout_seconds = 16
   end
 
   Before('@slow_process') do
     @aruba_timeout_seconds = 60
     @aruba_io_wait_seconds = 10