features/step_definitions/rails_steps.rb in katapult-0.1.1 vs features/step_definitions/rails_steps.rb in katapult-0.1.2

@@ -1,14 +1,15 @@
 module KatapultRailsHelper
 
   def with_aruba_timeout(timeout, &block)
-    original_aruba_timeout = @aruba_timeout_seconds
-    @aruba_timeout_seconds = timeout
+    original_aruba_timeout = aruba.config.exit_timeout
+    aruba.config.exit_timeout = timeout.to_i
+    # print "(timeout: #{ timeout })"
 
     block.call
   ensure
-    @aruba_timeout_seconds = original_aruba_timeout
+    aruba.config.exit_timeout = original_aruba_timeout
   end
 
   def create_cached_app(name)
     job = 'Cached Rails app generation'
     rails_new_command = "bundle exec rails new #{name} --skip-test-unit --skip-bundle --database mysql"
@@ -36,9 +37,9 @@
       create_cached_app('cached_test_app') unless File.directory?('cached_test_app')
       ensure_bundled('cached_test_app')
     end
 
     # copy cached app to aruba directory
-    FileUtils.cp_r('tmp/cached_test_app', File.join(current_dir, 'katapult_test_app'))
+    FileUtils.cp_r 'tmp/cached_test_app', File.join(expand_path('.'), 'katapult_test_app')
     cd 'katapult_test_app' # Aruba::Api method
   end
 end