activerecord 2.0.5 → 2.1.0

data/test/{fixtures_test.rb → cases/fixtures_test.rb}

@@ -1,22 +1,22 @@
-require 'abstract_unit'
-require 'fixtures/post'
-require 'fixtures/binary'
-require 'fixtures/topic'
-require 'fixtures/computer'
-require 'fixtures/developer'
-require 'fixtures/company'
-require 'fixtures/task'
-require 'fixtures/reply'
-require 'fixtures/joke'
-require 'fixtures/course'
-require 'fixtures/category'
-require 'fixtures/parrot'
-require 'fixtures/pirate'
-require 'fixtures/treasure'
-require 'fixtures/matey'
-require 'fixtures/ship'
-
-class FixturesTest < Test::Unit::TestCase
+require "cases/helper"
+require 'models/post'
+require 'models/binary'
+require 'models/topic'
+require 'models/computer'
+require 'models/developer'
+require 'models/company'
+require 'models/task'
+require 'models/reply'
+require 'models/joke'
+require 'models/course'
+require 'models/category'
+require 'models/parrot'
+require 'models/pirate'
+require 'models/treasure'
+require 'models/matey'
+require 'models/ship'
+
+class FixturesTest < ActiveRecord::TestCase
   self.use_instantiated_fixtures = true
   self.use_transactional_fixtures = false
 
@@ -27,8 +27,6 @@ class FixturesTest < Test::Unit::TestCase
                  movies projects subscribers topics tasks )
   MATCH_ATTRIBUTE_NAME = /[a-zA-Z][-_\w]*/
 
-  BINARY_FIXTURE_PATH = File.dirname(__FILE__) + '/fixtures/flowers.jpg'
-
   def test_clean_fixtures
     FIXTURES.each do |name|
       fixtures = nil
@@ -98,6 +96,10 @@ class FixturesTest < Test::Unit::TestCase
 
       second_row = ActiveRecord::Base.connection.select_one("SELECT * FROM prefix_topics_suffix WHERE author_name = 'Mary'")
       assert_nil(second_row["author_email_address"])
+
+      # This checks for a caching problem which causes a bug in the fixtures 
+      # class-level configuration helper.
+      assert_not_nil topics, "Fixture data inserted, but fixture objects not returned from create"
     ensure
       # Restore prefix/suffix to its previous values
       ActiveRecord::Base.table_name_prefix = old_prefix
@@ -113,22 +115,6 @@ class FixturesTest < Test::Unit::TestCase
     assert first
   end
 
-  def test_bad_format
-    path = File.join(File.dirname(__FILE__), 'fixtures', 'bad_fixtures')
-    Dir.entries(path).each do |file|
-      next unless File.file?(file) and file !~ Fixtures::DEFAULT_FILTER_RE
-      assert_raise(Fixture::FormatError) {
-        Fixture.new(bad_fixtures_path, file)
-      }
-    end
-  end
-
-  def test_deprecated_yaml_extension
-    assert_raise(Fixture::FormatError) {
-      Fixtures.new(nil, 'bad_extension', 'BadExtension', File.join(File.dirname(__FILE__), 'fixtures'))
-    }
-  end
-
   def test_logger_level_invariant
     level = ActiveRecord::Base.logger.level
     create_fixtures('topics')
@@ -141,7 +127,7 @@ class FixturesTest < Test::Unit::TestCase
   end
 
   def test_complete_instantiation
-    assert_equal 2, @topics.size
+    assert_equal 4, @topics.size
     assert_equal "The First Topic", @first.title
   end
 
@@ -156,26 +142,26 @@ class FixturesTest < Test::Unit::TestCase
   end
 
   def test_empty_yaml_fixture
-    assert_not_nil Fixtures.new( Account.connection, "accounts", 'Account', File.dirname(__FILE__) + "/fixtures/naked/yml/accounts")
+    assert_not_nil Fixtures.new( Account.connection, "accounts", 'Account', FIXTURES_ROOT + "/naked/yml/accounts")
   end
 
   def test_empty_yaml_fixture_with_a_comment_in_it
-    assert_not_nil Fixtures.new( Account.connection, "companies", 'Company', File.dirname(__FILE__) + "/fixtures/naked/yml/companies")
+    assert_not_nil Fixtures.new( Account.connection, "companies", 'Company', FIXTURES_ROOT + "/naked/yml/companies")
   end
 
   def test_dirty_dirty_yaml_file
     assert_raises(Fixture::FormatError) do
