ibm_db 3.0.5-x86-mingw32 → 4.0.0-x86-mingw32

data/test/cases/validations/i18n_generate_message_validation_test.rb

@@ -1,84 +1,84 @@
-require "cases/helper"
-require 'models/topic'
-
-class I18nGenerateMessageValidationTest < ActiveRecord::TestCase
-  def setup
-    Topic.clear_validators!
-    @topic = Topic.new
-    I18n.backend = I18n::Backend::Simple.new
-  end
-
-  def reset_i18n_load_path
-    @old_load_path, @old_backend = I18n.load_path.dup, I18n.backend
-    I18n.load_path.clear
-    I18n.backend = I18n::Backend::Simple.new
-    yield
-  ensure
-    I18n.load_path.replace @old_load_path
-    I18n.backend = @old_backend
-  end
-
-  # validates_associated: generate_message(attr_name, :invalid, :message => custom_message, :value => value)
-  def test_generate_message_invalid_with_default_message
-    assert_equal 'is invalid', @topic.errors.generate_message(:title, :invalid, :value => 'title')
-  end
-
-  def test_generate_message_invalid_with_custom_message
-    assert_equal 'custom message title', @topic.errors.generate_message(:title, :invalid, :message => 'custom message %{value}', :value => 'title')
-  end
-
-  # validates_uniqueness_of: generate_message(attr_name, :taken, :message => custom_message)
-  def test_generate_message_taken_with_default_message
-    assert_equal "has already been taken", @topic.errors.generate_message(:title, :taken, :value => 'title')
-  end
-
-  def test_generate_message_taken_with_custom_message
-    assert_equal 'custom message title', @topic.errors.generate_message(:title, :taken, :message => 'custom message %{value}', :value => 'title')
-  end
-
-  # ActiveRecord#RecordInvalid exception
-
-  test "RecordInvalid exception can be localized" do
-    topic = Topic.new
-    topic.errors.add(:title, :invalid)
-    topic.errors.add(:title, :blank)
-    assert_equal "Validation failed: Title is invalid, Title can't be blank", ActiveRecord::RecordInvalid.new(topic).message
-  end
-
-  test "RecordInvalid exception translation falls back to the :errors namespace" do
-    reset_i18n_load_path do
-      I18n.backend.store_translations 'en', :errors => {:messages => {:record_invalid => 'fallback message'}}
-      topic = Topic.new
-      topic.errors.add(:title, :blank)
-      assert_equal "fallback message", ActiveRecord::RecordInvalid.new(topic).message
-    end
-  end
-
-  test "translation for 'taken' can be overridden" do
-    reset_i18n_load_path do
-      I18n.backend.store_translations "en", {errors: {attributes: {title: {taken: "Custom taken message" }}}}
-      assert_equal "Custom taken message", @topic.errors.generate_message(:title, :taken, :value => 'title')
-    end
-  end
-
-  test "translation for 'taken' can be overridden in activerecord scope" do
-    reset_i18n_load_path do
-      I18n.backend.store_translations "en", {activerecord: {errors: {messages: {taken: "Custom taken message" }}}}
-      assert_equal "Custom taken message", @topic.errors.generate_message(:title, :taken, :value => 'title')
-    end
-  end
-
-  test "translation for 'taken' can be overridden in activerecord model scope" do
-    reset_i18n_load_path do
-      I18n.backend.store_translations "en", {activerecord: {errors: {models: {topic: {taken: "Custom taken message" }}}}}
-      assert_equal "Custom taken message", @topic.errors.generate_message(:title, :taken, :value => 'title')
-    end
-  end
-
-  test "translation for 'taken' can be overridden in activerecord attributes scope" do
-    reset_i18n_load_path do
-      I18n.backend.store_translations "en", {activerecord: {errors: {models: {topic: {attributes: {title: {taken: "Custom taken message" }}}}}}}
-      assert_equal "Custom taken message", @topic.errors.generate_message(:title, :taken, :value => 'title')
-    end
-  end
-end
+require "cases/helper"
+require 'models/topic'
+
+class I18nGenerateMessageValidationTest < ActiveRecord::TestCase
+  def setup
+    Topic.clear_validators!
+    @topic = Topic.new
+    I18n.backend = I18n::Backend::Simple.new
+  end
+
+  def reset_i18n_load_path
+    @old_load_path, @old_backend = I18n.load_path.dup, I18n.backend
+    I18n.load_path.clear
+    I18n.backend = I18n::Backend::Simple.new
+    yield
+  ensure
+    I18n.load_path.replace @old_load_path
+    I18n.backend = @old_backend
+  end
+
+  # validates_associated: generate_message(attr_name, :invalid, :message => custom_message, :value => value)
+  def test_generate_message_invalid_with_default_message
+    assert_equal 'is invalid', @topic.errors.generate_message(:title, :invalid, :value => 'title')
+  end
+
+  def test_generate_message_invalid_with_custom_message
+    assert_equal 'custom message title', @topic.errors.generate_message(:title, :invalid, :message => 'custom message %{value}', :value => 'title')
+  end
+
+  # validates_uniqueness_of: generate_message(attr_name, :taken, :message => custom_message)
+  def test_generate_message_taken_with_default_message
+    assert_equal "has already been taken", @topic.errors.generate_message(:title, :taken, :value => 'title')
+  end
+
+  def test_generate_message_taken_with_custom_message
+    assert_equal 'custom message title', @topic.errors.generate_message(:title, :taken, :message => 'custom message %{value}', :value => 'title')
+  end
+
+  # ActiveRecord#RecordInvalid exception
+
+  test "RecordInvalid exception can be localized" do
+    topic = Topic.new
+    topic.errors.add(:title, :invalid)
+    topic.errors.add(:title, :blank)
+    assert_equal "Validation failed: Title is invalid, Title can't be blank", ActiveRecord::RecordInvalid.new(topic).message
+  end
+
+  test "RecordInvalid exception translation falls back to the :errors namespace" do
+    reset_i18n_load_path do
+      I18n.backend.store_translations 'en', :errors => {:messages => {:record_invalid => 'fallback message'}}
+      topic = Topic.new
+      topic.errors.add(:title, :blank)
+      assert_equal "fallback message", ActiveRecord::RecordInvalid.new(topic).message
+    end
+  end
+
+  test "translation for 'taken' can be overridden" do
+    reset_i18n_load_path do
+      I18n.backend.store_translations "en", {errors: {attributes: {title: {taken: "Custom taken message" }}}}
+      assert_equal "Custom taken message", @topic.errors.generate_message(:title, :taken, :value => 'title')
+    end
+  end
+
+  test "translation for 'taken' can be overridden in activerecord scope" do
+    reset_i18n_load_path do
+      I18n.backend.store_translations "en", {activerecord: {errors: {messages: {taken: "Custom taken message" }}}}
+      assert_equal "Custom taken message", @topic.errors.generate_message(:title, :taken, :value => 'title')
+    end
+  end
+
+  test "translation for 'taken' can be overridden in activerecord model scope" do
+    reset_i18n_load_path do
+      I18n.backend.store_translations "en", {activerecord: {errors: {models: {topic: {taken: "Custom taken message" }}}}}
+      assert_equal "Custom taken message", @topic.errors.generate_message(:title, :taken, :value => 'title')
+    end
+  end
+
+  test "translation for 'taken' can be overridden in activerecord attributes scope" do
+    reset_i18n_load_path do
+      I18n.backend.store_translations "en", {activerecord: {errors: {models: {topic: {attributes: {title: {taken: "Custom taken message" }}}}}}}
+      assert_equal "Custom taken message", @topic.errors.generate_message(:title, :taken, :value => 'title')
+    end
+  end
+end

