mirror of https://github.com/rails/rails
Move validator, human_name and human_attribute_name to ActiveModel, remove deprecated error messages and add i18n_scope and lookup_ancestors.
Signed-off-by: Carl Lerche <carllerche@mac.com>
This commit is contained in:
José Valim
Carl Lerche
parent
4f6d6f7031
commit
e714b499cc
|
|
@ -39,8 +39,10 @@ module ActiveModel
|
|||
autoload :Serialization, 'active_model/serialization'
|
||||
autoload :StateMachine, 'active_model/state_machine'
|
||||
autoload :TestCase, 'active_model/test_case'
|
||||
autoload :Translation, 'active_model/translation'
|
||||
autoload :Validations, 'active_model/validations'
|
||||
autoload :ValidationsRepairHelper, 'active_model/validations_repair_helper'
|
||||
autoload :Validator, 'active_model/validator'
|
||||
autoload :VERSION, 'active_model/version'
|
||||
|
||||
module Serializers
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ module ActiveModel
|
|||
# company = Company.create(:address => '123 First St.')
|
||||
# company.errors.full_messages # =>
|
||||
# ["Name is too short (minimum is 5 characters)", "Name can't be blank", "Address can't be blank"]
|
||||
def full_messages(options = {})
|
||||
def full_messages
|
||||
full_messages = []
|
||||
|
||||
each do |attribute, messages|
|
||||
|
|
@ -103,8 +103,10 @@ module ActiveModel
|
|||
if attribute == :base
|
||||
messages.each {|m| full_messages << m }
|
||||
else
|
||||
attr_name = attribute.to_s.humanize
|
||||
prefix = attr_name + I18n.t('activemodel.errors.format.separator', :default => ' ')
|
||||
attr_name = @base.class.human_attribute_name(attribute)
|
||||
options = { :default => ' ', :scope => @base.class.i18n_scope }
|
||||
prefix = attr_name + I18n.t(:"errors.format.separator", options)
|
||||
|
||||
messages.each do |m|
|
||||
full_messages << "#{prefix}#{m}"
|
||||
end
|
||||
|
|
@ -135,10 +137,7 @@ module ActiveModel
|
|||
def generate_message(attribute, message = :invalid, options = {})
|
||||
message, options[:default] = options[:default], message if options[:default].is_a?(Symbol)
|
||||
|
||||
klass_ancestors = [@base.class]
|
||||
klass_ancestors += @base.class.ancestors.reject {|x| x.is_a?(Module)}
|
||||
|
||||
defaults = klass_ancestors.map do |klass|
|
||||
defaults = @base.class.lookup_ancestors.map do |klass|
|
||||
[ :"models.#{klass.name.underscore}.attributes.#{attribute}.#{message}",
|
||||
:"models.#{klass.name.underscore}.#{message}" ]
|
||||
end
|
||||
|
|
@ -150,10 +149,10 @@ module ActiveModel
|
|||
value = @base.send(:read_attribute_for_validation, attribute)
|
||||
|
||||
options = { :default => defaults,
|
||||
:model => @base.class.name.humanize,
|
||||
:attribute => attribute.to_s.humanize,
|
||||
:model => @base.class.model_name.human,
|
||||
:attribute => @base.class.human_attribute_name(attribute),
|
||||
:value => value,
|
||||
:scope => [:activemodel, :errors]
|
||||
:scope => [@base.class.i18n_scope, :errors]
|
||||
}.merge(options)
|
||||
|
||||
I18n.translate(key, options)
|
||||
|
|
|
|||
|
|
@ -5,12 +5,13 @@ module ActiveModel
|
|||
attr_reader :singular, :plural, :element, :collection, :partial_path, :human
|
||||
alias_method :cache_key, :collection
|
||||
|
||||
def initialize(name)
|
||||
super
|
||||
def initialize(klass, name)
|
||||
super(name)
|
||||
@klass = klass
|
||||
@singular = ActiveSupport::Inflector.underscore(self).tr('/', '_').freeze
|
||||
@plural = ActiveSupport::Inflector.pluralize(@singular).freeze
|
||||
@element = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(self)).freeze
|
||||
@human = @element.gsub(/_/, " ")
|
||||
@human = ActiveSupport::Inflector.humanize(@element).freeze
|
||||
@collection = ActiveSupport::Inflector.tableize(self).freeze
|
||||
@partial_path = "#{@collection}/#{@element}".freeze
|
||||
end
|
||||
|
|
@ -20,7 +21,7 @@ module ActiveModel
|
|||
# Returns an ActiveModel::Name object for module. It can be
|
||||
# used to retrieve all kinds of naming-related information.
|
||||
def model_name
|
||||
@_model_name ||= ActiveModel::Name.new(name)
|
||||
@_model_name ||= ActiveModel::Name.new(self, name)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -0,0 +1,59 @@
|
|||
module ActiveModel
|
||||
module Translation
|
||||
include ActiveModel::Naming
|
||||
|
||||
# Returns the i18n_scope for the class. Overwrite if you want custom lookup.
|
||||
def i18n_scope
|
||||
:activemodel
|
||||
end
|
||||
|
||||
# When localizing a string, goes through the lookup returned by this method.
|
||||
# Used in ActiveModel::Name#human, ActiveModel::Errors#full_messages and
|
||||
# ActiveModel::Translation#human_attribute_name.
|
||||
def lookup_ancestors
|
||||
self.ancestors.select { |x| x.respond_to?(:model_name) }
|
||||
end
|
||||
|
||||
# Transforms attributes names into a more human format, such as "First name" instead of "first_name".
|
||||
#
|
||||
# Example:
|
||||
#
|
||||
# Person.human_attribute_name("first_name") # => "First name"
|
||||
#
|
||||
# Specify +options+ with additional translating options.
|
||||
def human_attribute_name(attribute, options = {})
|
||||
defaults = lookup_ancestors.map do |klass|
|
||||
:"#{klass.model_name.underscore}.#{attribute}"
|
||||
end
|
||||
|
||||
defaults << options.delete(:default) if options[:default]
|
||||
defaults << attribute.to_s.humanize
|
||||
|
||||
options.reverse_merge! :scope => [self.i18n_scope, :attributes], :count => 1, :default => defaults
|
||||
I18n.translate(defaults.shift, options)
|
||||
end
|
||||
|
||||
# Model.human_name is deprecated. Use Model.model_name.human instead.
|
||||
def human_name(*args)
|
||||
ActiveSupport::Deprecation.warn("human_name has been deprecated, please use model_name.human instead", caller[0,1])
|
||||
model_name.human(*args)
|
||||
end
|
||||
end
|
||||
|
||||
class Name < String
|
||||
# Transform the model name into a more humane format, using I18n. By default,
|
||||
# it will underscore then humanize the class name (BlogPost.human_name #=> "Blog post").
|
||||
# Specify +options+ with additional translating options.
|
||||
def human(options={})
|
||||
defaults = @klass.lookup_ancestors.map do |klass|
|
||||
klass.model_name.underscore.to_sym
|
||||
end
|
||||
|
||||
defaults << options.delete(:default) if options[:default]
|
||||
defaults << @human
|
||||
|
||||
options.reverse_merge! :scope => [@klass.i18n_scope, :models], :count => 1, :default => defaults
|
||||
I18n.translate(defaults.shift, options)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -7,6 +7,7 @@ module ActiveModel
|
|||
include ActiveSupport::Callbacks
|
||||
|
||||
included do
|
||||
extend ActiveModel::Translation
|
||||
define_callbacks :validate, :scope => :name
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
module ActiveRecord #:nodoc:
|
||||
module ActiveModel #:nodoc:
|
||||
|
||||
# A simple base class that can be used along with ActiveRecord::Base.validates_with
|
||||
# A simple base class that can be used along with ActiveModel::Base.validates_with
|
||||
#
|
||||
# class Person < ActiveRecord::Base
|
||||
# class Person < ActiveModel::Base
|
||||
# validates_with MyValidator
|
||||
# end
|
||||
#
|
||||
# class MyValidator < ActiveRecord::Validator
|
||||
# class MyValidator < ActiveModel::Validator
|
||||
# def validate
|
||||
# if some_complex_logic
|
||||
# record.errors[:base] = "This record is invalid"
|
||||
|
|
@ -19,14 +19,14 @@ module ActiveRecord #:nodoc:
|
|||
# end
|
||||
# end
|
||||
#
|
||||
# Any class that inherits from ActiveRecord::Validator will have access to <tt>record</tt>,
|
||||
# Any class that inherits from ActiveModel::Validator will have access to <tt>record</tt>,
|
||||
# which is an instance of the record being validated, and must implement a method called <tt>validate</tt>.
|
||||
#
|
||||
# class Person < ActiveRecord::Base
|
||||
# class Person < ActiveModel::Base
|
||||
# validates_with MyValidator
|
||||
# end
|
||||
#
|
||||
# class MyValidator < ActiveRecord::Validator
|
||||
# class MyValidator < ActiveModel::Validator
|
||||
# def validate
|
||||
# record # => The person instance being validated
|
||||
# options # => Any non-standard options passed to validates_with
|
||||
|
|
@ -36,7 +36,7 @@ module ActiveRecord #:nodoc:
|
|||
# To cause a validation error, you must add to the <tt>record<tt>'s errors directly
|
||||
# from within the validators message
|
||||
#
|
||||
# class MyValidator < ActiveRecord::Validator
|
||||
# class MyValidator < ActiveModel::Validator
|
||||
# def validate
|
||||
# record.errors[:base] << "This is some custom error message"
|
||||
# record.errors[:first_name] << "This is some complex validation"
|
||||
|
|
@ -46,7 +46,7 @@ module ActiveRecord #:nodoc:
|
|||
#
|
||||
# To add behavior to the initialize method, use the following signature:
|
||||
#
|
||||
# class MyValidator < ActiveRecord::Validator
|
||||
# class MyValidator < ActiveModel::Validator
|
||||
# def initialize(record, options)
|
||||
# super
|
||||
# @my_custom_field = options[:field_name] || :first_name
|
||||
|
|
@ -2,7 +2,7 @@ require 'cases/helper'
|
|||
|
||||
class NamingTest < ActiveModel::TestCase
|
||||
def setup
|
||||
@model_name = ActiveModel::Name.new('Post::TrackBack')
|
||||
@model_name = ActiveModel::Name.new(self, 'Post::TrackBack')
|
||||
end
|
||||
|
||||
def test_singular
|
||||
|
|
|
|||
|
|
@ -0,0 +1,51 @@
|
|||
require 'cases/helper'
|
||||
|
||||
class SuperUser
|
||||
extend ActiveModel::Translation
|
||||
end
|
||||
|
||||
class User < SuperUser
|
||||
end
|
||||
|
||||
class ActiveModelI18nTests < ActiveModel::TestCase
|
||||
|
||||
def setup
|
||||
I18n.backend = I18n::Backend::Simple.new
|
||||
end
|
||||
|
||||
def test_translated_model_attributes
|
||||
I18n.backend.store_translations 'en', :activemodel => {:attributes => {:super_user => {:name => 'super_user name attribute'} } }
|
||||
assert_equal 'super_user name attribute', SuperUser.human_attribute_name('name')
|
||||
end
|
||||
|
||||
def test_translated_model_attributes_with_symbols
|
||||
I18n.backend.store_translations 'en', :activemodel => {:attributes => {:super_user => {:name => 'super_user name attribute'} } }
|
||||
assert_equal 'super_user name attribute', SuperUser.human_attribute_name(:name)
|
||||
end
|
||||
|
||||
def test_translated_model_attributes_with_ancestor
|
||||
I18n.backend.store_translations 'en', :activemodel => {:attributes => {:user => {:name => 'user name attribute'} } }
|
||||
assert_equal 'user name attribute', User.human_attribute_name('name')
|
||||
end
|
||||
|
||||
def test_translated_model_attributes_with_ancestors_fallback
|
||||
I18n.backend.store_translations 'en', :activemodel => {:attributes => {:super_user => {:name => 'super_user name attribute'} } }
|
||||
assert_equal 'super_user name attribute', User.human_attribute_name('name')
|
||||
end
|
||||
|
||||
def test_translated_model_names
|
||||
I18n.backend.store_translations 'en', :activemodel => {:models => {:super_user => 'super_user model'} }
|
||||
assert_equal 'super_user model', SuperUser.model_name.human
|
||||
end
|
||||
|
||||
def test_translated_model_names_with_sti
|
||||
I18n.backend.store_translations 'en', :activemodel => {:models => {:user => 'user model'} }
|
||||
assert_equal 'user model', User.model_name.human
|
||||
end
|
||||
|
||||
def test_translated_model_names_with_ancestors_fallback
|
||||
I18n.backend.store_translations 'en', :activemodel => {:models => {:super_user => 'super_user model'} }
|
||||
assert_equal 'super_user model', User.model_name.human
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -63,7 +63,6 @@ class I18nGenerateMessageValidationTest < ActiveModel::TestCase
|
|||
assert_equal 'custom message title', @person.errors.generate_message(:title, :exclusion, :default => 'custom message {{value}}', :value => 'title')
|
||||
end
|
||||
|
||||
# validates_associated: generate_message(attr_name, :invalid, :default => configuration[:message], :value => value)
|
||||
# validates_format_of: generate_message(attr_name, :invalid, :default => configuration[:message], :value => value)
|
||||
def test_generate_message_invalid_with_default_message
|
||||
assert_equal 'is invalid', @person.errors.generate_message(:title, :invalid, :default => nil, :value => 'title')
|
||||
|
|
|
|||
|
|
@ -56,6 +56,12 @@ class I18nValidationTest < ActiveModel::TestCase
|
|||
@person.errors.add_on_blank :title, 'custom'
|
||||
end
|
||||
|
||||
def test_errors_full_messages_translates_human_attribute_name_for_model_attributes
|
||||
@person.errors.add('name', 'empty')
|
||||
I18n.expects(:translate).with(:"person.name", :default => ['Name'], :scope => [:activemodel, :attributes], :count => 1).returns('Name')
|
||||
@person.errors.full_messages
|
||||
end
|
||||
|
||||
# ActiveRecord::Validations
|
||||
# validates_confirmation_of w/ mocha
|
||||
def test_validates_confirmation_of_generates_message
|
||||
|
|
@ -494,6 +500,8 @@ class I18nValidationTest < ActiveModel::TestCase
|
|||
assert_equal ['global message'], @person.errors[:title]
|
||||
end
|
||||
|
||||
# test with validates_with
|
||||
|
||||
def test_validations_with_message_symbol_must_translate
|
||||
I18n.backend.store_translations 'en', :activemodel => {:errors => {:messages => {:custom_error => "I am a custom error"}}}
|
||||
Person.validates_presence_of :title, :message => :custom_error
|
||||
|
|
|
|||
|
|
@ -13,24 +13,24 @@ class ValidatesWithTest < ActiveRecord::TestCase
|
|||
ERROR_MESSAGE = "Validation error from validator"
|
||||
OTHER_ERROR_MESSAGE = "Validation error from other validator"
|
||||
|
||||
class ValidatorThatAddsErrors < ActiveRecord::Validator
|
||||
class ValidatorThatAddsErrors < ActiveModel::Validator
|
||||
def validate()
|
||||
record.errors[:base] << ERROR_MESSAGE
|
||||
end
|
||||
end
|
||||
|
||||
class OtherValidatorThatAddsErrors < ActiveRecord::Validator
|
||||
class OtherValidatorThatAddsErrors < ActiveModel::Validator
|
||||
def validate()
|
||||
record.errors[:base] << OTHER_ERROR_MESSAGE
|
||||
end
|
||||
end
|
||||
|
||||
class ValidatorThatDoesNotAddErrors < ActiveRecord::Validator
|
||||
class ValidatorThatDoesNotAddErrors < ActiveModel::Validator
|
||||
def validate()
|
||||
end
|
||||
end
|
||||
|
||||
class ValidatorThatValidatesOptions < ActiveRecord::Validator
|
||||
class ValidatorThatValidatesOptions < ActiveModel::Validator
|
||||
def validate()
|
||||
if options[:field] == :first_name
|
||||
record.errors[:base] << ERROR_MESSAGE
|
||||
|
|
|
|||
|
|
@ -71,7 +71,6 @@ module ActiveRecord
|
|||
autoload :Timestamp, 'active_record/timestamp'
|
||||
autoload :Transactions, 'active_record/transactions'
|
||||
autoload :Types, 'active_record/types'
|
||||
autoload :Validator, 'active_record/validator'
|
||||
autoload :Validations, 'active_record/validations'
|
||||
|
||||
module AttributeMethods
|
||||
|
|
|
|||
|
|
@ -1386,7 +1386,8 @@ module ActiveRecord #:nodoc:
|
|||
subclasses.each { |klass| klass.reset_inheritable_attributes; klass.reset_column_information }
|
||||
end
|
||||
|
||||
def self_and_descendants_from_active_record#nodoc:
|
||||
# Set the lookup ancestors for ActiveModel.
|
||||
def lookup_ancestors #:nodoc:
|
||||
klass = self
|
||||
classes = [klass]
|
||||
while klass != klass.base_class
|
||||
|
|
@ -1400,32 +1401,9 @@ module ActiveRecord #:nodoc:
|
|||
[self]
|
||||
end
|
||||
|
||||
# Transforms attribute key names into a more humane format, such as "First name" instead of "first_name". Example:
|
||||
# Person.human_attribute_name("first_name") # => "First name"
|
||||
# This used to be deprecated in favor of humanize, but is now preferred, because it automatically uses the I18n
|
||||
# module now.
|
||||
# Specify +options+ with additional translating options.
|
||||
def human_attribute_name(attribute_key_name, options = {})
|
||||
defaults = self_and_descendants_from_active_record.map do |klass|
|
||||
:"#{klass.name.underscore}.#{attribute_key_name}"
|
||||
end
|
||||
defaults << options[:default] if options[:default]
|
||||
defaults.flatten!
|
||||
defaults << attribute_key_name.to_s.humanize
|
||||
options[:count] ||= 1
|
||||
I18n.translate(defaults.shift, options.merge(:default => defaults, :scope => [:activerecord, :attributes]))
|
||||
end
|
||||
|
||||
# Transform the modelname into a more humane format, using I18n.
|
||||
# By default, it will underscore then humanize the class name (BlogPost.human_name #=> "Blog post").
|
||||
# Default scope of the translation is activerecord.models
|
||||
# Specify +options+ with additional translating options.
|
||||
def human_name(options = {})
|
||||
defaults = self_and_descendants_from_active_record.map do |klass|
|
||||
:"#{klass.name.underscore}"
|
||||
end
|
||||
defaults << self.name.underscore.humanize
|
||||
I18n.translate(defaults.shift, {:scope => [:activerecord, :models], :count => 1, :default => defaults}.merge(options))
|
||||
# Set the i18n scope to overwrite ActiveModel.
|
||||
def i18n_scope #:nodoc:
|
||||
:activerecord
|
||||
end
|
||||
|
||||
# True if this isn't a concrete subclass needing a STI type condition.
|
||||
|
|
|
|||
|
|
@ -17,90 +17,6 @@ module ActiveRecord
|
|||
end
|
||||
end
|
||||
|
||||
class Errors < ActiveModel::Errors
|
||||
class << self
|
||||
def default_error_messages
|
||||
message = "Errors.default_error_messages has been deprecated. Please use I18n.translate('activerecord.errors.messages')."
|
||||
ActiveSupport::Deprecation.warn(message)
|
||||
|
||||
I18n.translate 'activerecord.errors.messages'
|
||||
end
|
||||
end
|
||||
|
||||
# Returns all the full error messages in an array.
|
||||
#
|
||||
# class Company < ActiveRecord::Base
|
||||
# validates_presence_of :name, :address, :email
|
||||
# validates_length_of :name, :in => 5..30
|
||||
# end
|
||||
#
|
||||
# company = Company.create(:address => '123 First St.')
|
||||
# company.errors.full_messages # =>
|
||||
# ["Name is too short (minimum is 5 characters)", "Name can't be blank", "Address can't be blank"]
|
||||
def full_messages(options = {})
|
||||
full_messages = []
|
||||
|
||||
each do |attribute, messages|
|
||||
messages = Array.wrap(messages)
|
||||
next if messages.empty?
|
||||
|
||||
if attribute == :base
|
||||
messages.each {|m| full_messages << m }
|
||||
else
|
||||
attr_name = @base.class.human_attribute_name(attribute.to_s)
|
||||
prefix = attr_name + I18n.t('activerecord.errors.format.separator', :default => ' ')
|
||||
messages.each do |m|
|
||||
full_messages << "#{prefix}#{m}"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
full_messages
|
||||
end
|
||||
|
||||
# Translates an error message in it's default scope (<tt>activerecord.errrors.messages</tt>).
|
||||
# Error messages are first looked up in <tt>models.MODEL.attributes.ATTRIBUTE.MESSAGE</tt>, if it's not there,
|
||||
# it's looked up in <tt>models.MODEL.MESSAGE</tt> and if that is not there it returns the translation of the
|
||||
# default message (e.g. <tt>activerecord.errors.messages.MESSAGE</tt>). The translated model name,
|
||||
# translated attribute name and the value are available for interpolation.
|
||||
#
|
||||
# When using inheritance in your models, it will check all the inherited models too, but only if the model itself
|
||||
# hasn't been found. Say you have <tt>class Admin < User; end</tt> and you wanted the translation for the <tt>:blank</tt>
|
||||
# error +message+ for the <tt>title</tt> +attribute+, it looks for these translations:
|
||||
#
|
||||
# <ol>
|
||||
# <li><tt>activerecord.errors.models.admin.attributes.title.blank</tt></li>
|
||||
# <li><tt>activerecord.errors.models.admin.blank</tt></li>
|
||||
# <li><tt>activerecord.errors.models.user.attributes.title.blank</tt></li>
|
||||
# <li><tt>activerecord.errors.models.user.blank</tt></li>
|
||||
# <li><tt>activerecord.errors.messages.blank</tt></li>
|
||||
# <li>any default you provided through the +options+ hash (in the activerecord.errors scope)</li>
|
||||
# </ol>
|
||||
def generate_message(attribute, message = :invalid, options = {})
|
||||
message, options[:default] = options[:default], message if options[:default].is_a?(Symbol)
|
||||
|
||||
defaults = @base.class.self_and_descendants_from_active_record.map do |klass|
|
||||
[ :"models.#{klass.name.underscore}.attributes.#{attribute}.#{message}",
|
||||
:"models.#{klass.name.underscore}.#{message}" ]
|
||||
end
|
||||
|
||||
defaults << options.delete(:default)
|
||||
defaults = defaults.compact.flatten << :"messages.#{message}"
|
||||
|
||||
key = defaults.shift
|
||||
value = @base.respond_to?(attribute) ? @base.send(attribute) : nil
|
||||
|
||||
options = { :default => defaults,
|
||||
:model => @base.class.human_name,
|
||||
:attribute => @base.class.human_attribute_name(attribute.to_s),
|
||||
:value => value,
|
||||
:scope => [:activerecord, :errors]
|
||||
}.merge(options)
|
||||
|
||||
I18n.translate(key, options)
|
||||
end
|
||||
end
|
||||
|
||||
module Validations
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
|
|
@ -165,11 +81,6 @@ module ActiveRecord
|
|||
|
||||
errors.empty?
|
||||
end
|
||||
|
||||
# Returns the Errors object that holds all information about attribute error messages.
|
||||
def errors
|
||||
@errors ||= Errors.new(self)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -30,17 +30,17 @@ class ActiveRecordI18nTests < Test::Unit::TestCase
|
|||
|
||||
def test_translated_model_names
|
||||
I18n.backend.store_translations 'en', :activerecord => {:models => {:topic => 'topic model'} }
|
||||
assert_equal 'topic model', Topic.human_name
|
||||
assert_equal 'topic model', Topic.model_name.human
|
||||
end
|
||||
|
||||
def test_translated_model_names_with_sti
|
||||
I18n.backend.store_translations 'en', :activerecord => {:models => {:reply => 'reply model'} }
|
||||
assert_equal 'reply model', Reply.human_name
|
||||
assert_equal 'reply model', Reply.model_name.human
|
||||
end
|
||||
|
||||
def test_translated_model_names_with_sti_fallback
|
||||
I18n.backend.store_translations 'en', :activerecord => {:models => {:topic => 'topic model'} }
|
||||
assert_equal 'topic model', Reply.human_name
|
||||
assert_equal 'topic model', Reply.model_name.human
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@ class ReflectionTest < ActiveRecord::TestCase
|
|||
end
|
||||
|
||||
def test_human_name
|
||||
assert_equal "Price estimate", PriceEstimate.human_name
|
||||
assert_equal "Subscriber", Subscriber.human_name
|
||||
assert_equal "Price estimate", PriceEstimate.model_name.human
|
||||
assert_equal "Subscriber", Subscriber.model_name.human
|
||||
end
|
||||
|
||||
def test_column_null_not_null
|
||||
|
|
|
|||
|
|
@ -17,26 +17,7 @@ class I18nGenerateMessageValidationTest < ActiveRecord::TestCase
|
|||
}
|
||||
end
|
||||
|
||||
# validates_inclusion_of: generate_message(attr_name, :inclusion, :default => configuration[:message], :value => value)
|
||||
def test_generate_message_inclusion_with_default_message
|
||||
assert_equal 'is not included in the list', @topic.errors.generate_message(:title, :inclusion, :default => nil, :value => 'title')
|
||||
end
|
||||
|
||||
def test_generate_message_inclusion_with_custom_message
|
||||
assert_equal 'custom message title', @topic.errors.generate_message(:title, :inclusion, :default => 'custom message {{value}}', :value => 'title')
|
||||
end
|
||||
|
||||
# validates_exclusion_of: generate_message(attr_name, :exclusion, :default => configuration[:message], :value => value)
|
||||
def test_generate_message_exclusion_with_default_message
|
||||
assert_equal 'is reserved', @topic.errors.generate_message(:title, :exclusion, :default => nil, :value => 'title')
|
||||
end
|
||||
|
||||
def test_generate_message_exclusion_with_custom_message
|
||||
assert_equal 'custom message title', @topic.errors.generate_message(:title, :exclusion, :default => 'custom message {{value}}', :value => 'title')
|
||||
end
|
||||
|
||||
# validates_associated: generate_message(attr_name, :invalid, :default => configuration[:message], :value => value)
|
||||
# validates_format_of: generate_message(attr_name, :invalid, :default => configuration[:message], :value => value)
|
||||
def test_generate_message_invalid_with_default_message
|
||||
assert_equal 'is invalid', @topic.errors.generate_message(:title, :invalid, :default => nil, :value => 'title')
|
||||
end
|
||||
|
|
@ -45,107 +26,6 @@ class I18nGenerateMessageValidationTest < ActiveRecord::TestCase
|
|||
assert_equal 'custom message title', @topic.errors.generate_message(:title, :invalid, :default => 'custom message {{value}}', :value => 'title')
|
||||
end
|
||||
|
||||
# validates_confirmation_of: generate_message(attr_name, :confirmation, :default => configuration[:message])
|
||||
def test_generate_message_confirmation_with_default_message
|
||||
assert_equal "doesn't match confirmation", @topic.errors.generate_message(:title, :confirmation, :default => nil)
|
||||
end
|
||||
|
||||
def test_generate_message_confirmation_with_custom_message
|
||||
assert_equal 'custom message', @topic.errors.generate_message(:title, :confirmation, :default => 'custom message')
|
||||
end
|
||||
|
||||
# validates_acceptance_of: generate_message(attr_name, :accepted, :default => configuration[:message])
|
||||
def test_generate_message_accepted_with_default_message
|
||||
assert_equal "must be accepted", @topic.errors.generate_message(:title, :accepted, :default => nil)
|
||||
end
|
||||
|
||||
def test_generate_message_accepted_with_custom_message
|
||||
assert_equal 'custom message', @topic.errors.generate_message(:title, :accepted, :default => 'custom message')
|
||||
end
|
||||
|
||||
# add_on_empty: generate_message(attr, :empty, :default => custom_message)
|
||||
def test_generate_message_empty_with_default_message
|
||||
assert_equal "can't be empty", @topic.errors.generate_message(:title, :empty, :default => nil)
|
||||
end
|
||||
|
||||
def test_generate_message_empty_with_custom_message
|
||||
assert_equal 'custom message', @topic.errors.generate_message(:title, :empty, :default => 'custom message')
|
||||
end
|
||||
|
||||
# add_on_blank: generate_message(attr, :blank, :default => custom_message)
|
||||
def test_generate_message_blank_with_default_message
|
||||
assert_equal "can't be blank", @topic.errors.generate_message(:title, :blank, :default => nil)
|
||||
end
|
||||
|
||||
def test_generate_message_blank_with_custom_message
|
||||
assert_equal 'custom message', @topic.errors.generate_message(:title, :blank, :default => 'custom message')
|
||||
end
|
||||
|
||||
# validates_length_of: generate_message(attr, :too_long, :default => options[:too_long], :count => option_value.end)
|
||||
def test_generate_message_too_long_with_default_message
|
||||
assert_equal "is too long (maximum is 10 characters)", @topic.errors.generate_message(:title, :too_long, :default => nil, :count => 10)
|
||||
end
|
||||
|
||||
def test_generate_message_too_long_with_custom_message
|
||||
assert_equal 'custom message 10', @topic.errors.generate_message(:title, :too_long, :default => 'custom message {{count}}', :count => 10)
|
||||
end
|
||||
|
||||
# validates_length_of: generate_message(attr, :too_short, :default => options[:too_short], :count => option_value.begin)
|
||||
def test_generate_message_too_short_with_default_message
|
||||
assert_equal "is too short (minimum is 10 characters)", @topic.errors.generate_message(:title, :too_short, :default => nil, :count => 10)
|
||||
end
|
||||
|
||||
def test_generate_message_too_short_with_custom_message
|
||||
assert_equal 'custom message 10', @topic.errors.generate_message(:title, :too_short, :default => 'custom message {{count}}', :count => 10)
|
||||
end
|
||||
|
||||
# validates_length_of: generate_message(attr, key, :default => custom_message, :count => option_value)
|
||||
def test_generate_message_wrong_length_with_default_message
|
||||
assert_equal "is the wrong length (should be 10 characters)", @topic.errors.generate_message(:title, :wrong_length, :default => nil, :count => 10)
|
||||
end
|
||||
|
||||
def test_generate_message_wrong_length_with_custom_message
|
||||
assert_equal 'custom message 10', @topic.errors.generate_message(:title, :wrong_length, :default => 'custom message {{count}}', :count => 10)
|
||||
end
|
||||
|
||||
# validates_numericality_of: generate_message(attr_name, :not_a_number, :value => raw_value, :default => configuration[:message])
|
||||
def test_generate_message_not_a_number_with_default_message
|
||||
assert_equal "is not a number", @topic.errors.generate_message(:title, :not_a_number, :default => nil, :value => 'title')
|
||||
end
|
||||
|
||||
def test_generate_message_not_a_number_with_custom_message
|
||||
assert_equal 'custom message title', @topic.errors.generate_message(:title, :not_a_number, :default => 'custom message {{value}}', :value => 'title')
|
||||
end
|
||||
|
||||
# validates_numericality_of: generate_message(attr_name, option, :value => raw_value, :default => configuration[:message])
|
||||
def test_generate_message_greater_than_with_default_message
|
||||
assert_equal "must be greater than 10", @topic.errors.generate_message(:title, :greater_than, :default => nil, :value => 'title', :count => 10)
|
||||
end
|
||||
|
||||
def test_generate_message_greater_than_or_equal_to_with_default_message
|
||||
assert_equal "must be greater than or equal to 10", @topic.errors.generate_message(:title, :greater_than_or_equal_to, :default => nil, :value => 'title', :count => 10)
|
||||
end
|
||||
|
||||
def test_generate_message_equal_to_with_default_message
|
||||
assert_equal "must be equal to 10", @topic.errors.generate_message(:title, :equal_to, :default => nil, :value => 'title', :count => 10)
|
||||
end
|
||||
|
||||
def test_generate_message_less_than_with_default_message
|
||||
assert_equal "must be less than 10", @topic.errors.generate_message(:title, :less_than, :default => nil, :value => 'title', :count => 10)
|
||||
end
|
||||
|
||||
def test_generate_message_less_than_or_equal_to_with_default_message
|
||||
assert_equal "must be less than or equal to 10", @topic.errors.generate_message(:title, :less_than_or_equal_to, :default => nil, :value => 'title', :count => 10)
|
||||
end
|
||||
|
||||
def test_generate_message_odd_with_default_message
|
||||
assert_equal "must be odd", @topic.errors.generate_message(:title, :odd, :default => nil, :value => 'title', :count => 10)
|
||||
end
|
||||
|
||||
def test_generate_message_even_with_default_message
|
||||
assert_equal "must be even", @topic.errors.generate_message(:title, :even, :default => nil, :value => 'title', :count => 10)
|
||||
end
|
||||
|
||||
# validates_uniqueness_of: generate_message(attr_name, :taken, :default => configuration[:message])
|
||||
def test_generate_message_taken_with_default_message
|
||||
assert_equal "has already been taken", @topic.errors.generate_message(:title, :taken, :default => nil, :value => 'title')
|
||||
|
|
@ -155,4 +35,13 @@ class I18nGenerateMessageValidationTest < ActiveRecord::TestCase
|
|||
assert_equal 'custom message title', @topic.errors.generate_message(:title, :taken, :default => '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
|
||||
|
||||
end
|
||||
|
|
|
|||
|
|
@ -30,20 +30,6 @@ class I18nValidationTest < ActiveRecord::TestCase
|
|||
end
|
||||
end
|
||||
|
||||
def test_percent_s_interpolation_syntax_in_error_messages_was_deprecated
|
||||
assert_not_deprecated do
|
||||
default = "%s interpolation syntax was deprecated"
|
||||
assert_equal default, I18n.t(:does_not_exist, :default => default, :value => 'this')
|
||||
end
|
||||
end
|
||||
|
||||
def test_percent_d_interpolation_syntax_in_error_messages_was_deprecated
|
||||
assert_not_deprecated do
|
||||
default = "%d interpolation syntaxes are deprecated"
|
||||
assert_equal default, I18n.t(:does_not_exist, :default => default, :count => 2)
|
||||
end
|
||||
end
|
||||
|
||||
# ActiveRecord::Errors
|
||||
def test_errors_generate_message_translates_custom_model_attribute_key
|
||||
I18n.expects(:translate).with(
|
||||
|
|
@ -162,722 +148,4 @@ class I18nValidationTest < ActiveRecord::TestCase
|
|||
assert_equal ['global message'], replied_topic.errors[:replies]
|
||||
end
|
||||
|
||||
def test_errors_add_on_empty_generates_message
|
||||
@topic.errors.expects(:generate_message).with(:title, :empty, {:default => nil})
|
||||
@topic.errors.add_on_empty :title
|
||||
end
|
||||
|
||||
def test_errors_add_on_empty_generates_message_with_custom_default_message
|
||||
@topic.errors.expects(:generate_message).with(:title, :empty, {:default => 'custom'})
|
||||
@topic.errors.add_on_empty :title, 'custom'
|
||||
end
|
||||
|
||||
def test_errors_add_on_blank_generates_message
|
||||
@topic.errors.expects(:generate_message).with(:title, :blank, {:default => nil})
|
||||
@topic.errors.add_on_blank :title
|
||||
end
|
||||
|
||||
def test_errors_add_on_blank_generates_message_with_custom_default_message
|
||||
@topic.errors.expects(:generate_message).with(:title, :blank, {:default => 'custom'})
|
||||
@topic.errors.add_on_blank :title, 'custom'
|
||||
end
|
||||
|
||||
def test_errors_full_messages_translates_human_attribute_name_for_model_attributes
|
||||
@topic.errors.add('title', 'empty')
|
||||
I18n.expects(:translate).with(:"topic.title", :default => ['Title'], :scope => [:activerecord, :attributes], :count => 1).returns('Title')
|
||||
@topic.errors.full_messages :locale => 'en'
|
||||
end
|
||||
|
||||
# ActiveRecord::Validations
|
||||
# validates_confirmation_of w/ mocha
|
||||
def test_validates_confirmation_of_generates_message
|
||||
Topic.validates_confirmation_of :title
|
||||
@topic.title_confirmation = 'foo'
|
||||
@topic.errors.expects(:generate_message).with(:title, :confirmation, {:default => nil})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
def test_validates_confirmation_of_generates_message_with_custom_default_message
|
||||
Topic.validates_confirmation_of :title, :message => 'custom'
|
||||
@topic.title_confirmation = 'foo'
|
||||
@topic.errors.expects(:generate_message).with(:title, :confirmation, {:default => 'custom'})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
# validates_acceptance_of w/ mocha
|
||||
|
||||
def test_validates_acceptance_of_generates_message
|
||||
Topic.validates_acceptance_of :title, :allow_nil => false
|
||||
@topic.errors.expects(:generate_message).with(:title, :accepted, {:default => nil})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
def test_validates_acceptance_of_generates_message_with_custom_default_message
|
||||
Topic.validates_acceptance_of :title, :message => 'custom', :allow_nil => false
|
||||
@topic.errors.expects(:generate_message).with(:title, :accepted, {:default => 'custom'})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
# validates_presence_of w/ mocha
|
||||
|
||||
def test_validates_presence_of_generates_message
|
||||
Topic.validates_presence_of :title
|
||||
@topic.errors.expects(:generate_message).with(:title, :blank, {:default => nil})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
def test_validates_presence_of_generates_message_with_custom_default_message
|
||||
Topic.validates_presence_of :title, :message => 'custom'
|
||||
@topic.errors.expects(:generate_message).with(:title, :blank, {:default => 'custom'})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
def test_validates_length_of_within_generates_message_with_title_too_short
|
||||
Topic.validates_length_of :title, :within => 3..5
|
||||
@topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => nil})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
def test_validates_length_of_within_generates_message_with_title_too_short_and_custom_default_message
|
||||
Topic.validates_length_of :title, :within => 3..5, :too_short => 'custom'
|
||||
@topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => 'custom'})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
def test_validates_length_of_within_generates_message_with_title_too_long
|
||||
Topic.validates_length_of :title, :within => 3..5
|
||||
@topic.title = 'this title is too long'
|
||||
@topic.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => nil})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
def test_validates_length_of_within_generates_message_with_title_too_long_and_custom_default_message
|
||||
Topic.validates_length_of :title, :within => 3..5, :too_long => 'custom'
|
||||
@topic.title = 'this title is too long'
|
||||
@topic.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => 'custom'})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
# validates_length_of :within w/ mocha
|
||||
|
||||
def test_validates_length_of_within_generates_message_with_title_too_short
|
||||
Topic.validates_length_of :title, :within => 3..5
|
||||
@topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => nil})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
def test_validates_length_of_within_generates_message_with_title_too_short_and_custom_default_message
|
||||
Topic.validates_length_of :title, :within => 3..5, :too_short => 'custom'
|
||||
@topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => 'custom'})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
def test_validates_length_of_within_generates_message_with_title_too_long
|
||||
Topic.validates_length_of :title, :within => 3..5
|
||||
@topic.title = 'this title is too long'
|
||||
@topic.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => nil})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
def test_validates_length_of_within_generates_message_with_title_too_long_and_custom_default_message
|
||||
Topic.validates_length_of :title, :within => 3..5, :too_long => 'custom'
|
||||
@topic.title = 'this title is too long'
|
||||
@topic.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => 'custom'})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
# validates_length_of :is w/ mocha
|
||||
|
||||
def test_validates_length_of_is_generates_message
|
||||
Topic.validates_length_of :title, :is => 5
|
||||
@topic.errors.expects(:generate_message).with(:title, :wrong_length, {:count => 5, :default => nil})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
def test_validates_length_of_is_generates_message_with_custom_default_message
|
||||
Topic.validates_length_of :title, :is => 5, :message => 'custom'
|
||||
@topic.errors.expects(:generate_message).with(:title, :wrong_length, {:count => 5, :default => 'custom'})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
# validates_format_of w/ mocha
|
||||
|
||||
def test_validates_format_of_generates_message
|
||||
Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/
|
||||
@topic.title = '72x'
|
||||
@topic.errors.expects(:generate_message).with(:title, :invalid, {:value => '72x', :default => nil})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
def test_validates_format_of_generates_message_with_custom_default_message
|
||||
Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/, :message => 'custom'
|
||||
@topic.title = '72x'
|
||||
@topic.errors.expects(:generate_message).with(:title, :invalid, {:value => '72x', :default => 'custom'})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
# validates_inclusion_of w/ mocha
|
||||
|
||||
def test_validates_inclusion_of_generates_message
|
||||
Topic.validates_inclusion_of :title, :in => %w(a b c)
|
||||
@topic.title = 'z'
|
||||
@topic.errors.expects(:generate_message).with(:title, :inclusion, {:value => 'z', :default => nil})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
def test_validates_inclusion_of_generates_message_with_custom_default_message
|
||||
Topic.validates_inclusion_of :title, :in => %w(a b c), :message => 'custom'
|
||||
@topic.title = 'z'
|
||||
@topic.errors.expects(:generate_message).with(:title, :inclusion, {:value => 'z', :default => 'custom'})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
# validates_exclusion_of w/ mocha
|
||||
|
||||
def test_validates_exclusion_of_generates_message
|
||||
Topic.validates_exclusion_of :title, :in => %w(a b c)
|
||||
@topic.title = 'a'
|
||||
@topic.errors.expects(:generate_message).with(:title, :exclusion, {:value => 'a', :default => nil})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
def test_validates_exclusion_of_generates_message_with_custom_default_message
|
||||
Topic.validates_exclusion_of :title, :in => %w(a b c), :message => 'custom'
|
||||
@topic.title = 'a'
|
||||
@topic.errors.expects(:generate_message).with(:title, :exclusion, {:value => 'a', :default => 'custom'})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
# validates_numericality_of without :only_integer w/ mocha
|
||||
|
||||
def test_validates_numericality_of_generates_message
|
||||
Topic.validates_numericality_of :title
|
||||
@topic.title = 'a'
|
||||
@topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => nil})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
def test_validates_numericality_of_generates_message_with_custom_default_message
|
||||
Topic.validates_numericality_of :title, :message => 'custom'
|
||||
@topic.title = 'a'
|
||||
@topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => 'custom'})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
# validates_numericality_of with :only_integer w/ mocha
|
||||
|
||||
def test_validates_numericality_of_only_integer_generates_message
|
||||
Topic.validates_numericality_of :title, :only_integer => true
|
||||
@topic.title = 'a'
|
||||
@topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => nil})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
def test_validates_numericality_of_only_integer_generates_message_with_custom_default_message
|
||||
Topic.validates_numericality_of :title, :only_integer => true, :message => 'custom'
|
||||
@topic.title = 'a'
|
||||
@topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => 'custom'})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
# validates_numericality_of :odd w/ mocha
|
||||
|
||||
def test_validates_numericality_of_odd_generates_message
|
||||
Topic.validates_numericality_of :title, :only_integer => true, :odd => true
|
||||
@topic.title = 0
|
||||
@topic.errors.expects(:generate_message).with(:title, :odd, {:value => 0, :default => nil})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
def test_validates_numericality_of_odd_generates_message_with_custom_default_message
|
||||
Topic.validates_numericality_of :title, :only_integer => true, :odd => true, :message => 'custom'
|
||||
@topic.title = 0
|
||||
@topic.errors.expects(:generate_message).with(:title, :odd, {:value => 0, :default => 'custom'})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
# validates_numericality_of :less_than w/ mocha
|
||||
|
||||
def test_validates_numericality_of_less_than_generates_message
|
||||
Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0
|
||||
@topic.title = 1
|
||||
@topic.errors.expects(:generate_message).with(:title, :less_than, {:value => 1, :count => 0, :default => nil})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
def test_validates_numericality_of_odd_generates_message_with_custom_default_message
|
||||
Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0, :message => 'custom'
|
||||
@topic.title = 1
|
||||
@topic.errors.expects(:generate_message).with(:title, :less_than, {:value => 1, :count => 0, :default => 'custom'})
|
||||
@topic.valid?
|
||||
end
|
||||
|
||||
# validates_confirmation_of w/o mocha
|
||||
|
||||
def test_validates_confirmation_of_finds_custom_model_key_translation
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:confirmation => 'custom message'}}}}}}
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:confirmation => 'global message'}}}
|
||||
|
||||
Topic.validates_confirmation_of :title
|
||||
@topic.title_confirmation = 'foo'
|
||||
@topic.valid?
|
||||
assert_equal ['custom message'], @topic.errors[:title]
|
||||
end
|
||||
|
||||
def test_validates_confirmation_of_finds_global_default_translation
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:confirmation => 'global message'}}}
|
||||
|
||||
Topic.validates_confirmation_of :title
|
||||
@topic.title_confirmation = 'foo'
|
||||
@topic.valid?
|
||||
assert_equal ['global message'], @topic.errors[:title]
|
||||
end
|
||||
|
||||
# validates_acceptance_of w/o mocha
|
||||
|
||||
def test_validates_acceptance_of_finds_custom_model_key_translation
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:accepted => 'custom message'}}}}}}
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:accepted => 'global message'}}}
|
||||
|
||||
Topic.validates_acceptance_of :title, :allow_nil => false
|
||||
@topic.valid?
|
||||
assert_equal ['custom message'], @topic.errors[:title]
|
||||
end
|
||||
|
||||
def test_validates_acceptance_of_finds_global_default_translation
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:accepted => 'global message'}}}
|
||||
|
||||
Topic.validates_acceptance_of :title, :allow_nil => false
|
||||
@topic.valid?
|
||||
assert_equal ['global message'], @topic.errors[:title]
|
||||
end
|
||||
|
||||
# validates_presence_of w/o mocha
|
||||
|
||||
def test_validates_presence_of_finds_custom_model_key_translation
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:blank => 'custom message'}}}}}}
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:blank => 'global message'}}}
|
||||
|
||||
Topic.validates_presence_of :title
|
||||
@topic.valid?
|
||||
assert_equal ['custom message'], @topic.errors[:title]
|
||||
end
|
||||
|
||||
def test_validates_presence_of_finds_global_default_translation
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:blank => 'global message'}}}
|
||||
|
||||
Topic.validates_presence_of :title
|
||||
@topic.valid?
|
||||
assert_equal ['global message'], @topic.errors[:title]
|
||||
end
|
||||
|
||||
# validates_length_of :within w/o mocha
|
||||
|
||||
def test_validates_length_of_within_finds_custom_model_key_translation
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:too_short => 'custom message'}}}}}}
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:too_short => 'global message'}}}
|
||||
|
||||
Topic.validates_length_of :title, :within => 3..5
|
||||
@topic.valid?
|
||||
assert_equal ['custom message'], @topic.errors[:title]
|
||||
end
|
||||
|
||||
def test_validates_length_of_within_finds_global_default_translation
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:too_short => 'global message'}}}
|
||||
|
||||
Topic.validates_length_of :title, :within => 3..5
|
||||
@topic.valid?
|
||||
assert_equal ['global message'], @topic.errors[:title]
|
||||
end
|
||||
|
||||
# validates_length_of :is w/o mocha
|
||||
|
||||
def test_validates_length_of_is_finds_custom_model_key_translation
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:wrong_length => 'custom message'}}}}}}
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:wrong_length => 'global message'}}}
|
||||
|
||||
Topic.validates_length_of :title, :is => 5
|
||||
@topic.valid?
|
||||
assert_equal ['custom message'], @topic.errors[:title]
|
||||
end
|
||||
|
||||
def test_validates_length_of_is_finds_global_default_translation
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:wrong_length => 'global message'}}}
|
||||
|
||||
Topic.validates_length_of :title, :is => 5
|
||||
@topic.valid?
|
||||
assert_equal ['global message'], @topic.errors[:title]
|
||||
end
|
||||
|
||||
def test_validates_length_of_is_finds_custom_model_key_translation
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:wrong_length => 'custom message'}}}}}}
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:wrong_length => 'global message'}}}
|
||||
|
||||
Topic.validates_length_of :title, :is => 5
|
||||
@topic.valid?
|
||||
assert_equal ['custom message'], @topic.errors[:title]
|
||||
end
|
||||
|
||||
def test_validates_length_of_is_finds_global_default_translation
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:wrong_length => 'global message'}}}
|
||||
|
||||
Topic.validates_length_of :title, :is => 5
|
||||
@topic.valid?
|
||||
assert_equal ['global message'], @topic.errors[:title]
|
||||
end
|
||||
|
||||
|
||||
# validates_format_of w/o mocha
|
||||
|
||||
def test_validates_format_of_finds_custom_model_key_translation
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:invalid => 'custom message'}}}}}}
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:invalid => 'global message'}}}
|
||||
|
||||
Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/
|
||||
@topic.valid?
|
||||
assert_equal ['custom message'], @topic.errors[:title]
|
||||
end
|
||||
|
||||
def test_validates_format_of_finds_global_default_translation
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:invalid => 'global message'}}}
|
||||
|
||||
Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/
|
||||
@topic.valid?
|
||||
assert_equal ['global message'], @topic.errors[:title]
|
||||
end
|
||||
|
||||
# validates_inclusion_of w/o mocha
|
||||
|
||||
def test_validates_inclusion_of_finds_custom_model_key_translation
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:inclusion => 'custom message'}}}}}}
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:inclusion => 'global message'}}}
|
||||
|
||||
Topic.validates_inclusion_of :title, :in => %w(a b c)
|
||||
@topic.valid?
|
||||
assert_equal ['custom message'], @topic.errors[:title]
|
||||
end
|
||||
|
||||
def test_validates_inclusion_of_finds_global_default_translation
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:inclusion => 'global message'}}}
|
||||
|
||||
Topic.validates_inclusion_of :title, :in => %w(a b c)
|
||||
@topic.valid?
|
||||
assert_equal ['global message'], @topic.errors[:title]
|
||||
end
|
||||
|
||||
# validates_exclusion_of w/o mocha
|
||||
|
||||
def test_validates_exclusion_of_finds_custom_model_key_translation
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:exclusion => 'custom message'}}}}}}
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:exclusion => 'global message'}}}
|
||||
|
||||
Topic.validates_exclusion_of :title, :in => %w(a b c)
|
||||
@topic.title = 'a'
|
||||
@topic.valid?
|
||||
assert_equal ['custom message'], @topic.errors[:title]
|
||||
end
|
||||
|
||||
def test_validates_exclusion_of_finds_global_default_translation
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:exclusion => 'global message'}}}
|
||||
|
||||
Topic.validates_exclusion_of :title, :in => %w(a b c)
|
||||
@topic.title = 'a'
|
||||
@topic.valid?
|
||||
assert_equal ['global message'], @topic.errors[:title]
|
||||
end
|
||||
|
||||
# validates_numericality_of without :only_integer w/o mocha
|
||||
|
||||
def test_validates_numericality_of_finds_custom_model_key_translation
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:not_a_number => 'custom message'}}}}}}
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:not_a_number => 'global message'}}}
|
||||
|
||||
Topic.validates_numericality_of :title
|
||||
@topic.title = 'a'
|
||||
@topic.valid?
|
||||
assert_equal ['custom message'], @topic.errors[:title]
|
||||
end
|
||||
|
||||
def test_validates_numericality_of_finds_global_default_translation
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:not_a_number => 'global message'}}}
|
||||
|
||||
Topic.validates_numericality_of :title, :only_integer => true
|
||||
@topic.title = 'a'
|
||||
@topic.valid?
|
||||
assert_equal ['global message'], @topic.errors[:title]
|
||||
end
|
||||
|
||||
# validates_numericality_of with :only_integer w/o mocha
|
||||
|
||||
def test_validates_numericality_of_only_integer_finds_custom_model_key_translation
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:not_a_number => 'custom message'}}}}}}
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:not_a_number => 'global message'}}}
|
||||
|
||||
Topic.validates_numericality_of :title, :only_integer => true
|
||||
@topic.title = 'a'
|
||||
@topic.valid?
|
||||
assert_equal ['custom message'], @topic.errors[:title]
|
||||
end
|
||||
|
||||
def test_validates_numericality_of_only_integer_finds_global_default_translation
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:not_a_number => 'global message'}}}
|
||||
|
||||
Topic.validates_numericality_of :title, :only_integer => true
|
||||
@topic.title = 'a'
|
||||
@topic.valid?
|
||||
assert_equal ['global message'], @topic.errors[:title]
|
||||
end
|
||||
|
||||
# validates_numericality_of :odd w/o mocha
|
||||
|
||||
def test_validates_numericality_of_odd_finds_custom_model_key_translation
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:odd => 'custom message'}}}}}}
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:odd => 'global message'}}}
|
||||
|
||||
Topic.validates_numericality_of :title, :only_integer => true, :odd => true
|
||||
@topic.title = 0
|
||||
@topic.valid?
|
||||
assert_equal ['custom message'], @topic.errors[:title]
|
||||
end
|
||||
|
||||
def test_validates_numericality_of_odd_finds_global_default_translation
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:odd => 'global message'}}}
|
||||
|
||||
Topic.validates_numericality_of :title, :only_integer => true, :odd => true
|
||||
@topic.title = 0
|
||||
@topic.valid?
|
||||
assert_equal ['global message'], @topic.errors[:title]
|
||||
end
|
||||
|
||||
# validates_numericality_of :less_than w/o mocha
|
||||
|
||||
def test_validates_numericality_of_less_than_finds_custom_model_key_translation
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:less_than => 'custom message'}}}}}}
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:less_than => 'global message'}}}
|
||||
|
||||
Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0
|
||||
@topic.title = 1
|
||||
@topic.valid?
|
||||
assert_equal ['custom message'], @topic.errors[:title]
|
||||
end
|
||||
|
||||
def test_validates_numericality_of_less_than_finds_global_default_translation
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:less_than => 'global message'}}}
|
||||
|
||||
Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0
|
||||
@topic.title = 1
|
||||
@topic.valid?
|
||||
assert_equal ['global message'], @topic.errors[:title]
|
||||
end
|
||||
|
||||
def test_validations_with_message_symbol_must_translate
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:custom_error => "I am a custom error"}}}
|
||||
Topic.validates_presence_of :title, :message => :custom_error
|
||||
@topic.title = nil
|
||||
@topic.valid?
|
||||
assert_equal ["I am a custom error"], @topic.errors[:title]
|
||||
end
|
||||
|
||||
def test_validates_with_message_symbol_must_translate_per_attribute
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:custom_error => "I am a custom error"}}}}}}
|
||||
Topic.validates_presence_of :title, :message => :custom_error
|
||||
@topic.title = nil
|
||||
@topic.valid?
|
||||
assert_equal ["I am a custom error"], @topic.errors[:title]
|
||||
end
|
||||
|
||||
def test_validates_with_message_symbol_must_translate_per_model
|
||||
I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:custom_error => "I am a custom error"}}}}
|
||||
Topic.validates_presence_of :title, :message => :custom_error
|
||||
@topic.title = nil
|
||||
@topic.valid?
|
||||
assert_equal ["I am a custom error"], @topic.errors[:title]
|
||||
end
|
||||
|
||||
def test_validates_with_message_string
|
||||
Topic.validates_presence_of :title, :message => "I am a custom error"
|
||||
@topic.title = nil
|
||||
@topic.valid?
|
||||
assert_equal ["I am a custom error"], @topic.errors[:title]
|
||||
end
|
||||
end
|
||||
|
||||
class ActiveRecordValidationsGenerateMessageI18nTests < ActiveRecord::TestCase
|
||||
|
||||
def setup
|
||||
@topic = Topic.new
|
||||
I18n.backend.store_translations :'en', {
|
||||
:activerecord => {
|
||||
:errors => {
|
||||
:messages => {
|
||||
:inclusion => "is not included in the list",
|
||||
:exclusion => "is reserved",
|
||||
:invalid => "is invalid",
|
||||
:confirmation => "doesn't match confirmation",
|
||||
:accepted => "must be accepted",
|
||||
:empty => "can't be empty",
|
||||
:blank => "can't be blank",
|
||||
:too_long => "is too long (maximum is {{count}} characters)",
|
||||
:too_short => "is too short (minimum is {{count}} characters)",
|
||||
:wrong_length => "is the wrong length (should be {{count}} characters)",
|
||||
:taken => "has already been taken",
|
||||
:not_a_number => "is not a number",
|
||||
:greater_than => "must be greater than {{count}}",
|
||||
:greater_than_or_equal_to => "must be greater than or equal to {{count}}",
|
||||
:equal_to => "must be equal to {{count}}",
|
||||
:less_than => "must be less than {{count}}",
|
||||
:less_than_or_equal_to => "must be less than or equal to {{count}}",
|
||||
:odd => "must be odd",
|
||||
:even => "must be even"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
end
|
||||
|
||||
# validates_inclusion_of: generate_message(attr_name, :inclusion, :default => configuration[:message], :value => value)
|
||||
def test_generate_message_inclusion_with_default_message
|
||||
assert_equal 'is not included in the list', @topic.errors.generate_message(:title, :inclusion, :default => nil, :value => 'title')
|
||||
end
|
||||
|
||||
def test_generate_message_inclusion_with_custom_message
|
||||
assert_equal 'custom message title', @topic.errors.generate_message(:title, :inclusion, :default => 'custom message {{value}}', :value => 'title')
|
||||
end
|
||||
|
||||
# validates_exclusion_of: generate_message(attr_name, :exclusion, :default => configuration[:message], :value => value)
|
||||
def test_generate_message_exclusion_with_default_message
|
||||
assert_equal 'is reserved', @topic.errors.generate_message(:title, :exclusion, :default => nil, :value => 'title')
|
||||
end
|
||||
|
||||
def test_generate_message_exclusion_with_custom_message
|
||||
assert_equal 'custom message title', @topic.errors.generate_message(:title, :exclusion, :default => 'custom message {{value}}', :value => 'title')
|
||||
end
|
||||
|
||||
# validates_associated: generate_message(attr_name, :invalid, :default => configuration[:message], :value => value)
|
||||
# validates_format_of: generate_message(attr_name, :invalid, :default => configuration[:message], :value => value)
|
||||
def test_generate_message_invalid_with_default_message
|
||||
assert_equal 'is invalid', @topic.errors.generate_message(:title, :invalid, :default => nil, :value => 'title')
|
||||
end
|
||||
|
||||
def test_generate_message_invalid_with_custom_message
|
||||
assert_equal 'custom message title', @topic.errors.generate_message(:title, :invalid, :default => 'custom message {{value}}', :value => 'title')
|
||||
end
|
||||
|
||||
# validates_confirmation_of: generate_message(attr_name, :confirmation, :default => configuration[:message])
|
||||
def test_generate_message_confirmation_with_default_message
|
||||
assert_equal "doesn't match confirmation", @topic.errors.generate_message(:title, :confirmation, :default => nil)
|
||||
end
|
||||
|
||||
def test_generate_message_confirmation_with_custom_message
|
||||
assert_equal 'custom message', @topic.errors.generate_message(:title, :confirmation, :default => 'custom message')
|
||||
end
|
||||
|
||||
# validates_acceptance_of: generate_message(attr_name, :accepted, :default => configuration[:message])
|
||||
def test_generate_message_accepted_with_default_message
|
||||
assert_equal "must be accepted", @topic.errors.generate_message(:title, :accepted, :default => nil)
|
||||
end
|
||||
|
||||
def test_generate_message_accepted_with_custom_message
|
||||
assert_equal 'custom message', @topic.errors.generate_message(:title, :accepted, :default => 'custom message')
|
||||
end
|
||||
|
||||
# add_on_empty: generate_message(attr, :empty, :default => custom_message)
|
||||
def test_generate_message_empty_with_default_message
|
||||
assert_equal "can't be empty", @topic.errors.generate_message(:title, :empty, :default => nil)
|
||||
end
|
||||
|
||||
def test_generate_message_empty_with_custom_message
|
||||
assert_equal 'custom message', @topic.errors.generate_message(:title, :empty, :default => 'custom message')
|
||||
end
|
||||
|
||||
# add_on_blank: generate_message(attr, :blank, :default => custom_message)
|
||||
def test_generate_message_blank_with_default_message
|
||||
assert_equal "can't be blank", @topic.errors.generate_message(:title, :blank, :default => nil)
|
||||
end
|
||||
|
||||
def test_generate_message_blank_with_custom_message
|
||||
assert_equal 'custom message', @topic.errors.generate_message(:title, :blank, :default => 'custom message')
|
||||
end
|
||||
|
||||
# validates_length_of: generate_message(attr, :too_long, :default => options[:too_long], :count => option_value.end)
|
||||
def test_generate_message_too_long_with_default_message
|
||||
assert_equal "is too long (maximum is 10 characters)", @topic.errors.generate_message(:title, :too_long, :default => nil, :count => 10)
|
||||
end
|
||||
|
||||
def test_generate_message_too_long_with_custom_message
|
||||
assert_equal 'custom message 10', @topic.errors.generate_message(:title, :too_long, :default => 'custom message {{count}}', :count => 10)
|
||||
end
|
||||
|
||||
# validates_length_of: generate_message(attr, :too_short, :default => options[:too_short], :count => option_value.begin)
|
||||
def test_generate_message_too_short_with_default_message
|
||||
assert_equal "is too short (minimum is 10 characters)", @topic.errors.generate_message(:title, :too_short, :default => nil, :count => 10)
|
||||
end
|
||||
|
||||
def test_generate_message_too_short_with_custom_message
|
||||
assert_equal 'custom message 10', @topic.errors.generate_message(:title, :too_short, :default => 'custom message {{count}}', :count => 10)
|
||||
end
|
||||
|
||||
# validates_length_of: generate_message(attr, key, :default => custom_message, :count => option_value)
|
||||
def test_generate_message_wrong_length_with_default_message
|
||||
assert_equal "is the wrong length (should be 10 characters)", @topic.errors.generate_message(:title, :wrong_length, :default => nil, :count => 10)
|
||||
end
|
||||
|
||||
def test_generate_message_wrong_length_with_custom_message
|
||||
assert_equal 'custom message 10', @topic.errors.generate_message(:title, :wrong_length, :default => 'custom message {{count}}', :count => 10)
|
||||
end
|
||||
|
||||
# validates_uniqueness_of: generate_message(attr_name, :taken, :default => configuration[:message])
|
||||
def test_generate_message_taken_with_default_message
|
||||
assert_equal "has already been taken", @topic.errors.generate_message(:title, :taken, :default => nil, :value => 'title')
|
||||
end
|
||||
|
||||
def test_generate_message_taken_with_custom_message
|
||||
assert_equal 'custom message title', @topic.errors.generate_message(:title, :taken, :default => 'custom message {{value}}', :value => 'title')
|
||||
end
|
||||
|
||||
# validates_numericality_of: generate_message(attr_name, :not_a_number, :value => raw_value, :default => configuration[:message])
|
||||
def test_generate_message_not_a_number_with_default_message
|
||||
assert_equal "is not a number", @topic.errors.generate_message(:title, :not_a_number, :default => nil, :value => 'title')
|
||||
end
|
||||
|
||||
def test_generate_message_not_a_number_with_custom_message
|
||||
assert_equal 'custom message title', @topic.errors.generate_message(:title, :not_a_number, :default => 'custom message {{value}}', :value => 'title')
|
||||
end
|
||||
|
||||
# validates_numericality_of: generate_message(attr_name, option, :value => raw_value, :default => configuration[:message])
|
||||
def test_generate_message_greater_than_with_default_message
|
||||
assert_equal "must be greater than 10", @topic.errors.generate_message(:title, :greater_than, :default => nil, :value => 'title', :count => 10)
|
||||
end
|
||||
|
||||
def test_generate_message_greater_than_or_equal_to_with_default_message
|
||||
assert_equal "must be greater than or equal to 10", @topic.errors.generate_message(:title, :greater_than_or_equal_to, :default => nil, :value => 'title', :count => 10)
|
||||
end
|
||||
|
||||
def test_generate_message_equal_to_with_default_message
|
||||
assert_equal "must be equal to 10", @topic.errors.generate_message(:title, :equal_to, :default => nil, :value => 'title', :count => 10)
|
||||
end
|
||||
|
||||
def test_generate_message_less_than_with_default_message
|
||||
assert_equal "must be less than 10", @topic.errors.generate_message(:title, :less_than, :default => nil, :value => 'title', :count => 10)
|
||||
end
|
||||
|
||||
def test_generate_message_less_than_or_equal_to_with_default_message
|
||||
assert_equal "must be less than or equal to 10", @topic.errors.generate_message(:title, :less_than_or_equal_to, :default => nil, :value => 'title', :count => 10)
|
||||
end
|
||||
|
||||
def test_generate_message_odd_with_default_message
|
||||
assert_equal "must be odd", @topic.errors.generate_message(:title, :odd, :default => nil, :value => 'title', :count => 10)
|
||||
end
|
||||
|
||||
def test_generate_message_even_with_default_message
|
||||
assert_equal "must be even", @topic.errors.generate_message(:title, :even, :default => nil, :value => 'title', :count => 10)
|
||||
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
|
||||
end
|
||||
|
|
|
|||
|
|
@ -148,40 +148,9 @@ class ValidationsTest < ActiveRecord::TestCase
|
|||
assert_equal "100,000", d.salary_before_type_cast
|
||||
end
|
||||
|
||||
def test_validates_length_with_globally_modified_error_message
|
||||
defaults = ActiveSupport::Deprecation.silence { ActiveRecord::Errors.default_error_messages }
|
||||
original_message = defaults[:too_short]
|
||||
defaults[:too_short] = 'tu est trops petit hombre {{count}}'
|
||||
|
||||
Topic.validates_length_of :title, :minimum => 10
|
||||
t = Topic.create(:title => 'too short')
|
||||
assert !t.valid?
|
||||
|
||||
assert_equal ['tu est trops petit hombre 10'], t.errors[:title]
|
||||
|
||||
ensure
|
||||
defaults[:too_short] = original_message
|
||||
end
|
||||
|
||||
def test_validates_acceptance_of_as_database_column
|
||||
Topic.validates_acceptance_of(:author_name)
|
||||
topic = Topic.create("author_name" => "Dan Brown")
|
||||
assert_equal "Dan Brown", topic["author_name"]
|
||||
end
|
||||
|
||||
def test_deprecated_validation_instance_methods
|
||||
tom = DeprecatedPerson.new
|
||||
|
||||
assert_deprecated do
|
||||
assert tom.invalid?
|
||||
assert_equal ["always invalid", "invalid on create"], tom.errors[:name]
|
||||
end
|
||||
|
||||
tom.save(false)
|
||||
|
||||
assert_deprecated do
|
||||
assert tom.invalid?
|
||||
assert_equal ["always invalid", "invalid on update"], tom.errors[:name]
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue