activerecord 2.0.5 → 2.1.0

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

@@ -1,7 +1,7 @@
-require 'abstract_unit'
-require 'fixtures/course'
+require "cases/helper"
+require 'models/course'
 
-class FirebirdMigrationTest < Test::Unit::TestCase
+class FirebirdMigrationTest < ActiveRecord::TestCase
   self.use_transactional_fixtures = false
 
   def setup

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

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 
 class Mixin < ActiveRecord::Base
 end
@@ -7,7 +7,7 @@ end
 class Time
   @@forced_now_time = nil
   cattr_accessor :forced_now_time
-  
+
   class << self
     def now_with_forcing
       if @@forced_now_time
@@ -21,13 +21,13 @@ class Time
 end
 
 
-class TouchTest < Test::Unit::TestCase
+class TouchTest < ActiveRecord::TestCase
   fixtures :mixins
-  
+
   def setup
     Time.forced_now_time = Time.now
   end
-  
+
   def teardown
     Time.forced_now_time = nil
   end
@@ -36,7 +36,7 @@ class TouchTest < Test::Unit::TestCase
     five_minutes_ago = 5.minutes.ago
     Time.forced_now_time = five_minutes_ago
     assert_equal five_minutes_ago, Time.now
-    
+
     Time.forced_now_time = nil
     assert_not_equal five_minutes_ago, Time.now
   end
@@ -69,6 +69,7 @@ class TouchTest < Test::Unit::TestCase
     old_updated_at = stamped.updated_at
 
     Time.forced_now_time = 5.minutes.from_now
+    stamped.lft_will_change!
     stamped.save
 
     assert_equal Time.now, stamped.updated_at

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

@@ -1,7 +1,7 @@
-require 'abstract_unit'
-require 'fixtures/company_in_module'
+require "cases/helper"
+require 'models/company_in_module'
 
-class ModulesTest < Test::Unit::TestCase
+class ModulesTest < ActiveRecord::TestCase
   fixtures :accounts, :companies, :projects, :developers
 
   def test_module_spanning_associations
@@ -15,7 +15,7 @@ class ModulesTest < Test::Unit::TestCase
     project.developers << MyApplication::Business::Developer.create("name" => "John")
     assert "John", project.developers.last.name
   end
-  
+
   def test_associations_spanning_cross_modules
     account = MyApplication::Billing::Account.find(:first, :order => 'id')
     assert_kind_of MyApplication::Business::Firm, account.firm
@@ -24,11 +24,16 @@ class ModulesTest < Test::Unit::TestCase
     assert_kind_of MyApplication::Billing::Nested::Firm, account.nested_qualified_billing_firm
     assert_kind_of MyApplication::Billing::Nested::Firm, account.nested_unqualified_billing_firm
   end
-  
+
   def test_find_account_and_include_company
     account = MyApplication::Billing::Account.find(1, :include => :firm)
     assert_kind_of MyApplication::Business::Firm, account.instance_variable_get('@firm')
     assert_kind_of MyApplication::Business::Firm, account.firm
   end
-  
+
+  def test_table_name
+    assert_equal 'accounts', MyApplication::Billing::Account.table_name, 'table_name for ActiveRecord model in module'
+    assert_equal 'companies', MyApplication::Business::Client.table_name, 'table_name for ActiveRecord model subclass'
+    assert_equal 'company_contacts', MyApplication::Business::Client::Contact.table_name, 'table_name for ActiveRecord model enclosed by another ActiveRecord model'
+  end
 end

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

@@ -1,10 +1,10 @@
-require 'abstract_unit'
-require 'fixtures/entrant'
+require "cases/helper"
+require 'models/entrant'
 
 # So we can test whether Course.connection survives a reload.
-require_dependency 'fixtures/course'
+require_dependency 'models/course'
 
-class MultipleDbTest < Test::Unit::TestCase
+class MultipleDbTest < ActiveRecord::TestCase
   self.use_transactional_fixtures = false
 
   def setup
@@ -53,7 +53,7 @@ class MultipleDbTest < Test::Unit::TestCase
 
     Dependencies.clear
     Object.send(:remove_const, :Course)
-    require_dependency 'fixtures/course'
+    require_dependency 'models/course'
 
     assert Course.connection
   end

data/test/cases/named_scope_test.rb

