1 files changed, 83 insertions, 1 deletions

diff --git a/test/test_helper.rb b/test/test_helper.rb
index cda54bc8..27e1f0db 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,6 +1,88 @@
 ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'test_help'
+require 'rails/test_help'
+
+module ActiveRecord
+  class Fixtures
+    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 Integer
+  def days
+    ActiveSupport::Duration.new(self * 86400, [[:days, self]])
+  end
+  alias :day :days
+
+  def weeks
+    ActiveSupport::Duration.new(self * 7 * 86400, [[:days, self * 7]])
+  end
+  alias :week :weeks
+
+  def hours
+    ActiveSupport::Duration.new(self * 3600, [[:seconds, self * 3600]])
+  end
+  alias :hour :hours
+
+  def minutes
+    ActiveSupport::Duration.new(self * 60, [[:seconds, self * 60]])
+  end
+  alias :minute :minutes
+
+  def seconds
+    ActiveSupport::Duration.new(self, [[:seconds, self]])
+  end
+  alias :second :seconds
+
+  def months
+    ActiveSupport::Duration.new(self * 30 * 86400, [[:months, self]])
+  end
+  alias :month :months
+
+  def years
+    ActiveSupport::Duration.new((self * 365.25 * 86400).to_i, [[:years, self]])
+  end
+  alias :year :years
+end
+
+class Float
+  def days
+    ActiveSupport::Duration.new((self * 86400).to_i, [[:days, self]])
+  end
+  alias :day :days
+
+  def hours
+    ActiveSupport::Duration.new((self * 3600).to_i, [[:seconds, (self * 3600).to_i]])
+  end
+  alias :hour :hours
+
+  def minutes
+    ActiveSupport::Duration.new((self * 60).to_i, [[:seconds, (self * 60).to_i]])
+  end
+  alias :minute :minutes
+end
+
+require 'arel'
+module Arel
+  module Visitors
+    [ToSql, DepthFirst].each do |visitor|
+      visitor.class_eval do
+        def visit_Integer(o, collector = nil)
+          collector ? collector << o.to_s : o.to_s
+        end
+      end
+    end
+  end
+end
 
 class ActiveSupport::TestCase