activerecord 2.0.5 → 2.1.0

data/test/cases/invalid_date_test.rb

@@ -0,0 +1,24 @@
+require 'cases/helper'
+require 'models/topic'
+
+class InvalidDateTest < Test::Unit::TestCase
+  def test_assign_valid_dates
+    valid_dates = [[2007, 11, 30], [1993, 2, 28], [2008, 2, 29]]
+
+    invalid_dates = [[2007, 11, 31], [1993, 2, 29], [2007, 2, 29]]
+
+    topic = Topic.new
+
+    valid_dates.each do |date_src|
+      topic = Topic.new("last_read(1i)" => date_src[0].to_s, "last_read(2i)" => date_src[1].to_s, "last_read(3i)" => date_src[2].to_s)
+      assert_equal(topic.last_read, Date.new(*date_src))
+    end
+
+    invalid_dates.each do |date_src|
+      assert_nothing_raised do
+        topic = Topic.new({"last_read(1i)" => date_src[0].to_s, "last_read(2i)" => date_src[1].to_s, "last_read(3i)" => date_src[2].to_s})
+        assert_equal(topic.last_read, Time.local(*date_src).to_date, "The date should be modified according to the behaviour of the Time object")
+      end
+    end
+  end
+end

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

@@ -1,12 +1,16 @@
-require 'abstract_unit'
-require 'fixtures/contact'
-require 'fixtures/post'
-require 'fixtures/author'
-require 'fixtures/tagging'
-require 'fixtures/tag'
-require 'fixtures/comment'
-
-class JsonSerializationTest < Test::Unit::TestCase
+require "cases/helper"
+require 'models/contact'
+require 'models/post'
+require 'models/author'
+require 'models/tagging'
+require 'models/tag'
+require 'models/comment'
+
+class JsonSerializationTest < ActiveRecord::TestCase
+  class NamespacedContact < Contact
+    column :name,        :string
+  end
+
   def setup
     @contact = Contact.new(
       :name        => 'Konata Izumi',
@@ -18,6 +22,27 @@ class JsonSerializationTest < Test::Unit::TestCase
     )
   end
 