-      Fixtures.new( Account.connection, "courses", 'Course', File.dirname(__FILE__) + "/fixtures/naked/yml/courses")
+      Fixtures.new( Account.connection, "courses", 'Course', FIXTURES_ROOT + "/naked/yml/courses")
     end
   end
 
   def test_empty_csv_fixtures
-    assert_not_nil Fixtures.new( Account.connection, "accounts", 'Account', File.dirname(__FILE__) + "/fixtures/naked/csv/accounts")
+    assert_not_nil Fixtures.new( Account.connection, "accounts", 'Account', FIXTURES_ROOT + "/naked/csv/accounts")
   end
 
   def test_omap_fixtures
     assert_nothing_raised do
-      fixtures = Fixtures.new(Account.connection, 'categories', 'Category', File.dirname(__FILE__) + '/fixtures/categories_ordered')
+      fixtures = Fixtures.new(Account.connection, 'categories', 'Category', FIXTURES_ROOT + "/categories_ordered")
 
       i = 0
       fixtures.each do |name, fixture|
@@ -198,13 +184,15 @@ class FixturesTest < Test::Unit::TestCase
 
   def test_binary_in_fixtures
     assert_equal 1, @binaries.size
-    data = File.open(BINARY_FIXTURE_PATH, "rb").read.freeze
+    data = File.read(ASSETS_ROOT + "/flowers.jpg")
+    data.force_encoding('ASCII-8BIT') if data.respond_to?(:force_encoding)
+    data.freeze
     assert_equal data, @flowers.data
   end
 end
 
 if Account.connection.respond_to?(:reset_pk_sequence!)
-  class FixturesResetPkSequenceTest < Test::Unit::TestCase
+  class FixturesResetPkSequenceTest < ActiveRecord::TestCase
     fixtures :accounts
     fixtures :companies
 
@@ -250,7 +238,7 @@ if Account.connection.respond_to?(:reset_pk_sequence!)
   end
 end
 
-class FixturesWithoutInstantiationTest < Test::Unit::TestCase
+class FixturesWithoutInstantiationTest < ActiveRecord::TestCase
   self.use_instantiated_fixtures = false
   fixtures :topics, :developers, :accounts
 
@@ -285,7 +273,7 @@ class FixturesWithoutInstantiationTest < Test::Unit::TestCase
   end
 end
 
-class FixturesWithoutInstanceInstantiationTest < Test::Unit::TestCase
+class FixturesWithoutInstanceInstantiationTest < ActiveRecord::TestCase
   self.use_instantiated_fixtures = true
   self.use_instantiated_fixtures = :no_instances
 
@@ -299,7 +287,7 @@ class FixturesWithoutInstanceInstantiationTest < Test::Unit::TestCase
   end
 end
 
-class TransactionalFixturesTest < Test::Unit::TestCase
+class TransactionalFixturesTest < ActiveRecord::TestCase
   self.use_instantiated_fixtures = true
   self.use_transactional_fixtures = true
 
@@ -315,7 +303,7 @@ class TransactionalFixturesTest < Test::Unit::TestCase
   end
 end
 
-class MultipleFixturesTest < Test::Unit::TestCase
+class MultipleFixturesTest < ActiveRecord::TestCase
   fixtures :topics
   fixtures :developers, :accounts
 
@@ -324,13 +312,13 @@ class MultipleFixturesTest < Test::Unit::TestCase
   end
 end
 
-class SetupTest < Test::Unit::TestCase
+class SetupTest < ActiveRecord::TestCase
   # fixtures :topics
-  
+
   def setup
     @first = true
   end
-  
+
   def test_nothing
   end
 end
@@ -340,7 +328,7 @@ class SetupSubclassTest < SetupTest
     super
     @second = true
   end
-  
+
   def test_subclassing_should_preserve_setups
     assert @first
     assert @second
@@ -348,7 +336,7 @@ class SetupSubclassTest < SetupTest
 end
 
 
-class OverlappingFixturesTest < Test::Unit::TestCase
+class OverlappingFixturesTest < ActiveRecord::TestCase
   fixtures :topics, :developers
   fixtures :developers, :accounts
 
@@ -357,7 +345,7 @@ class OverlappingFixturesTest < Test::Unit::TestCase
   end
 end
 
-class ForeignKeyFixturesTest < Test::Unit::TestCase
+class ForeignKeyFixturesTest < ActiveRecord::TestCase
   fixtures :fk_test_has_pk, :fk_test_has_fk
 
   # if foreign keys are implemented and fixtures
@@ -373,18 +361,24 @@ class ForeignKeyFixturesTest < Test::Unit::TestCase
   end
 end
 
-class SetTableNameFixturesTest < Test::Unit::TestCase
+class CheckSetTableNameFixturesTest < ActiveRecord::TestCase
   set_fixture_class :funny_jokes => 'Joke'
   fixtures :funny_jokes