data/test/cases/validations/i18n_validation_test.rb

@@ -1,90 +1,86 @@
-require "cases/helper"
-require 'models/topic'
-require 'models/reply'
-
-class I18nValidationTest < ActiveRecord::TestCase
-  repair_validations(Topic, Reply)
-
-  def setup
-    repair_validations(Topic, Reply)
-    Reply.validates_presence_of(:title)
-    @topic = Topic.new
-    @old_load_path, @old_backend = I18n.load_path.dup, I18n.backend
-    I18n.load_path.clear
-    I18n.backend = I18n::Backend::Simple.new
-    I18n.backend.store_translations('en', :errors => {:messages => {:custom => nil}})
-  end
-
-  teardown do
-    I18n.load_path.replace @old_load_path
-    I18n.backend = @old_backend
-  end
-
-  def unique_topic
-    @unique ||= Topic.create :title => 'unique!'
-  end
-
-  def replied_topic
-    @replied_topic ||= begin
-      topic = Topic.create(:title => "topic")
-      topic.replies << Reply.new
-      topic
-    end
-  end
-
-  # A set of common cases for ActiveModel::Validations message generation that
-  # are used to generate tests to keep things DRY
-  #
-  COMMON_CASES = [
-  # [ case,                                validation_options,            generate_message_options]
-    [ "given no options",                  {},                            {}],
-    [ "given custom message",              {:message => "custom"},        {:message => "custom"}],
-    [ "given if condition",                {:if     => lambda { true }},  {}],
-    [ "given unless condition",            {:unless => lambda { false }}, {}],
-    [ "given option that is not reserved", {:format => "jpg"},            {:format => "jpg" }]
-    # TODO Add :on case, but below doesn't work, because then the validation isn't run for some reason
-    #      even when using .save instead .valid?
-    # [ "given on condition",     {on: :save},                {}]
-  ]
-
-  # validates_uniqueness_of w/ mocha
-
-  COMMON_CASES.each do |name, validation_options, generate_message_options|
-    test "validates_uniqueness_of on generated message #{name}" do
-      Topic.validates_uniqueness_of :title, validation_options
-      @topic.title = unique_topic.title
-      @topic.errors.expects(:generate_message).with(:title, :taken, generate_message_options.merge(:value => 'unique!'))
-      @topic.valid?
-    end
-  end
-
-  # validates_associated w/ mocha
-
-  COMMON_CASES.each do |name, validation_options, generate_message_options|
-    test "validates_associated on generated message #{name}" do
-      Topic.validates_associated :replies, validation_options
-      replied_topic.errors.expects(:generate_message).with(:replies, :invalid, generate_message_options.merge(:value => replied_topic.replies))
-      replied_topic.save
-    end
-  end
-
-  # validates_associated w/o mocha
-
-  def test_validates_associated_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:replies => {:invalid => 'custom message'}}}}}}
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:invalid => 'global message'}}}
-
-    Topic.validates_associated :replies
-    replied_topic.valid?
-    assert_equal ['custom message'], replied_topic.errors[:replies].uniq
-  end
-
-  def test_validates_associated_finds_global_default_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:invalid => 'global message'}}}
-
-    Topic.validates_associated :replies
-    replied_topic.valid?
-    assert_equal ['global message'], replied_topic.errors[:replies]
-  end
-
-end
+require "cases/helper"
+require 'models/topic'
+require 'models/reply'
+
+class I18nValidationTest < ActiveRecord::TestCase
+  repair_validations(Topic, Reply)
+
+  def setup
+    repair_validations(Topic, Reply)
+    Reply.validates_presence_of(:title)
+    @topic = Topic.new
+    @old_load_path, @old_backend = I18n.load_path.dup, I18n.backend
+    I18n.load_path.clear
+    I18n.backend = I18n::Backend::Simple.new
+    I18n.backend.store_translations('en', :errors => {:messages => {:custom => nil}})
+  end
+
+  teardown do
+    I18n.load_path.replace @old_load_path
+    I18n.backend = @old_backend
+  end
+
+  def unique_topic
+    @unique ||= Topic.create :title => 'unique!'
+  end
+
+  def replied_topic
+    @replied_topic ||= begin
+      topic = Topic.create(:title => "topic")
+      topic.replies << Reply.new
+      topic
+    end
+  end
+
+  # A set of common cases for ActiveModel::Validations message generation that
+  # are used to generate tests to keep things DRY
+  #
+  COMMON_CASES = [
+  # [ case,                                validation_options,            generate_message_options]
+    [ "given no options",                  {},                            {}],
+    [ "given custom message",              {:message => "custom"},        {:message => "custom"}],
+    [ "given if condition",                {:if     => lambda { true }},  {}],
+    [ "given unless condition",            {:unless => lambda { false }}, {}],
+    [ "given option that is not reserved", {:format => "jpg"},            {:format => "jpg" }]
+    # TODO Add :on case, but below doesn't work, because then the validation isn't run for some reason
+    #      even when using .save instead .valid?
+    # [ "given on condition",     {on: :save},                {}]
+  ]
+
+  COMMON_CASES.each do |name, validation_options, generate_message_options|
+    test "validates_uniqueness_of on generated message #{name}" do
+      Topic.validates_uniqueness_of :title, validation_options
+      @topic.title = unique_topic.title
+      assert_called_with(@topic.errors, :generate_message, [:title, :taken, generate_message_options.merge(:value => 'unique!')]) do
+        @topic.valid?
+      end
+    end
+  end
+
+  COMMON_CASES.each do |name, validation_options, generate_message_options|
+    test "validates_associated on generated message #{name}" do
+      Topic.validates_associated :replies, validation_options
+      assert_called_with(replied_topic.errors, :generate_message, [:replies, :invalid, generate_message_options.merge(:value => replied_topic.replies)]) do
+        replied_topic.save
+      end
+    end
+  end
+
+  def test_validates_associated_finds_custom_model_key_translation
+    I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:replies => {:invalid => 'custom message'}}}}}}
+    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:invalid => 'global message'}}}
+
+    Topic.validates_associated :replies
+    replied_topic.valid?
+    assert_equal ['custom message'], replied_topic.errors[:replies].uniq
+  end
+
+  def test_validates_associated_finds_global_default_translation
+    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:invalid => 'global message'}}}
+
+    Topic.validates_associated :replies
+    replied_topic.valid?
+    assert_equal ['global message'], replied_topic.errors[:replies]
+  end
+
+end