+  def test_should_demodulize_root_in_json
+    NamespacedContact.include_root_in_json = true
+    @contact = NamespacedContact.new :name => 'whatever'
+    json = @contact.to_json
+    assert_match %r{^\{"namespaced_contact": \{}, json
+  end
+
+  def test_should_include_root_in_json
+    Contact.include_root_in_json = true
+    json = @contact.to_json
+
+    assert_match %r{^\{"contact": \{}, json
+    assert_match %r{"name": "Konata Izumi"}, json
+    assert_match %r{"age": 16}, json
+    assert json.include?(%("created_at": #{ActiveSupport::JSON.encode(Time.utc(2006, 8, 1))}))
+    assert_match %r{"awesome": true}, json
+    assert_match %r{"preferences": \{"shows": "anime"\}}, json
+  ensure
+    Contact.include_root_in_json = false
+  end
+
   def test_should_encode_all_encodable_attributes
     json = @contact.to_json
 
@@ -63,7 +88,7 @@ class JsonSerializationTest < Test::Unit::TestCase
   end
 end
 
-class DatabaseConnectedJsonEncodingTest < Test::Unit::TestCase
+class DatabaseConnectedJsonEncodingTest < ActiveRecord::TestCase
   fixtures :authors, :posts, :comments, :tags, :taggings
 
   def setup
@@ -151,7 +176,7 @@ class DatabaseConnectedJsonEncodingTest < Test::Unit::TestCase
   def test_should_allow_except_option_for_list_of_authors
     authors = [@david, @mary]
 
-    assert_equal %([{"id": 1}, {"id": 2}]), authors.to_json(:except => [:name, :author_address_id])
+    assert_equal %([{"id": 1}, {"id": 2}]), authors.to_json(:except => [:name, :author_address_id, :author_address_extra_id])
   end
 
   def test_should_allow_includes_for_list_of_authors

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

@@ -1,7 +1,7 @@
-require 'abstract_unit'
-require 'fixtures/topic'
-require 'fixtures/developer'
-require 'fixtures/reply'
+require "cases/helper"
+require 'models/topic'
+require 'models/developer'
+require 'models/reply'
 
 class Topic; def after_find() end end
 class Developer; def after_find() end end
@@ -26,11 +26,11 @@ class TopicManualObserver
   end
 end
 
-class TopicaObserver < ActiveRecord::Observer
+class TopicaAuditor < ActiveRecord::Observer
   observe :topic
-  
+
   attr_reader :topic
-  
+
   def after_find(topic)
     @topic = topic
   end
@@ -38,7 +38,7 @@ end
 
 class TopicObserver < ActiveRecord::Observer
   attr_reader :topic
-  
+
   def after_find(topic)
     @topic = topic
   end
@@ -64,13 +64,13 @@ class MultiObserver < ActiveRecord::Observer
   end
 end
 
-class LifecycleTest < Test::Unit::TestCase
+class LifecycleTest < ActiveRecord::TestCase
   fixtures :topics, :developers
 
   def test_before_destroy
-    assert_equal 2, Topic.count
-    Topic.find(1).destroy
-    assert_equal 0, Topic.count
+    original_count = Topic.count
+    (topic_to_be_destroyed = Topic.find(1)).destroy
+    assert_equal original_count - (1 + topic_to_be_destroyed.replies.size), Topic.count
   end
 
   def test_after_save
@@ -95,7 +95,9 @@ class LifecycleTest < Test::Unit::TestCase
   end
 
   def test_auto_observer
-    topic_observer = TopicaObserver.instance
+    topic_observer = TopicaAuditor.instance
+    assert_nil TopicaAuditor.observed_class
+    assert_equal [Topic], TopicaAuditor.instance.observed_classes.to_a
 
     topic = Topic.find(1)
     assert_equal topic.title, topic_observer.topic.title
@@ -103,6 +105,7 @@ class LifecycleTest < Test::Unit::TestCase
 
   def test_inferred_auto_observer
     topic_observer = TopicObserver.instance
+    assert_equal Topic, TopicObserver.observed_class
 
     topic = Topic.find(1)
     assert_equal topic.title, topic_observer.topic.title

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

@@ -1,7 +1,8 @@
-require 'abstract_unit'
-require 'fixtures/person'
-require 'fixtures/reader'
-require 'fixtures/legacy_thing'
+require "cases/helper"
+require 'models/person'
+require 'models/reader'
+require 'models/legacy_thing'
+require 'models/reference'
 
 class LockWithoutDefault < ActiveRecord::Base; end
 
@@ -14,8 +15,8 @@ class ReadonlyFirstNamePerson < Person
   attr_readonly :first_name
 end
 
-class OptimisticLockingTest < Test::Unit::TestCase
-  fixtures :people, :legacy_things
+class OptimisticLockingTest < ActiveRecord::TestCase
+  fixtures :people, :legacy_things, :references
 
   # need to disable transactional fixtures, because otherwise the sqlite3
   # adapter (at least) chokes when we try and change the schema in the middle
@@ -34,7 +35,7 @@ class OptimisticLockingTest < Test::Unit::TestCase
 
     assert_raises(ActiveRecord::StaleObjectError) { p2.save! }
   end
-  
+
   def test_lock_repeating
     p1 = Person.find(1)
     p2 = Person.find(1)
@@ -64,7 +65,7 @@ class OptimisticLockingTest < Test::Unit::TestCase
 
     assert_raises(ActiveRecord::StaleObjectError) { p2.save! }
   end
-  
+
   def test_lock_new_with_nil
     p1 = Person.new(:first_name => 'anika')
     p1.save!
@@ -72,7 +73,7 @@ class OptimisticLockingTest < Test::Unit::TestCase
     p1.save!
     assert_equal 1, p1.lock_version
   end
-    
+
 
   def test_lock_column_name_existing
     t1 = LegacyThing.find(1)
@@ -138,6 +139,12 @@ class OptimisticLockingTest < Test::Unit::TestCase
       end
     end
   end
+  
+  def test_quote_table_name
+    ref = references(:michael_magician)
+    ref.favourite = !ref.favourite
+    assert ref.save
+  end
 
   private
 
@@ -176,7 +183,7 @@ end
 # TODO: The SQL Server, Sybase, and OpenBase adapters currently have no support for pessimistic locking
 
 unless current_adapter?(:SQLServerAdapter, :SybaseAdapter, :OpenBaseAdapter)
-  class PessimisticLockingTest < Test::Unit::TestCase
+  class PessimisticLockingTest < ActiveRecord::TestCase
     self.use_transactional_fixtures = false
     fixtures :people, :readers
 

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

@@ -1,13 +1,13 @@
-require 'abstract_unit'
-require 'fixtures/developer'
-require 'fixtures/project'
-require 'fixtures/comment'
-require 'fixtures/post'
-require 'fixtures/category'
-
-class MethodScopingTest < Test::Unit::TestCase
+require "cases/helper"
+require 'models/developer'
+require 'models/project'
+require 'models/comment'
+require 'models/post'
+require 'models/category'
+
+class MethodScopingTest < ActiveRecord::TestCase
   fixtures :developers, :projects, :comments, :posts
-  
+
   def test_set_conditions
     Developer.with_scope(:find => { :conditions => 'just a test...' }) do
       assert_equal 'just a test...', Developer.send(:current_scoped_methods)[:find][:conditions]
@@ -19,46 +19,62 @@ class MethodScopingTest < Test::Unit::TestCase
       assert_nothing_raised { Developer.find(1) }
     end
   end
-  
+
   def test_scoped_find_first
     Developer.with_scope(:find => { :conditions => "salary = 100000" }) do
       assert_equal Developer.find(10), Developer.find(:first, :order => 'name')
     end
   end
-  
+
   def test_scoped_find_combines_conditions
     Developer.with_scope(:find => { :conditions => "salary = 9000" }) do
       assert_equal developers(:poor_jamis), Developer.find(:first, :conditions => "name = 'Jamis'")
     end
   end
-  
+
   def test_scoped_find_sanitizes_conditions
     Developer.with_scope(:find => { :conditions => ['salary = ?', 9000] }) do
       assert_equal developers(:poor_jamis), Developer.find(:first)
-    end  
+    end
   end
-  
+
   def test_scoped_find_combines_and_sanitizes_conditions
     Developer.with_scope(:find => { :conditions => ['salary = ?', 9000] }) do
       assert_equal developers(:poor_jamis), Developer.find(:first, :conditions => ['name = ?', 'Jamis'])
-    end  
+    end
   end
-  
+
   def test_scoped_find_all
     Developer.with_scope(:find => { :conditions => "name = 'David'" }) do
       assert_equal [developers(:david)], Developer.find(:all)
-    end      
+    end
+  end
+
+  def test_scoped_find_select
+    Developer.with_scope(:find => { :select => "id, name" }) do
+      developer = Developer.find(:first, :conditions => "name = 'David'")
+      assert_equal "David", developer.name
+      assert !developer.has_attribute?(:salary)
+    end
+  end
+
+  def test_options_select_replaces_scope_select
+    Developer.with_scope(:find => { :select => "id, name" }) do
+      developer = Developer.find(:first, :select => 'id, salary', :conditions => "name = 'David'")
+      assert_equal 80000, developer.salary
+      assert !developer.has_attribute?(:name)
+    end
   end
-  
+
   def test_scoped_count
     Developer.with_scope(:find => { :conditions => "name = 'David'" }) do
       assert_equal 1, Developer.count
-    end        
+    end
 
     Developer.with_scope(:find => { :conditions => 'salary = 100000' }) do
       assert_equal 8, Developer.count
       assert_equal 1, Developer.count(:conditions => "name LIKE 'fixture_1%'")
-    end        
+    end
   end
 
   def test_scoped_find_include
@@ -70,7 +86,7 @@ class MethodScopingTest < Test::Unit::TestCase
     assert !scoped_developers.include?(developers(:jamis))
     assert_equal 1, scoped_developers.size
   end
-  
+
   def test_scoped_count_include
     # with the include, will retrieve only developers for the given project
     Developer.with_scope(:find => { :include => :projects }) do
@@ -125,7 +141,7 @@ class MethodScopingTest < Test::Unit::TestCase
   end
 end
 
-class NestedScopingTest < Test::Unit::TestCase
+class NestedScopingTest < ActiveRecord::TestCase
   fixtures :developers, :projects, :comments, :posts
 
   def test_merge_options
@@ -150,7 +166,7 @@ class NestedScopingTest < Test::Unit::TestCase
     Developer.with_scope(:find => { :conditions => "name = 'David'" }) do
       Developer.with_scope(:find => { :conditions => 'salary = 80000' }) do
         appended_condition = Developer.instance_eval('current_scoped_methods')[:find][:conditions]
-        assert_equal("( name = 'David' ) AND ( salary = 80000 )", appended_condition)
+        assert_equal("(name = 'David') AND (salary = 80000)", appended_condition)
         assert_equal(1, Developer.count)
       end
       Developer.with_scope(:find => { :conditions => "name = 'Maiha'" }) do
@@ -163,7 +179,7 @@ class NestedScopingTest < Test::Unit::TestCase
     Developer.with_scope(:find => { :conditions => 'salary = 80000', :limit => 10 }) do
       Developer.with_scope(:find => { :conditions => "name = 'David'" }) do
         merged_option = Developer.instance_eval('current_scoped_methods')[:find]
-        assert_equal({ :conditions => "( salary = 80000 ) AND ( name = 'David' )", :limit => 10 }, merged_option)
+        assert_equal({ :conditions => "(salary = 80000) AND (name = 'David')", :limit => 10 }, merged_option)
       end
     end
   end
@@ -184,7 +200,7 @@ class NestedScopingTest < Test::Unit::TestCase
         assert_nothing_raised { Developer.find(1) }
         assert_equal('David', Developer.find(:first).name)
       end
-    end  
+    end
   end
 
   def test_nested_scoped_find_merged_include
@@ -194,31 +210,31 @@ class NestedScopingTest < Test::Unit::TestCase
         assert_equal 1, Developer.instance_eval('current_scoped_methods')[:find][:include].length
         assert_equal('David', Developer.find(:first).name)
       end
-    end  
-    
+    end
+
     # the nested scope doesn't remove the first :include
     Developer.with_scope(:find => { :include => :projects, :conditions => "projects.id = 2" }) do
       Developer.with_scope(:find => { :include => [] }) do
         assert_equal 1, Developer.instance_eval('current_scoped_methods')[:find][:include].length
         assert_equal('David', Developer.find(:first).name)
       end
-    end  
-    
+    end
+
     # mixing array and symbol include's will merge correctly
     Developer.with_scope(:find => { :include => [:projects], :conditions => "projects.id = 2" }) do
       Developer.with_scope(:find => { :include => :projects }) do
         assert_equal 1, Developer.instance_eval('current_scoped_methods')[:find][:include].length
         assert_equal('David', Developer.find(:first).name)
       end
-    end  
+    end
   end
-  
+
   def test_nested_scoped_find_replace_include
     Developer.with_scope(:find => { :include => :projects }) do
       Developer.with_exclusive_scope(:find => { :include => [] }) do
         assert_equal 0, Developer.instance_eval('current_scoped_methods')[:find][:include].length
       end
-    end  
+    end
   end
 
   def test_three_level_nested_exclusive_scoped_find
@@ -275,6 +291,26 @@ class NestedScopingTest < Test::Unit::TestCase
     end
   end
 
+  def test_merged_scoped_find_on_blank_conditions
+    [nil, " ", [], {}].each do |blank|
+      Developer.with_scope(:find => {:conditions => blank}) do
+        Developer.with_scope(:find => {:conditions => blank}) do
+          assert_nothing_raised { Developer.find(:first) }
+        end
+      end
+    end
+  end
+
+  def test_merged_scoped_find_on_blank_bind_conditions
+    [ [""], ["",{}] ].each do |blank|
+      Developer.with_scope(:find => {:conditions => blank}) do
+        Developer.with_scope(:find => {:conditions => blank}) do
+          assert_nothing_raised { Developer.find(:first) }
+        end
+      end
+    end
+  end
+
   def test_immutable_nested_scope
     options1 = { :conditions => "name = 'Jamis'" }
     options2 = { :conditions => "name = 'David'" }
@@ -313,13 +349,13 @@ class NestedScopingTest < Test::Unit::TestCase
   end
 end
 
-class HasManyScopingTest< Test::Unit::TestCase
+class HasManyScopingTest< ActiveRecord::TestCase
   fixtures :comments, :posts
-  
+
   def setup
     @welcome = Post.find(1)
   end
-  
+
   def test_forwarding_of_static_methods
     assert_equal 'a comment...', Comment.what_are_you
     assert_equal 'a comment...', @welcome.comments.what_are_you
@@ -329,7 +365,7 @@ class HasManyScopingTest< Test::Unit::TestCase
     assert_equal 4, Comment.search_by_type('Comment').size
     assert_equal 2, @welcome.comments.search_by_type('Comment').size
   end
-  
+
   def test_forwarding_to_dynamic_finders
     assert_equal 4, Comment.find_all_by_type('Comment').size
     assert_equal 2, @welcome.comments.find_all_by_type('Comment').size
@@ -343,7 +379,7 @@ class HasManyScopingTest< Test::Unit::TestCase
 end
 
 
-class HasAndBelongsToManyScopingTest< Test::Unit::TestCase
+class HasAndBelongsToManyScopingTest< ActiveRecord::TestCase
   fixtures :posts, :categories, :categories_posts
 
   def setup
@@ -373,7 +409,7 @@ end
 # We disabled the scoping for has_one and belongs_to as we can't think of a proper use case
 
 
-class BelongsToScopingTest< Test::Unit::TestCase
+class BelongsToScopingTest< ActiveRecord::TestCase
   fixtures :comments, :posts
 
   def setup
@@ -393,7 +429,7 @@ class BelongsToScopingTest< Test::Unit::TestCase
 end
 
 
-class HasOneScopingTest< Test::Unit::TestCase
+class HasOneScopingTest< ActiveRecord::TestCase
   fixtures :comments, :posts
 
   def setup