+  # Set to false to blow away fixtures cache and ensure our fixtures are loaded 
+  # and thus takes into account our set_fixture_class
+  self.use_transactional_fixtures = false
 
   def test_table_method
     assert_kind_of Joke, funny_jokes(:a_joke)
   end
 end
 
-class CustomConnectionFixturesTest < Test::Unit::TestCase
+class CustomConnectionFixturesTest < ActiveRecord::TestCase
   set_fixture_class :courses => Course
   fixtures :courses
+  # Set to false to blow away fixtures cache and ensure our fixtures are loaded 
+  # and thus takes into account our set_fixture_class
+  self.use_transactional_fixtures = false
 
   def test_connection
     assert_kind_of Course, courses(:ruby)
@@ -392,8 +386,11 @@ class CustomConnectionFixturesTest < Test::Unit::TestCase
   end
 end
 
-class InvalidTableNameFixturesTest < Test::Unit::TestCase
+class InvalidTableNameFixturesTest < ActiveRecord::TestCase
   fixtures :funny_jokes
+  # Set to false to blow away fixtures cache and ensure our fixtures are loaded 
+  # and thus takes into account our lack of set_fixture_class
+  self.use_transactional_fixtures = false
 
   def test_raises_error
     assert_raises FixtureClassNotFound do
@@ -402,9 +399,12 @@ class InvalidTableNameFixturesTest < Test::Unit::TestCase
   end
 end
 
-class CheckEscapedYamlFixturesTest < Test::Unit::TestCase
+class CheckEscapedYamlFixturesTest < ActiveRecord::TestCase
   set_fixture_class :funny_jokes => 'Joke'
   fixtures :funny_jokes
+  # Set to false to blow away fixtures cache and ensure our fixtures are loaded 
+  # and thus takes into account our set_fixture_class
+  self.use_transactional_fixtures = false
 
   def test_proper_escaped_fixture
     assert_equal "The \\n Aristocrats\nAte the candy\n", funny_jokes(:another_joke).name
@@ -412,7 +412,7 @@ class CheckEscapedYamlFixturesTest < Test::Unit::TestCase
 end
 
 class DevelopersProject; end
-class ManyToManyFixturesWithClassDefined < Test::Unit::TestCase
+class ManyToManyFixturesWithClassDefined < ActiveRecord::TestCase
   fixtures :developers_projects
 
   def test_this_should_run_cleanly
@@ -420,22 +420,22 @@ class ManyToManyFixturesWithClassDefined < Test::Unit::TestCase
   end
 end
 
-class FixturesBrokenRollbackTest < Test::Unit::TestCase
+class FixturesBrokenRollbackTest < ActiveRecord::TestCase
   def blank_setup; end
-  alias_method :ar_setup_with_fixtures, :setup_with_fixtures
-  alias_method :setup_with_fixtures, :blank_setup
+  alias_method :ar_setup_fixtures, :setup_fixtures
+  alias_method :setup_fixtures, :blank_setup
   alias_method :setup, :blank_setup
 
   def blank_teardown; end
-  alias_method :ar_teardown_with_fixtures, :teardown_with_fixtures
-  alias_method :teardown_with_fixtures, :blank_teardown
+  alias_method :ar_teardown_fixtures, :teardown_fixtures
+  alias_method :teardown_fixtures, :blank_teardown
   alias_method :teardown, :blank_teardown
 
   def test_no_rollback_in_teardown_unless_transaction_active
     assert_equal 0, Thread.current['open_transactions']
-    assert_raise(RuntimeError) { ar_setup_with_fixtures }
+    assert_raise(RuntimeError) { ar_setup_fixtures }
     assert_equal 0, Thread.current['open_transactions']
-    assert_nothing_raised { ar_teardown_with_fixtures }
+    assert_nothing_raised { ar_teardown_fixtures }
     assert_equal 0, Thread.current['open_transactions']
   end
 
@@ -445,8 +445,8 @@ class FixturesBrokenRollbackTest < Test::Unit::TestCase
     end
 end
 
-class LoadAllFixturesTest < Test::Unit::TestCase
-  self.fixture_path= File.join(File.dirname(__FILE__), '/fixtures/all')
+class LoadAllFixturesTest < ActiveRecord::TestCase
+  self.fixture_path = FIXTURES_ROOT + "/all"
   fixtures :all
 
   def test_all_there
@@ -454,7 +454,7 @@ class LoadAllFixturesTest < Test::Unit::TestCase
   end
 end
 
