From dc213a9f783d8d735b2a53babc9aaa34e136f4a2 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Mon, 28 Dec 2009 04:10:43 +0100
Subject: [PATCH] New locations of needed files

---
 lib/cucumber/rails/world.rb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/cucumber/rails/world.rb b/lib/cucumber/rails/world.rb
index 2f6e9b50..17f2da16 100644
--- a/lib/cucumber/rails/world.rb
+++ b/lib/cucumber/rails/world.rb
@@ -1,8 +1,15 @@
 if defined?(ActiveRecord::Base)
   require 'test_help' 
 else
-  require 'action_controller/test_process'
-  require 'action_controller/integration'
+  # I can't do rescue LoadError because in this files could be loaded
+  # from rails gem (ie. load actionpack 2.3.5 if rubygems are not disabled)
+  if Rails.version.to_f <= 3.0
+    require 'action_controller/test_process'
+    require 'action_controller/integration'
+  else
+    require 'action_dispatch/testing/test_process'
+    require 'action_dispatch/testing/integration'
+  end
 end
 
 require 'cucumber/rails/test_unit'