test/unit_record/unit_record_test.rb @@ -1,4 +1,4 @@ doc pkg *.gem - +.treasure_map.rb \ No newline at end of file .gitignore @@ -59,7 +59,7 @@ task :readme do sh "open #{file}" end -RAILS_VERSIONS = %w[1.2.6 2.0.2 2.1.0 2.1.1 2.2.2] +RAILS_VERSIONS = %w[1.2.6 2.0.2 2.1.0 2.1.1 2.2.2 2.3.1] namespace :test do desc "test with multiple versions of rails" Rakefile @@ -1,3 +1,16 @@ +module UnitRecord + def self.rails_version + Rails::VERSION::STRING + end + + def self.base_rails_test_class + if rails_version >= "2.3.1" + ActiveSupport::TestCase + else + Test::Unit::TestCase + end + end +end require "unit_record/association_stubbing" require "unit_record/column_extension" require "unit_record/disconnected_active_record" @@ -9,7 +22,7 @@ require "active_record/fixtures" ActiveRecord::ConnectionAdapters::Column.send :include, UnitRecord::ColumnExtension ActiveRecord::Base.extend UnitRecord::DisconnectedActiveRecord -Test::Unit::TestCase.extend UnitRecord::DisconnectedTestCase +UnitRecord.base_rails_test_class.extend UnitRecord::DisconnectedTestCase Fixtures.extend UnitRecord::DisconnectedFixtures ActiveRecord::Base.class_eval do lib/unit_record.rb @@ -11,7 +11,7 @@ module UnitRecord ActiveRecord::Base.send :include, UnitRecord::AssociationStubbing end Fixtures.disconnect! - Test::Unit::TestCase.disconnect! + UnitRecord.base_rails_test_class.disconnect! ActiveRecord::Migration.verbose = false ActiveRecord::Base.connection.change_strategy(:noop) do load(RAILS_ROOT + "/db/schema.rb") lib/unit_record/disconnected_active_record.rb @@ -19,6 +19,10 @@ require "action_controller/test_process" require "unit_record" +if UnitRecord.rails_version >= "2.3" + ActiveSupport::TestCase.class_eval { include ActiveRecord::TestFixtures } +end + # Needed because of this line in setup_with_fixtures and teardown_with_fixtures: # return unless defined?(ActiveRecord::Base) && !ActiveRecord::Base.configurations.blank? ActiveRecord::Base.configurations = {"irrelevant" => {:adapter => "stub"}} test/sample_spec.rb @@ -32,7 +32,12 @@ Test::Unit::TestCase.disallow_setup! $LOAD_PATH << File.dirname(__FILE__) + "/../lib" require "unit_record" -Test::Unit::TestCase.use_transactional_fixtures = true +if UnitRecord.rails_version >= "2.3" + require "active_support/test_case" + ActiveSupport::TestCase.class_eval { include ActiveRecord::TestFixtures } +end + +UnitRecord.base_rails_test_class.use_transactional_fixtures = true # Needed because of this line in setup_with_fixtures and teardown_with_fixtures: # return unless defined?(ActiveRecord::Base) && !ActiveRecord::Base.configurations.blank? test/test_helper.rb @@ -18,8 +18,10 @@ if defined?(ActionController::TestCase) # Rails 2 assert_equal "OK", @response.body end - test "sql caching is enabled" do - assert_equal true, (SampleController < ActionController::Caching::SqlCache) + if defined?(ActionController::Caching::SqlCache) # SqlCache goes away in Rails 2.3.1 + test "sql caching is enabled" do + assert_equal true, (SampleController < ActionController::Caching::SqlCache) + end end end test/unit_record/controller_test.rb @@ -2,13 +2,13 @@ require File.dirname(__FILE__) + "/../test_helper" functional_tests do test "use_transactional_fixtures is false" do - assert_equal false, Test::Unit::TestCase.use_transactional_fixtures + assert_equal false, UnitRecord.base_rails_test_class.use_transactional_fixtures end test "trying to use fixtures gives useful message" do exception = nil begin - Class.new(Test::Unit::TestCase) do + Class.new(UnitRecord.base_rails_test_class) do fixtures :users end rescue => exception test/unit_record/disconnected_test_case_test.rb 59b6451745bd4ec8411d6707797e72388fcaffb0 Rob Sanheim rsanheim@gmail.com http://github.com/dan-manges/unit-record/commit/b4c289ac55daf98b4fb0ec06d09a75c6a26bc55a b4c289ac55daf98b4fb0ec06d09a75c6a26bc55a 2009-03-07T00:26:19-08:00 2009-03-07T00:26:19-08:00 Rails 2.3.1 compatibility e98ee4bb3f16850b41d9acaf3d4ce7e4ee0171be Rob Sanheim rsanheim@gmail.com