@@ -0,0 +1,157 @@
+require "cases/helper"
+require 'models/post'
+require 'models/topic'
+require 'models/comment'
+require 'models/reply'
+require 'models/author'
+
+class NamedScopeTest < ActiveRecord::TestCase
+  fixtures :posts, :authors, :topics, :comments
+
+  def test_implements_enumerable
+    assert !Topic.find(:all).empty?
+
+    assert_equal Topic.find(:all),   Topic.base
+    assert_equal Topic.find(:all),   Topic.base.to_a
+    assert_equal Topic.find(:first), Topic.base.first
+    assert_equal Topic.find(:all),   Topic.base.each { |i| i }
+  end
+
+  def test_found_items_are_cached
+    Topic.columns
+    all_posts = Topic.base
+
+    assert_queries(1) do
+      all_posts.collect
+      all_posts.collect
+    end
+  end
+
+  def test_reload_expires_cache_of_found_items
+    all_posts = Topic.base
+    all_posts.inspect
+
+    new_post = Topic.create!
+    assert !all_posts.include?(new_post)
+    assert all_posts.reload.include?(new_post)
+  end
+
+  def test_delegates_finds_and_calculations_to_the_base_class
+    assert !Topic.find(:all).empty?
+
+    assert_equal Topic.find(:all),               Topic.base.find(:all)
+    assert_equal Topic.find(:first),             Topic.base.find(:first)
+    assert_equal Topic.count,                    Topic.base.count
+    assert_equal Topic.average(:replies_count), Topic.base.average(:replies_count)
+  end
+
+  def test_subclasses_inherit_scopes
+    assert Topic.scopes.include?(:base)
+
+    assert Reply.scopes.include?(:base)
+    assert_equal Reply.find(:all), Reply.base
+  end
+
+  def test_scopes_with_options_limit_finds_to_those_matching_the_criteria_specified
+    assert !Topic.find(:all, :conditions => {:approved => true}).empty?
+
+    assert_equal Topic.find(:all, :conditions => {:approved => true}), Topic.approved
+    assert_equal Topic.count(:conditions => {:approved => true}), Topic.approved.count
+  end
+
+  def test_scopes_are_composable
+    assert_equal (approved = Topic.find(:all, :conditions => {:approved => true})), Topic.approved
+    assert_equal (replied = Topic.find(:all, :conditions => 'replies_count > 0')), Topic.replied
+    assert !(approved == replied)
+    assert !(approved & replied).empty?
+
+    assert_equal approved & replied, Topic.approved.replied
+  end
+
+  def test_procedural_scopes
+    topics_written_before_the_third = Topic.find(:all, :conditions => ['written_on < ?', topics(:third).written_on])
+    topics_written_before_the_second = Topic.find(:all, :conditions => ['written_on < ?', topics(:second).written_on])
+    assert_not_equal topics_written_before_the_second, topics_written_before_the_third
+
+    assert_equal topics_written_before_the_third, Topic.written_before(topics(:third).written_on)
+    assert_equal topics_written_before_the_second, Topic.written_before(topics(:second).written_on)
+  end
+
+  def test_extensions
+    assert_equal 1, Topic.anonymous_extension.one
+    assert_equal 2, Topic.named_extension.two
+  end
+
+  def test_multiple_extensions
+    assert_equal 2, Topic.multiple_extensions.extension_two
+    assert_equal 1, Topic.multiple_extensions.extension_one
+  end
+
+  def test_has_many_associations_have_access_to_named_scopes
+    assert_not_equal Post.containing_the_letter_a, authors(:david).posts
+    assert !Post.containing_the_letter_a.empty?
+
+    assert_equal authors(:david).posts & Post.containing_the_letter_a, authors(:david).posts.containing_the_letter_a
+  end
+
+  def test_has_many_through_associations_have_access_to_named_scopes
+    assert_not_equal Comment.containing_the_letter_e, authors(:david).comments
+    assert !Comment.containing_the_letter_e.empty?
+
+    assert_equal authors(:david).comments & Comment.containing_the_letter_e, authors(:david).comments.containing_the_letter_e
+  end
+
+  def test_active_records_have_scope_named__all__
+    assert !Topic.find(:all).empty?
+
+    assert_equal Topic.find(:all), Topic.base
+  end
+
+  def test_active_records_have_scope_named__scoped__
+    assert !Topic.find(:all, scope = {:conditions => "content LIKE '%Have%'"}).empty?
+
+    assert_equal Topic.find(:all, scope), Topic.scoped(scope)
+  end
+
+  def test_proxy_options
+    expected_proxy_options = { :conditions => { :approved => true } }
+    assert_equal expected_proxy_options, Topic.approved.proxy_options
+  end
+
+  def test_first_and_last_should_support_find_options
+    assert_equal Topic.base.first(:order => 'title'), Topic.base.find(:first, :order => 'title')
+    assert_equal Topic.base.last(:order => 'title'), Topic.base.find(:last, :order => 'title')
+  end
+
+  def test_first_and_last_should_allow_integers_for_limit
+    assert_equal Topic.base.first(2), Topic.base.to_a.first(2)
+    assert_equal Topic.base.last(2), Topic.base.to_a.last(2)
+  end
+
+  def test_first_and_last_should_not_use_query_when_results_are_loaded
+    topics = Topic.base
+    topics.reload # force load
+    assert_no_queries do
+      topics.first
+      topics.last
+    end
+  end
+
+  def test_first_and_last_find_options_should_use_query_when_results_are_loaded
+    topics = Topic.base
+    topics.reload # force load
+    assert_queries(2) do
+      topics.first(:order => 'title')
+      topics.last(:order => 'title')
+    end
+  end
+
+  def test_empty_should_not_load_results
+    topics = Topic.base
+    assert_queries(2) do
+      topics.empty?  # use count query
+      topics.collect # force load
+      topics.empty?  # use loaded (no query)
+    end
+  end
+end

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

