Remove unneeded aruba patches.

myronmarston · Aug 22, 2011 · b552b07 · b552b07
1 parent 659ab15
commit b552b07
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 48 deletions.
diff --git a/features/support/aruba_workaround/aruba_patches.rb b/features/support/aruba_workaround/aruba_patches.rb
diff --git a/features/support/aruba_workaround/background_process.rb b/features/support/aruba_workaround/background_process.rb
diff --git a/features/support/env.rb b/features/support/env.rb
@@ -2,14 +2,7 @@
 require 'bundler'
 Bundler.setup
 
-# Current version of aruba won't run on JRuby or Rubinius due to
-# dependency on background_process.  We have a work around to fix this.
-NEEDS_ARUBA_FIX = defined?(RUBY_ENGINE) && %w[ jruby rbx ].include?(RUBY_ENGINE)
-
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/aruba_workaround' if NEEDS_ARUBA_FIX
-
-require 'aruba'
-require 'aruba_patches' if NEEDS_ARUBA_FIX
+require 'aruba/cucumber'
 
 Before do
   this_dir = File.dirname(__FILE__)