vendor/rails/activerecord/test/cases/helper.rb in radiant-0.7.2 vs vendor/rails/activerecord/test/cases/helper.rb in radiant-0.8.0

@@ -1,15 +1,22 @@
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
+$:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib')
 
 require 'config'
+
+require 'rubygems'
 require 'test/unit'
+gem 'mocha', '>= 0.9.5'
+require 'mocha'
 
 require 'active_record'
-require 'active_record/fixtures'
 require 'active_record/test_case'
+require 'active_record/fixtures'
 require 'connection'
 
+require 'cases/repair_helper'
+
 # Show backtraces for deprecated behavior for quicker cleanup.
 ActiveSupport::Deprecation.debug = true
 
 # Quote "type" if it's a reserved word for the current connection.
 QUOTED_TYPE = ActiveRecord::Base.connection.quote_column_name('type')
@@ -19,20 +26,12 @@
     ActiveRecord::ConnectionAdapters.const_defined?(type) &&
       ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters.const_get(type))
   end
 end
 
-def uses_mocha(description)
-  require 'rubygems'
-  require 'mocha'
-  yield
-rescue LoadError
-  $stderr.puts "Skipping #{description} tests. `gem install mocha` and try again."
-end
-
 ActiveRecord::Base.connection.class.class_eval do
-  IGNORED_SQL = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/]
+  IGNORED_SQL = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/, /SHOW FIELDS/]
 
   def execute_with_query_record(sql, name = nil, &block)
     $queries_executed ||= []
     $queries_executed << sql unless IGNORED_SQL.any? { |r| sql =~ r }
     execute_without_query_record(sql, name, &block)
@@ -42,6 +41,29 @@
 end
 
 # Make with_scope public for tests
 class << ActiveRecord::Base
   public :with_scope, :with_exclusive_scope
+end
+
+unless ENV['FIXTURE_DEBUG']
+  module ActiveRecord::TestFixtures::ClassMethods
+    def try_to_load_dependency_with_silence(*args)
+      ActiveRecord::Base.logger.silence { try_to_load_dependency_without_silence(*args)}
+    end
+
+    alias_method_chain :try_to_load_dependency, :silence
+  end
+end
+
+class ActiveSupport::TestCase
+  include ActiveRecord::TestFixtures
+  include ActiveRecord::Testing::RepairHelper
+
+  self.fixture_path = FIXTURES_ROOT
+  self.use_instantiated_fixtures  = false
+  self.use_transactional_fixtures = true
+
+  def create_fixtures(*table_names, &block)
+    Fixtures.create_fixtures(ActiveSupport::TestCase.fixture_path, table_names, {}, &block)
+  end
 end