activerecord 2.0.5 → 2.1.0

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

@@ -1,9 +1,9 @@
-require 'abstract_unit'
+require "cases/helper"
 
 class TestRecord < ActiveRecord::Base
 end
 
-class TestUnconnectedAdapter < Test::Unit::TestCase
+class TestUnconnectedAdapter < ActiveRecord::TestCase
   self.use_transactional_fixtures = false
 
   def setup

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

@@ -1,17 +1,23 @@
-require 'abstract_unit'
-require 'fixtures/topic'
-require 'fixtures/reply'
-require 'fixtures/person'
-require 'fixtures/developer'
+# encoding: utf-8
+require "cases/helper"
+require 'models/topic'
+require 'models/reply'
+require 'models/person'
+require 'models/developer'
+require 'models/warehouse_thing'
+require 'models/guid'
 
 # The following methods in Topic are used in test_conditional_validation_*
 class Topic
+  has_many :unique_replies, :dependent => :destroy, :foreign_key => "parent_id"
+  has_many :silly_unique_replies, :dependent => :destroy, :foreign_key => "parent_id"
+
   def condition_is_true
-    return true
+    true
   end
 
   def condition_is_true_but_its_not
-    return false
+    false
   end
 end
 
@@ -32,11 +38,6 @@ end
 class SillyUniqueReply < UniqueReply
 end
 
-class Topic < ActiveRecord::Base
-  has_many :unique_replies, :dependent => :destroy, :foreign_key => "parent_id"
-  has_many :silly_unique_replies, :dependent => :destroy, :foreign_key => "parent_id"
-end
-
 class Wizard < ActiveRecord::Base
   self.abstract_class = true
 
@@ -53,13 +54,14 @@ end
 class Thaumaturgist < IneptWizard
 end
 
-class ValidationsTest < Test::Unit::TestCase
-  fixtures :topics, :developers
+
+class ValidationsTest < ActiveRecord::TestCase
+  fixtures :topics, :developers, 'warehouse-things'
 
   def setup