-class FasterFixturesTest < Test::Unit::TestCase
+class FasterFixturesTest < ActiveRecord::TestCase
   fixtures :categories, :authors
 
   def load_extra_fixture(name)
@@ -479,7 +479,7 @@ class FasterFixturesTest < Test::Unit::TestCase
   end
 end
 
-class FoxyFixturesTest < Test::Unit::TestCase
+class FoxyFixturesTest < ActiveRecord::TestCase
   fixtures :parrots, :parrots_pirates, :pirates, :treasures, :mateys, :ships, :computers, :developers
 
   def test_identifies_strings
@@ -599,7 +599,7 @@ class FoxyFixturesTest < Test::Unit::TestCase
   end
 end
 
-class ActiveSupportSubclassWithFixturesTest < ActiveSupport::TestCase
+class ActiveSupportSubclassWithFixturesTest < ActiveRecord::TestCase
   fixtures :parrots
 
   # This seemingly useless assertion catches a bug that caused the fixtures
@@ -608,3 +608,19 @@ class ActiveSupportSubclassWithFixturesTest < ActiveSupport::TestCase
     assert_equal parrots(:louis), Parrot.find_by_name("King Louis")
   end
 end
+
+class FixtureLoadingTest < ActiveRecord::TestCase
+  uses_mocha 'reloading_fixtures_through_accessor_methods' do
+    def test_logs_message_for_failed_dependency_load
+      Test::Unit::TestCase.expects(:require_dependency).with(:does_not_exist).raises(LoadError)
+      ActiveRecord::Base.logger.expects(:warn)
+      Test::Unit::TestCase.try_to_load_dependency(:does_not_exist)
+    end
+
+    def test_does_not_logs_message_for_successful_dependency_load
+      Test::Unit::TestCase.expects(:require_dependency).with(:works_out_fine)
+      ActiveRecord::Base.logger.expects(:warn).never
+      Test::Unit::TestCase.try_to_load_dependency(:works_out_fine)
+    end
+  end
+end

data/test/cases/helper.rb

@@ -0,0 +1,47 @@
+$:.unshift(File.dirname(__FILE__) + '/../../lib')
+
+require 'config'
+require 'test/unit'
+
+require 'active_record'
+require 'active_record/fixtures'
+require 'active_record/test_case'
+require 'connection'
+
+# 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')
+
+def current_adapter?(*types)
+  types.any? do |type|
+    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/]
+
+  def execute_with_counting(sql, name = nil, &block)
+    $query_count ||= 0
+    $query_count  += 1 unless IGNORED_SQL.any? { |r| sql =~ r }
+    execute_without_counting(sql, name, &block)
+  end
+
+  alias_method_chain :execute, :counting
+end
+
+# Make with_scope public for tests
+class << ActiveRecord::Base
+  public :with_scope, :with_exclusive_scope
+end

data/test/{inheritance_test.rb → cases/inheritance_test.rb}

@@ -1,11 +1,55 @@
-require 'abstract_unit'
-require 'fixtures/company'
-require 'fixtures/project'
-require 'fixtures/subscriber'
+require "cases/helper"
+require 'models/company'
+require 'models/project'
+require 'models/subscriber'
 
-class InheritanceTest < Test::Unit::TestCase
+class InheritanceTest < ActiveRecord::TestCase
   fixtures :companies, :projects, :subscribers, :accounts
 
+  def test_class_with_store_full_sti_class_returns_full_name
+    old = ActiveRecord::Base.store_full_sti_class
+    ActiveRecord::Base.store_full_sti_class = true
+    assert_equal 'Namespaced::Company', Namespaced::Company.sti_name
+  ensure
+    ActiveRecord::Base.store_full_sti_class = old
+  end
+
+  def test_class_without_store_full_sti_class_returns_demodulized_name
+    old = ActiveRecord::Base.store_full_sti_class
+    ActiveRecord::Base.store_full_sti_class = false
+    assert_equal 'Company', Namespaced::Company.sti_name
+  ensure
+    ActiveRecord::Base.store_full_sti_class = old
+  end
+
+  def test_should_store_demodulized_class_name_with_store_full_sti_class_option_disabled
+    old = ActiveRecord::Base.store_full_sti_class
+    ActiveRecord::Base.store_full_sti_class = false
+    item = Namespaced::Company.new
+    assert_equal 'Company', item[:type]
+  ensure
+    ActiveRecord::Base.store_full_sti_class = old
+  end
+  
+  def test_should_store_full_class_name_with_store_full_sti_class_option_enabled
+    old = ActiveRecord::Base.store_full_sti_class
+    ActiveRecord::Base.store_full_sti_class = true
+    item = Namespaced::Company.new
+    assert_equal 'Namespaced::Company', item[:type]
+  ensure
+    ActiveRecord::Base.store_full_sti_class = old
+  end
+  
+  def test_different_namespace_subclass_should_load_correctly_with_store_full_sti_class_option
+    old = ActiveRecord::Base.store_full_sti_class
+    ActiveRecord::Base.store_full_sti_class = true
+    item = Namespaced::Company.create :name => "Wolverine 2"
+    assert_not_nil Company.find(item.id)
+    assert_not_nil Namespaced::Company.find(item.id)
+  ensure
+    ActiveRecord::Base.store_full_sti_class = old
+  end
+
   def test_company_descends_from_active_record
     assert_raise(NoMethodError) { ActiveRecord::Base.descends_from_active_record? }
     assert AbstractCompany.descends_from_active_record?, 'AbstractCompany should descend from ActiveRecord::Base'