data/test/cases/validations/length_validation_test.rb

@@ -1,47 +1,79 @@
-# -*- coding: utf-8 -*-
-require "cases/helper"
-require 'models/owner'
-require 'models/pet'
-
-class LengthValidationTest < ActiveRecord::TestCase
-  fixtures :owners
-  repair_validations(Owner)
-
-  def test_validates_size_of_association
-    repair_validations Owner do
-      assert_nothing_raised { Owner.validates_size_of :pets, :minimum => 1 }
-      o = Owner.new('name' => 'nopets')
-      assert !o.save
-      assert o.errors[:pets].any?
-      o.pets.build('name' => 'apet')
-      assert o.valid?
-    end
-  end
-
-  def test_validates_size_of_association_using_within
-    repair_validations Owner do
-      assert_nothing_raised { Owner.validates_size_of :pets, :within => 1..2 }
-      o = Owner.new('name' => 'nopets')
-      assert !o.save
-      assert o.errors[:pets].any?
-
-      o.pets.build('name' => 'apet')
-      assert o.valid?
-
-      2.times { o.pets.build('name' => 'apet') }
-      assert !o.save
-      assert o.errors[:pets].any?
-    end
-  end
-
-  def test_validates_size_of_association_utf8
-    repair_validations Owner do
-      assert_nothing_raised { Owner.validates_size_of :pets, :minimum => 1 }
-      o = Owner.new('name' => 'あいうえおかきくけこ')
-      assert !o.save
-      assert o.errors[:pets].any?
-      o.pets.build('name' => 'あいうえおかきくけこ')
-      assert o.valid?
-    end
-  end
-end
+require "cases/helper"
+require 'models/owner'
+require 'models/pet'
+require 'models/person'
+
+class LengthValidationTest < ActiveRecord::TestCase
+  fixtures :owners
+
+  setup do
+    @owner = Class.new(Owner) do
+      def self.name; 'Owner'; end
+    end
+  end
+
+
+  def test_validates_size_of_association
+    assert_nothing_raised { @owner.validates_size_of :pets, minimum: 1 }
+    o = @owner.new('name' => 'nopets')
+    assert !o.save
+    assert o.errors[:pets].any?
+    o.pets.build('name' => 'apet')
+    assert o.valid?
+  end
+
+  def test_validates_size_of_association_using_within
+    assert_nothing_raised { @owner.validates_size_of :pets, within: 1..2 }
+    o = @owner.new('name' => 'nopets')
+    assert !o.save
+    assert o.errors[:pets].any?
+
+    o.pets.build('name' => 'apet')
+    assert o.valid?
+
+    2.times { o.pets.build('name' => 'apet') }
+    assert !o.save
+    assert o.errors[:pets].any?
+  end
+
+  def test_validates_size_of_association_utf8
+    @owner.validates_size_of :pets, minimum: 1
+    o = @owner.new('name' => 'あいうえおかきくけこ')
+    assert !o.save
+    assert o.errors[:pets].any?
+    o.pets.build('name' => 'あいうえおかきくけこ')
+    assert o.valid?
+  end
+
+  def test_validates_size_of_respects_records_marked_for_destruction
+    @owner.validates_size_of :pets, minimum: 1
+    owner = @owner.new
+    assert_not owner.save
+    assert owner.errors[:pets].any?
+    pet = owner.pets.build
+    assert owner.valid?
+    assert owner.save
+
+    pet_count = Pet.count
+    assert_not owner.update_attributes pets_attributes: [ {_destroy: 1, id: pet.id} ]
+    assert_not owner.valid?
+    assert owner.errors[:pets].any?
+    assert_equal pet_count, Pet.count
+  end
+
+  def test_validates_length_of_virtual_attribute_on_model
+    repair_validations(Pet) do
+      Pet.send(:attr_accessor, :nickname)
+      Pet.validates_length_of(:name, minimum: 1)
+      Pet.validates_length_of(:nickname, minimum: 1)
+
+      pet = Pet.create!(name: 'Fancy Pants', nickname: 'Fancy')
+
+      assert pet.valid?
+
+      pet.nickname = ''
+
+      assert pet.invalid?
+    end
+  end
+end