@@ -1,12 +1,12 @@
-require "#{File.dirname(__FILE__)}/abstract_unit"
-require 'fixtures/topic'
-require 'fixtures/reply'
-require 'fixtures/subscriber'
-require 'fixtures/movie'
-require 'fixtures/keyboard'
-require 'fixtures/mixed_case_monkey'
+require "cases/helper"
+require 'models/topic'
+require 'models/reply'
+require 'models/subscriber'
+require 'models/movie'
+require 'models/keyboard'
+require 'models/mixed_case_monkey'
 
-class PrimaryKeysTest < Test::Unit::TestCase
+class PrimaryKeysTest < ActiveRecord::TestCase
   fixtures :topics, :subscribers, :movies, :mixed_case_monkeys
 
   def test_integer_key
@@ -65,7 +65,7 @@ class PrimaryKeysTest < Test::Unit::TestCase
   def test_find_with_more_than_one_string_key
     assert_equal 2, Subscriber.find(subscribers(:first).nick, subscribers(:second).nick).length
   end
-  
+
   def test_primary_key_prefix
     ActiveRecord::Base.primary_key_prefix_type = :table_name
     Topic.reset_primary_key
@@ -79,7 +79,7 @@ class PrimaryKeysTest < Test::Unit::TestCase
     Topic.reset_primary_key
     assert_equal "id", Topic.primary_key
   end
-  
+
   def test_delete_should_quote_pkey
     assert_nothing_raised { MixedCaseMonkey.delete(1) }
   end

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

@@ -1,13 +1,13 @@
-require 'abstract_unit'
-require 'fixtures/topic'
-require 'fixtures/reply'
-require 'fixtures/task'
-require 'fixtures/course'
-require 'fixtures/category'
-require 'fixtures/post'
+require "cases/helper"
+require 'models/topic'
+require 'models/reply'
+require 'models/task'
+require 'models/course'
+require 'models/category'
+require 'models/post'
 
 
-class QueryCacheTest < ActiveSupport::TestCase
+class QueryCacheTest < ActiveRecord::TestCase
   fixtures :tasks, :topics, :categories, :posts, :categories_posts
 
   def test_find_queries
@@ -57,7 +57,7 @@ end
 
 uses_mocha 'QueryCacheExpiryTest' do
 
-class QueryCacheExpiryTest < Test::Unit::TestCase
+class QueryCacheExpiryTest < ActiveRecord::TestCase
   fixtures :tasks
 
   def test_find
@@ -82,7 +82,9 @@ class QueryCacheExpiryTest < Test::Unit::TestCase
     Task.connection.expects(:clear_query_cache).times(2)
 
     Task.cache do
