@@ -3,6 +3,11 @@ require 'test/unit' require 'active_record' require 'active_record/fixtures' +begin + require 'active_support/test_case' +rescue +end + RAILS_ROOT = File.dirname(__FILE__) unless defined? RAILS_ROOT RAILS_ENV = 'test' unless defined? RAILS_ENV @@ -13,14 +18,22 @@ require File.dirname(__FILE__) + '/../config/solr_environment.rb' models_dir = File.join(File.dirname( __FILE__ ), 'models') Dir[ models_dir + '/*.rb'].each { |m| require m } -Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/" +if defined?(ActiveSupport::TestCase) + class ActiveSupport::TestCase + include ActiveRecord::TestFixtures + self.fixture_path = File.dirname(__FILE__) + "/fixtures/" + end unless ActiveSupport::TestCase.respond_to?(:fixture_path=) +else + Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/" +end class Test::Unit::TestCase def self.fixtures(*table_names) + fixture_path = defined?(ActiveSupport::TestCase) ? ActiveSupport::TestCase.fixture_path : Test::Unit::TestCase.fixture_path if block_given? - Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names) { yield } + Fixtures.create_fixtures(fixture_path, table_names) { yield } else - Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names) + Fixtures.create_fixtures(fixture_path, table_names) end table_names.each do |table_name| clear_from_solr(table_name) test/test_helper.rb 6cacf0d9e5a6a1a70cda0306e13fb1510fce75bf Mathias Meyer meyer@paperplanes.de http://github.com/mattmatt/acts_as_solr/commit/c8be9198439f9d564ad314fe9eb84d9c999020bc c8be9198439f9d564ad314fe9eb84d9c999020bc 2009-03-22T11:35:22-07:00 2009-03-22T11:35:22-07:00 Minor fixes to get the tests working with Rails 2.3. f870135173e1fb967fbdf8fceb9db611c338eb8e Mathias Meyer meyer@paperplanes.de