-    Topic.write_inheritable_attribute(:validate, nil)
-    Topic.write_inheritable_attribute(:validate_on_create, nil)
-    Topic.write_inheritable_attribute(:validate_on_update, nil)
+    Topic.instance_variable_set("@validate_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
+    Topic.instance_variable_set("@validate_on_create_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
+    Topic.instance_variable_set("@validate_on_update_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
   end
 
   def test_single_field_validation
@@ -132,6 +134,22 @@ class ValidationsTest < Test::Unit::TestCase
       Reply.create!([ { "title" => "OK" }, { "title" => "Wrong Create" }])
     end
   end
+  
+  def test_exception_on_create_bang_with_block
+    assert_raises(ActiveRecord::RecordInvalid) do
+      Reply.create!({ "title" => "OK" }) do |r|
+        r.content = nil
+      end
+    end
+  end
+  
+  def test_exception_on_create_bang_many_with_block
+    assert_raises(ActiveRecord::RecordInvalid) do
+      Reply.create!([{ "title" => "OK" }, { "title" => "Wrong Create" }]) do |r|
+        r.content = nil
+      end
+    end
+  end
 
   def test_scoped_create_without_attributes
     Reply.with_scope(:create => {}) do
@@ -426,7 +444,7 @@ class ValidationsTest < Test::Unit::TestCase
     assert_nil t2.errors.on(:title)
     assert t2.errors.on(:parent_id)
 
-    t2.parent_id = 3
+    t2.parent_id = 4
     assert t2.save, "Should now save t2 as unique"
 
     t2.parent_id = nil
@@ -435,6 +453,54 @@ class ValidationsTest < Test::Unit::TestCase
     assert t2.save, "should save with nil"
   end
 
+  def test_validate_case_sensitive_uniqueness
+    Topic.validates_uniqueness_of(:title, :case_sensitive => true, :allow_nil => true)
+
+    t = Topic.new("title" => "I'm unique!")
+    assert t.save, "Should save t as unique"
+
+    t.content = "Remaining unique"
+    assert t.save, "Should still save t as unique"
+
+    t2 = Topic.new("title" => "I'M UNIQUE!")
+    assert t2.valid?, "Should be valid"
+    assert t2.save, "Should save t2 as unique"
+    assert !t2.errors.on(:title)
+    assert !t2.errors.on(:parent_id)
+    assert_not_equal "has already been taken", t2.errors.on(:title)
+
+    t3 = Topic.new("title" => "I'M uNiQUe!")
+    assert t3.valid?, "Should be valid"
+    assert t3.save, "Should save t2 as unique"
+    assert !t3.errors.on(:title)
+    assert !t3.errors.on(:parent_id)
+    assert_not_equal "has already been taken", t3.errors.on(:title)
+  end
+
+  def test_validate_uniqueness_with_non_standard_table_names
+    i1 = WarehouseThing.create(:value => 1000)
+    assert !i1.valid?, "i1 should not be valid"
+    assert i1.errors.on(:value), "Should not be empty"
+  end
+
+  def test_validates_uniqueness_inside_with_scope
+    Topic.validates_uniqueness_of(:title)
+
+    Topic.with_scope(:find => { :conditions => { :author_name => "David" } }) do
+      t1 = Topic.new("title" => "I'm unique!", "author_name" => "Mary")
+      assert t1.save
+      t2 = Topic.new("title" => "I'm unique!", "author_name" => "David")
+      assert !t2.valid?
+    end
+  end
+
+  def test_validate_uniqueness_with_columns_which_are_sql_keywords
+    Guid.validates_uniqueness_of :key
+    g = Guid.new
+    g.key = "foo"
+    assert_nothing_raised { !g.valid? }
+  end
+
   def test_validate_straight_inheritance_uniqueness
     w1 = IneptWizard.create(:name => "Rincewind", :city => "Ankh-Morpork")
     assert w1.valid?, "Saving w1"
@@ -482,12 +548,12 @@ class ValidationsTest < Test::Unit::TestCase
   end
 
   def test_validate_format_with_allow_blank
-	Topic.validates_format_of(:title, :with => /^Validation\smacros \w+!$/, :allow_blank=>true)
-	assert !Topic.create("title" => "Shouldn't be valid").valid?
-	assert Topic.create("title" => "").valid?
-	assert Topic.create("title" => nil).valid?
-	assert Topic.create("title" => "Validation macros rule!").valid?
-	end
+    Topic.validates_format_of(:title, :with => /^Validation\smacros \w+!$/, :allow_blank=>true)
+    assert !Topic.create("title" => "Shouldn't be valid").valid?
+    assert Topic.create("title" => "").valid?
+    assert Topic.create("title" => nil).valid?
+    assert Topic.create("title" => "Validation macros rule!").valid?
+  end
 
   # testing ticket #3142
   def test_validate_format_numeric
@@ -517,6 +583,12 @@ class ValidationsTest < Test::Unit::TestCase
     assert_nil t.errors.on(:title)
   end
 
+  def test_validate_format_with_formatted_message
+    Topic.validates_format_of(:title, :with => /^Valid Title$/, :message => "can't be %s")
+    t = Topic.create(:title => 'Invalid title')
+    assert_equal "can't be Invalid title", t.errors.on(:title)
+  end
+
   def test_validates_inclusion_of
     Topic.validates_inclusion_of( :title, :in => %w( a b c d e f g ) )
 
@@ -798,6 +870,20 @@ class ValidationsTest < Test::Unit::TestCase
     assert t.valid?
   end
 
+  def test_validates_size_of_association_using_within
+    assert_nothing_raised { Topic.validates_size_of :replies, :within => 1..2 }
+    t = Topic.new('title' => 'noreplies', 'content' => 'whatever')
+    assert !t.save
+    assert t.errors.on(:replies)
+
+    reply = t.replies.build('title' => 'areply', 'content' => 'whateveragain')
+    assert t.valid?
+
+    2.times { t.replies.build('title' => 'areply', 'content' => 'whateveragain') }
+    assert !t.save
+    assert t.errors.on(:replies)
+  end
+
   def test_validates_length_of_nasty_params
     assert_raise(ArgumentError) { Topic.validates_length_of(:title, :minimum=>6, :maximum=>9) }
     assert_raise(ArgumentError) { Topic.validates_length_of(:title, :within=>6, :maximum=>9) }
@@ -901,19 +987,22 @@ class ValidationsTest < Test::Unit::TestCase
 
   def test_optionally_validates_length_of_using_within_utf8
     with_kcode('UTF8') do
-      Topic.validates_length_of :title, :content, :within => 3..5, :allow_nil => true
+      Topic.validates_length_of :title, :within => 3..5, :allow_nil => true
 
-      t = Topic.create('title' => '一二三', 'content' => '一二三四五')
-      assert t.valid?
+      t = Topic.create(:title => "一二三四五")
+      assert t.valid?, t.errors.inspect
+
+      t = Topic.create(:title => "一二三")
+      assert t.valid?, t.errors.inspect
 
       t.title = nil
-      assert t.valid?
+      assert t.valid?, t.errors.inspect
     end
   end
 
   def test_optionally_validates_length_of_using_within_on_create_utf8
     with_kcode('UTF8') do
-      Topic.validates_length_of :title, :content, :within => 5..10, :on => :create, :too_long => "長すぎます: %d"
+      Topic.validates_length_of :title, :within => 5..10, :on => :create, :too_long => "長すぎます: %d"
 
       t = Topic.create("title" => "一二三四五六七八九十A", "content" => "whatever")
       assert !t.save
@@ -936,7 +1025,7 @@ class ValidationsTest < Test::Unit::TestCase
 
   def test_optionally_validates_length_of_using_within_on_update_utf8
     with_kcode('UTF8') do
-      Topic.validates_length_of :title, :content, :within => 5..10, :on => :update, :too_short => "短すぎます: %d"
+      Topic.validates_length_of :title, :within => 5..10, :on => :update, :too_short => "短すぎます: %d"
 
       t = Topic.create("title" => "一二三4", "content" => "whatever")
       assert !t.save
@@ -947,12 +1036,11 @@ class ValidationsTest < Test::Unit::TestCase
       assert t.errors.on(:title)
       assert_equal "短すぎます: 5", t.errors[:title]
 
-      t.title = "valid"
-      t.content = "一二三四五六七八九十A"
+      t.title = "一二三四五六七八九十A"
       assert !t.save
-      assert t.errors.on(:content)
+      assert t.errors.on(:title)
 
-      t.content = "一二345"
+      t.title = "一二345"
       assert t.save
     end
   end
@@ -1017,7 +1105,7 @@ class ValidationsTest < Test::Unit::TestCase
 
   def test_invalid_validator
     Topic.validate 3
-    assert_raise(ActiveRecord::ActiveRecordError) { t = Topic.create }
+    assert_raise(ArgumentError) { t = Topic.create }
   end
 
   def test_throw_away_typing
@@ -1281,7 +1369,7 @@ class ValidationsTest < Test::Unit::TestCase
 end
 
 
-class ValidatesNumericalityTest < Test::Unit::TestCase
+class ValidatesNumericalityTest < ActiveRecord::TestCase
   NIL = [nil]
   BLANK = ["", " ", " \t \r \n"]
   BIGDECIMAL_STRINGS = %w(12345678901234567890.1234567890) # 30 significent digits
@@ -1293,9 +1381,9 @@ class ValidatesNumericalityTest < Test::Unit::TestCase
   JUNK = ["not a number", "42 not a number", "0xdeadbeef", "00-1", "--3", "+-3", "+3-1", "-+019.0", "12.12.13.12", "123\nnot a number"]
 
   def setup
-    Topic.write_inheritable_attribute(:validate, nil)
-    Topic.write_inheritable_attribute(:validate_on_create, nil)
-    Topic.write_inheritable_attribute(:validate_on_update, nil)
+    Topic.instance_variable_set("@validate_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
+    Topic.instance_variable_set("@validate_on_create_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
+    Topic.instance_variable_set("@validate_on_update_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
   end
 
   def test_default_validates_numericality_of
@@ -1382,6 +1470,20 @@ class ValidatesNumericalityTest < Test::Unit::TestCase
     valid!([2])
   end
 
+  def test_validates_numericality_with_numeric_message
+    Topic.validates_numericality_of :approved, :less_than => 4, :message => "smaller than %d"
+    topic = Topic.new("title" => "numeric test", "approved" => 10)
+
+    assert !topic.valid?
+    assert_equal "smaller than 4", topic.errors.on(:approved)
+
+    Topic.validates_numericality_of :approved, :greater_than => 4, :message => "greater than %d"
+    topic = Topic.new("title" => "numeric test", "approved" => 1)
+
+    assert !topic.valid?
+    assert_equal "greater than 4", topic.errors.on(:approved)
+  end
+
   private
     def invalid!(values, error=nil)
       with_each_topic_approved_value(values) do |topic, value|

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

@@ -1,11 +1,11 @@
-require 'abstract_unit'
-require 'fixtures/contact'
-require 'fixtures/post'
-require 'fixtures/author'
-require 'fixtures/tagging'
-require 'fixtures/comment'
-
-class XmlSerializationTest < Test::Unit::TestCase
+require "cases/helper"
+require 'models/contact'
+require 'models/post'
+require 'models/author'
+require 'models/tagging'
+require 'models/comment'
+
+class XmlSerializationTest < ActiveRecord::TestCase
   def test_should_serialize_default_root
     @xml = Contact.new.to_xml
     assert_match %r{^<contact>},  @xml
@@ -40,7 +40,7 @@ class XmlSerializationTest < Test::Unit::TestCase
   end
 end
 
-class DefaultXmlSerializationTest < Test::Unit::TestCase
+class DefaultXmlSerializationTest < ActiveRecord::TestCase
   def setup
     @xml = Contact.new(:name => 'aaron stack', :age => 25, :avatar => 'binarydata', :created_at => Time.utc(2006, 8, 1), :awesome => false, :preferences => { :gem => 'ruby' }).to_xml
   end
@@ -72,7 +72,7 @@ class DefaultXmlSerializationTest < Test::Unit::TestCase
   end
 end
 
-class NilXmlSerializationTest < Test::Unit::TestCase
+class NilXmlSerializationTest < ActiveRecord::TestCase
   def setup
     @xml = Contact.new.to_xml(:root => 'xml_contact')
   end
@@ -118,7 +118,7 @@ class NilXmlSerializationTest < Test::Unit::TestCase
   end
 end
 
-class DatabaseConnectedXmlSerializationTest < Test::Unit::TestCase
+class DatabaseConnectedXmlSerializationTest < ActiveRecord::TestCase
   fixtures :authors, :posts
   # to_xml used to mess with the hash the user provided which
   # caused the builder to be reused.  This meant the document kept
@@ -199,4 +199,4 @@ class DatabaseConnectedXmlSerializationTest < Test::Unit::TestCase
     assert types.include?('StiPost')
   end
 
-end
+end

data/test/config.rb

@@ -0,0 +1,5 @@
+TEST_ROOT       = File.expand_path(File.dirname(__FILE__))
+ASSETS_ROOT     = TEST_ROOT + "/assets"
+FIXTURES_ROOT   = TEST_ROOT + "/fixtures"
+MIGRATIONS_ROOT = TEST_ROOT + "/migrations"
+SCHEMA_ROOT     = TEST_ROOT + "/schema"

data/test/connections/native_db2/connection.rb

@@ -1,5 +1,5 @@
 print "Using native DB2\n"
-require_dependency 'fixtures/course'
+require_dependency 'models/course'
 require 'logger'
 
 ActiveRecord::Base.logger = Logger.new("debug.log")

data/test/connections/native_firebird/connection.rb

@@ -1,5 +1,5 @@
 print "Using native Firebird\n"
-require_dependency 'fixtures/course'
+require_dependency 'models/course'
 require 'logger'
 
 ActiveRecord::Base.logger = Logger.new("debug.log")

data/test/connections/native_frontbase/connection.rb

@@ -1,5 +1,5 @@
 puts 'Using native Frontbase'
-require_dependency 'fixtures/course'
+require_dependency 'models/course'
 require 'logger'
 
 ActiveRecord::Base.logger = Logger.new("debug.log")

data/test/connections/native_mysql/connection.rb

@@ -1,5 +1,5 @@
 print "Using native MySQL\n"
-require_dependency 'fixtures/course'
+require_dependency 'models/course'
 require 'logger'
 
 RAILS_DEFAULT_LOGGER = Logger.new('debug.log')

data/test/connections/native_openbase/connection.rb

@@ -1,5 +1,5 @@
 print "Using native OpenBase\n"
-require_dependency 'fixtures/course'
+require_dependency 'models/course'
 require 'logger'
 
 ActiveRecord::Base.logger = Logger.new("debug.log")

data/test/connections/native_oracle/connection.rb

@@ -1,5 +1,5 @@
 print "Using Oracle\n"
-require_dependency 'fixtures/course'
+require_dependency 'models/course'
 require 'logger'
 
 ActiveRecord::Base.logger = Logger.new STDOUT

data/test/connections/native_postgresql/connection.rb

@@ -1,5 +1,5 @@
 print "Using native PostgreSQL\n"
-require_dependency 'fixtures/course'
+require_dependency 'models/course'
 require 'logger'
 
 ActiveRecord::Base.logger = Logger.new("debug.log")
@@ -7,13 +7,11 @@ ActiveRecord::Base.logger = Logger.new("debug.log")
 ActiveRecord::Base.configurations = {
   'arunit' => {
     :adapter  => 'postgresql',
-    :username => 'postgres',
     :database => 'activerecord_unittest',
     :min_messages => 'warning'
   },
   'arunit2' => {
     :adapter  => 'postgresql',
-    :username => 'postgres',
     :database => 'activerecord_unittest2',
     :min_messages => 'warning'
   }

data/test/connections/native_sqlite/connection.rb

@@ -1,12 +1,12 @@
 print "Using native SQlite\n"
-require_dependency 'fixtures/course'
+require_dependency 'models/course'
 require 'logger'
 ActiveRecord::Base.logger = Logger.new("debug.log")
 
 class SqliteError < StandardError
 end
 
-BASE_DIR = File.expand_path(File.dirname(__FILE__) + '/../../fixtures')
+BASE_DIR = FIXTURES_ROOT
 sqlite_test_db  = "#{BASE_DIR}/fixture_database.sqlite"
 sqlite_test_db2 = "#{BASE_DIR}/fixture_database_2.sqlite"