dan-manges-unit_record 0.9.0 → 0.9.1

data/CHANGELOG

@@ -1,4 +1,8 @@
-*HEAD
+*0.9.1*
+
+* Rails 2.3 compatibility
+
+*0.9.0*
 
 * Add association stubbing with mocha
 

data/Rakefile

@@ -25,7 +25,7 @@ require "date"
 gem_spec = Gem::Specification.new do |s|
 	s.name   = "unit_record"
   s.summary = "UnitRecord enables unit testing without hitting the database."
-	s.version = "0.9.0"
+	s.version = "0.9.1"
 	s.author = "Dan Manges"
 	s.description = "UnitRecord enables unit testing without hitting the database."
 	s.email = "daniel.manges@gmail.com"
@@ -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"
@@ -71,8 +71,9 @@ namespace :test do
   end
   
   task :multi_verbose do
-    (RAILS_VERSIONS - %w[2.2.2]).each do |rails_version|
+    (RAILS_VERSIONS - %w[]).each do |rails_version|
       task = defined?(Rcov) ? "rcov" : "test"
+      puts "Testing with Rails #{rails_version}"
       sh "RAILS_VERSION='#{rails_version}' rake #{task}"
     end
   end

data/lib/unit_record.rb

@@ -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

data/lib/unit_record/disconnected_active_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")

data/test/sample_spec.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"}}

data/test/test_helper.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?

data/test/unit_record/controller_test.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
 

data/test/unit_record/disconnected_test_case_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

data/test/unit_record/unit_record_test.rb

@@ -0,0 +1,14 @@
+require File.dirname(__FILE__) + "/../test_helper"
+
+unit_tests do
+  if UnitRecord.rails_version > "2.3"
+    test "test case base class" do
+      assert_equal ActiveSupport::TestCase, UnitRecord.base_rails_test_class
+    end
+  else
+    test "test case base class" do
+      assert_equal Test::Unit::TestCase, UnitRecord.base_rails_test_class
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dan-manges-unit_record
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Dan Manges
@@ -9,7 +9,7 @@ autorequire: unit_record
 bindir: bin
 cert_chain: []
 
-date: 2008-12-15 00:00:00 -08:00
+date: 2009-04-22 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -23,42 +23,43 @@ extra_rdoc_files: []
 
 files: 
 - lib/active_record/connection_adapters/unit_record_adapter.rb
-- lib/unit_record/association_stubbing.rb
-- lib/unit_record/column_extension.rb
+- lib/unit_record.rb
 - lib/unit_record/disconnected_active_record.rb
-- lib/unit_record/disconnected_fixtures.rb
 - lib/unit_record/disconnected_test_case.rb
-- lib/unit_record.rb
+- lib/unit_record/column_extension.rb
+- lib/unit_record/disconnected_fixtures.rb
+- lib/unit_record/association_stubbing.rb
+- test/test_helper.rb
 - test/active_record/connection_adapters/unit_record_adapter_test.rb
 - test/db/schema.rb
 - test/sample_spec.rb
-- test/test_helper.rb
-- test/unit_record/association_stubbing_test.rb
-- test/unit_record/column_cacher_test.rb
-- test/unit_record/column_extension_test.rb
+- test/unit_record/disconnected_test_case_test.rb
 - test/unit_record/column_test.rb
-- test/unit_record/controller_test.rb
+- test/unit_record/column_cacher_test.rb
+- test/unit_record/unit_record_test.rb
 - test/unit_record/disconnected_active_record_test.rb
+- test/unit_record/association_stubbing_test.rb
+- test/unit_record/controller_test.rb
+- test/unit_record/column_extension_test.rb
 - test/unit_record/disconnected_fixtures_test.rb
-- test/unit_record/disconnected_test_case_test.rb
-- vendor/dust-0.1.6/lib/array_extension.rb
-- vendor/dust-0.1.6/lib/definition_error.rb
+- vendor/dust-0.1.6/rakefile.rb
+- vendor/dust-0.1.6/test/test_helper.rb
+- vendor/dust-0.1.6/test/passing_unit_test.rb
+- vendor/dust-0.1.6/test/failing_with_helper_unit_test.rb
+- vendor/dust-0.1.6/test/failing_with_setup_unit_test.rb
+- vendor/dust-0.1.6/test/passing_with_setup_unit_test.rb
+- vendor/dust-0.1.6/test/all_tests.rb
+- vendor/dust-0.1.6/test/passing_with_helpers_unit_test.rb
+- vendor/dust-0.1.6/test/passing_with_helper_unit_test.rb
+- vendor/dust-0.1.6/test/functional_test.rb
 - vendor/dust-0.1.6/lib/dust.rb
-- vendor/dust-0.1.6/lib/nil_extension.rb
+- vendor/dust-0.1.6/lib/definition_error.rb
 - vendor/dust-0.1.6/lib/object_extension.rb
 - vendor/dust-0.1.6/lib/string_extension.rb
+- vendor/dust-0.1.6/lib/array_extension.rb
 - vendor/dust-0.1.6/lib/symbol_extension.rb
 - vendor/dust-0.1.6/lib/test_case_extension.rb
-- vendor/dust-0.1.6/rakefile.rb
-- vendor/dust-0.1.6/test/all_tests.rb
-- vendor/dust-0.1.6/test/failing_with_helper_unit_test.rb
-- vendor/dust-0.1.6/test/failing_with_setup_unit_test.rb
-- vendor/dust-0.1.6/test/functional_test.rb
-- vendor/dust-0.1.6/test/passing_unit_test.rb
-- vendor/dust-0.1.6/test/passing_with_helper_unit_test.rb
-- vendor/dust-0.1.6/test/passing_with_helpers_unit_test.rb
-- vendor/dust-0.1.6/test/passing_with_setup_unit_test.rb
-- vendor/dust-0.1.6/test/test_helper.rb
+- vendor/dust-0.1.6/lib/nil_extension.rb
 - CHANGELOG
 - LICENSE
 - README.markdown