@@ -33,7 +77,7 @@ class InheritanceTest < Test::Unit::TestCase
     assert Company.find(2).kind_of?(Client), "Summit should be a client"
     assert Client.find(2).kind_of?(Client), "Summit should be a client"
   end
-  
+
   def test_alt_inheritance_find
     switch_to_alt_inheritance_column
     test_inheritance_find
@@ -45,7 +89,7 @@ class InheritanceTest < Test::Unit::TestCase
     assert companies[0].kind_of?(Firm), "37signals should be a firm"
     assert companies[1].kind_of?(Client), "Summit should be a client"
   end
-  
+
   def test_alt_inheritance_find_all
     switch_to_alt_inheritance_column
     test_inheritance_find_all
@@ -56,11 +100,11 @@ class InheritanceTest < Test::Unit::TestCase
     firm = Firm.new
     firm.name = "Next Angle"
     firm.save
-    
+
     next_angle = Company.find(firm.id)
     assert next_angle.kind_of?(Firm), "Next Angle should be a firm"
   end
-  
+
   def test_alt_inheritance_save
     switch_to_alt_inheritance_column
     test_inheritance_save
@@ -72,7 +116,7 @@ class InheritanceTest < Test::Unit::TestCase
     assert_equal 2, Firm.count
     assert_equal 3, Client.count
   end
-  
+
   def test_alt_inheritance_condition
     switch_to_alt_inheritance_column
     test_inheritance_condition
@@ -83,7 +127,7 @@ class InheritanceTest < Test::Unit::TestCase
     assert_raises(ActiveRecord::RecordNotFound) { Firm.find(2) }
     assert_nothing_raised   { Firm.find(1) }
   end
-  
+
   def test_alt_finding_incorrect_type_data
     switch_to_alt_inheritance_column
     test_finding_incorrect_type_data
@@ -95,7 +139,7 @@ class InheritanceTest < Test::Unit::TestCase
     assert_equal "I am a client", Client.find(:all).first.name
     assert_equal "37signals", Firm.find(:all).first.name
   end
-  
+
   def test_alt_update_all_within_inheritance
     switch_to_alt_inheritance_column
     test_update_all_within_inheritance
@@ -107,7 +151,7 @@ class InheritanceTest < Test::Unit::TestCase
     assert_equal 0, Client.count
     assert_equal 2, Firm.count
   end
-  
+
   def test_alt_destroy_all_within_inheritance
     switch_to_alt_inheritance_column
     test_destroy_all_within_inheritance
@@ -119,7 +163,7 @@ class InheritanceTest < Test::Unit::TestCase
     assert_kind_of Firm, Firm.find(:first, :conditions => "name = '37signals'")
     assert_nil Client.find(:first, :conditions => "name = '37signals'")
   end
-  
+
   def test_alt_find_first_within_inheritance
     switch_to_alt_inheritance_column
     test_find_first_within_inheritance
@@ -141,12 +185,12 @@ class InheritanceTest < Test::Unit::TestCase
     test_complex_inheritance
     switch_to_default_inheritance_column
   end
-  
+
   def test_eager_load_belongs_to_something_inherited
     account = Account.find(1, :include => :firm)
     assert_not_nil account.instance_variable_get("@firm"), "nil proves eager load failed"
   end
-  
+
   def test_alt_eager_loading
     switch_to_alt_inheritance_column
     test_eager_load_belongs_to_something_inherited
@@ -175,7 +219,7 @@ class InheritanceTest < Test::Unit::TestCase
 end
 
 
-class InheritanceComputeTypeTest < Test::Unit::TestCase
+class InheritanceComputeTypeTest < ActiveRecord::TestCase
   fixtures :companies
 
   def setup