-      Task.find(1).save!
+      task = Task.find(1)
+      task.starting = Time.now.utc
+      task.save!
     end
   end
 

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

@@ -1,17 +1,17 @@
-require 'abstract_unit'
-require 'fixtures/post'
-require 'fixtures/comment'
-require 'fixtures/developer'
-require 'fixtures/project'
-require 'fixtures/reader'
-require 'fixtures/person'
+require "cases/helper"
+require 'models/post'
+require 'models/comment'
+require 'models/developer'
+require 'models/project'
+require 'models/reader'
+require 'models/person'
 
 # Dummy class methods to test implicit association scoping.
 def Comment.foo() find :first end
 def Project.foo() find :first end
 
 
-class ReadOnlyTest < Test::Unit::TestCase
+class ReadOnlyTest < ActiveRecord::TestCase
   fixtures :posts, :comments, :developers, :projects, :developers_projects
 
   def test_cant_save_readonly_record
@@ -71,13 +71,13 @@ class ReadOnlyTest < Test::Unit::TestCase
   end
 
   def test_readonly_scoping
-    Post.with_scope(:find => { :conditions => '1=1' }) do 
+    Post.with_scope(:find => { :conditions => '1=1' }) do
       assert !Post.find(1).readonly?
       assert Post.find(1, :readonly => true).readonly?
       assert !Post.find(1, :readonly => false).readonly?
     end
 
-    Post.with_scope(:find => { :joins => '   ' }) do 
+    Post.with_scope(:find => { :joins => '   ' }) do
       assert !Post.find(1).readonly?
       assert Post.find(1, :readonly => true).readonly?
       assert !Post.find(1, :readonly => false).readonly?
@@ -86,7 +86,7 @@ class ReadOnlyTest < Test::Unit::TestCase
     # Oracle barfs on this because the join includes unqualified and
     # conflicting column names
     unless current_adapter?(:OracleAdapter)
-      Post.with_scope(:find => { :joins => ', developers' }) do 
+      Post.with_scope(:find => { :joins => ', developers' }) do
         assert Post.find(1).readonly?
         assert Post.find(1, :readonly => true).readonly?
         assert !Post.find(1, :readonly => false).readonly?

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

@@ -1,11 +1,11 @@
-require 'abstract_unit'
-require 'fixtures/topic'
-require 'fixtures/customer'
-require 'fixtures/company'
-require 'fixtures/company_in_module'
-require 'fixtures/subscriber'
-
-class ReflectionTest < Test::Unit::TestCase
+require "cases/helper"
+require 'models/topic'
+require 'models/customer'
+require 'models/company'
+require 'models/company_in_module'
+require 'models/subscriber'
+
+class ReflectionTest < ActiveRecord::TestCase
   fixtures :topics, :customers, :companies, :subscribers
 
   def setup
@@ -45,7 +45,7 @@ class ReflectionTest < Test::Unit::TestCase
     assert_equal :string, @first.column_for_attribute("title").type
     assert_equal 255, @first.column_for_attribute("title").limit
   end
-  
+
   def test_column_null_not_null
     subscriber = Subscriber.find(:first)
     assert subscriber.column_for_attribute("name").null
@@ -87,7 +87,7 @@ class ReflectionTest < Test::Unit::TestCase
     assert_equal reflection_for_address, Customer.reflect_on_aggregation(:address)
 
     assert_equal Address, Customer.reflect_on_aggregation(:address).klass
-    
+
     assert_equal Money, Customer.reflect_on_aggregation(:balance).klass
   end
 
@@ -157,11 +157,12 @@ class ReflectionTest < Test::Unit::TestCase
       :class_name => 'Nested::Firm',
       :table_name => 'companies'
   end
-  
+
   def test_reflection_of_all_associations
-    assert_equal 17, Firm.reflect_on_all_associations.size
-    assert_equal 15, Firm.reflect_on_all_associations(:has_many).size
-    assert_equal 2, Firm.reflect_on_all_associations(:has_one).size
+    # FIXME these assertions bust a lot
+    assert_equal 20, Firm.reflect_on_all_associations.size
+    assert_equal 16, Firm.reflect_on_all_associations(:has_many).size
+    assert_equal 4, Firm.reflect_on_all_associations(:has_one).size
     assert_equal 0, Firm.reflect_on_all_associations(:belongs_to).size
   end