make all features pass

mipearson · May 23, 2011 · cbcfd88 · cbcfd88
1 parent e1b7a96
commit cbcfd88
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/lib/cucumber/rails/hooks.rb b/lib/cucumber/rails/hooks.rb
@@ -1,3 +1,4 @@
+require 'cucumber/rails/hooks/active_record'
 require 'cucumber/rails/hooks/database_cleaner'
 require 'cucumber/rails/hooks/allow_rescue'
 require 'cucumber/rails/hooks/mail'
diff --git a/lib/cucumber/rails/hooks/active_record.rb b/lib/cucumber/rails/hooks/active_record.rb
@@ -0,0 +1,14 @@
+if defined?(ActiveRecord::Base)
+  require 'cucumber/rails3/active_record'
+
+  Before('@javascript') do
+    # Forces all threads to share the same connection. This works on
+    # Capybara because it starts the web server in a thread.
+    ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
+  end
+
+  Before('~@javascript') do
+    # Do not use a shared connection unless we're in a @javascript scenario
+    ActiveRecord::Base.shared_connection = nil
+  end
+end
diff --git a/lib/cucumber/rails3.rb b/lib/cucumber/rails3.rb
@@ -6,7 +6,6 @@
 
 if defined?(ActiveRecord::Base)
   require 'rails/test_help'
-  require 'cucumber/rails3/active_record'
 else
   require 'action_dispatch/testing/test_process'
   require 'action_dispatch/testing/integration'

diff --git a/lib/cucumber/rails3/active_record.rb b/lib/cucumber/rails3/active_record.rb
@@ -6,7 +6,3 @@ def self.connection
     @@shared_connection || retrieve_connection
   end
 end
-
-# Forces all threads to share the same connection. This works on
-# Capybara because it starts the web server in a thread.
-ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection