1 files changed, 25 insertions, 11 deletions

diff --git a/test/test_helper.rb b/test/test_helper.rb
index cda54bc..c494c68 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,6 +1,21 @@
 ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'test_help'
+require 'rails/test_help'
+
+module ActiveRecord
+  class FixtureSet
+    class << self
+      alias_method :original_create_fixtures, :create_fixtures
+      def create_fixtures(*args)
+        original_create_fixtures(*args)
+      rescue => e
+        puts "\nFIXTURE ERROR: #{e.class}: #{e.message}"
+        puts e.backtrace.first(20).join("\n")
+        raise
+      end
+    end
+  end
+end
 
 class ActiveSupport::TestCase
   
@@ -22,14 +37,7 @@ class ActiveSupport::TestCase
   # The only drawback to using transactional fixtures is when you actually 
   # need to test transactions.  Since your test is bracketed by a transaction,
   # any transactions started in your code will be automatically rolled back.
-  self.use_transactional_fixtures = true
-
-  # Instantiated fixtures are slow, but give you @david where otherwise you
-  # would need people(:david).  If you don't want to migrate your existing
-  # test cases which use the @david style and don't mind the speed hit (each
-  # instantiated fixtures translates to a database query per test method),
-  # then set this back to true.
-  self.use_instantiated_fixtures  = false
+  self.use_transactional_tests = true
 
   # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
   #
@@ -38,7 +46,11 @@ class ActiveSupport::TestCase
   fixtures :all
 
   # Add more helper methods to be used by all tests here...
-  
+
+  setup do
+    I18n.locale = I18n.default_locale
+  end
+
   def create_node_with_published_page
     node = create_node_with_draft
     draft = node.draft
@@ -51,6 +63,8 @@ class ActiveSupport::TestCase
   end
   
   def create_node_with_draft
-    Node.root.children.create :slug => "test_node"
+    node = Node.root.children.create! :slug => "test_node"
+    node.reload
+    node
   end
 end