Skip to content

Commit

Permalink
Removes unnecessary comments from i18n validations tests [ci skip]
Browse files Browse the repository at this point in the history 
These comments do not add a lot to the readability, grepability or
overall understanding of the tests, therefore I believe they can be
safely removed.
  • Loading branch information
@zamith
zamith committed Jul 11, 2015
1 parent c35c0c4 commit a9ab7e8
Showing 1 changed file with 2 additions and 61 deletions.
63 changes: 2 additions & 61 deletions activemodel/test/cases/validations/i18n_validation_test.rb
View file
Expand Up @@ -55,8 +55,6 @@ def test_errors_full_messages_uses_format
[ "given option that is not reserved", { format: "jpg" }, { format: "jpg" }]
]

# validates_confirmation_of w/ mocks

COMMON_CASES.each do |name, validation_options, generate_message_options|
test "validates_confirmation_of on generated message #{name}" do
Person.validates_confirmation_of :title, validation_options
Expand All @@ -68,8 +66,6 @@ def test_errors_full_messages_uses_format
end
end

# validates_acceptance_of w/ mocks

COMMON_CASES.each do |name, validation_options, generate_message_options|
test "validates_acceptance_of on generated message #{name}" do
Person.validates_acceptance_of :title, validation_options.merge(allow_nil: false)
Expand All @@ -80,8 +76,6 @@ def test_errors_full_messages_uses_format
end
end

# validates_presence_of w/ mocks

COMMON_CASES.each do |name, validation_options, generate_message_options|
test "validates_presence_of on generated message #{name}" do
Person.validates_presence_of :title, validation_options
Expand All @@ -92,8 +86,6 @@ def test_errors_full_messages_uses_format
end
end

# validates_length_of :within too short w/ mocks

COMMON_CASES.each do |name, validation_options, generate_message_options|
test "validates_length_of for :within on generated message when too short #{name}" do
Person.validates_length_of :title, validation_options.merge(within: 3..5)
Expand All @@ -104,8 +96,6 @@ def test_errors_full_messages_uses_format
end
end

# validates_length_of :within too long w/ mocks

COMMON_CASES.each do |name, validation_options, generate_message_options|
test "validates_length_of for :too_long generated message #{name}" do
Person.validates_length_of :title, validation_options.merge(within: 3..5)
Expand All @@ -117,8 +107,6 @@ def test_errors_full_messages_uses_format
end
end

# validates_length_of :is w/ mocks

COMMON_CASES.each do |name, validation_options, generate_message_options|
test "validates_length_of for :is on generated message #{name}" do
Person.validates_length_of :title, validation_options.merge(is: 5)
Expand All @@ -129,8 +117,6 @@ def test_errors_full_messages_uses_format
end
end

# validates_format_of w/ mocks

COMMON_CASES.each do |name, validation_options, generate_message_options|
test "validates_format_of on generated message #{name}" do
Person.validates_format_of :title, validation_options.merge(with: /\A[1-9][0-9]*\z/)
Expand All @@ -142,8 +128,6 @@ def test_errors_full_messages_uses_format
end
end

# validates_inclusion_of w/ mocks

COMMON_CASES.each do |name, validation_options, generate_message_options|
test "validates_inclusion_of on generated message #{name}" do
Person.validates_inclusion_of :title, validation_options.merge(in: %w(a b c))
Expand All @@ -155,8 +139,6 @@ def test_errors_full_messages_uses_format
end
end

# validates_inclusion_of using :within w/ mocks

COMMON_CASES.each do |name, validation_options, generate_message_options|
test "validates_inclusion_of using :within on generated message #{name}" do
Person.validates_inclusion_of :title, validation_options.merge(within: %w(a b c))
Expand All @@ -168,8 +150,6 @@ def test_errors_full_messages_uses_format
end
end

# validates_exclusion_of w/ mocks

COMMON_CASES.each do |name, validation_options, generate_message_options|
test "validates_exclusion_of generated message #{name}" do
Person.validates_exclusion_of :title, validation_options.merge(in: %w(a b c))
Expand All @@ -181,8 +161,6 @@ def test_errors_full_messages_uses_format
end
end

# validates_exclusion_of using :within w/ mocks

COMMON_CASES.each do |name, validation_options, generate_message_options|
test "validates_exclusion_of using :within generated message #{name}" do
Person.validates_exclusion_of :title, validation_options.merge(within: %w(a b c))
Expand All @@ -194,8 +172,6 @@ def test_errors_full_messages_uses_format
end
end

# validates_numericality_of without :only_integer w/ mocks

COMMON_CASES.each do |name, validation_options, generate_message_options|
test "validates_numericality_of generated message #{name}" do
Person.validates_numericality_of :title, validation_options
Expand All @@ -207,8 +183,6 @@ def test_errors_full_messages_uses_format
end
end

# validates_numericality_of with :only_integer w/ mocks

COMMON_CASES.each do |name, validation_options, generate_message_options|
test "validates_numericality_of for :only_integer on generated message #{name}" do
Person.validates_numericality_of :title, validation_options.merge(only_integer: true)
Expand All @@ -220,8 +194,6 @@ def test_errors_full_messages_uses_format
end
end

# validates_numericality_of :odd w/ mocks

COMMON_CASES.each do |name, validation_options, generate_message_options|
test "validates_numericality_of for :odd on generated message #{name}" do
Person.validates_numericality_of :title, validation_options.merge(only_integer: true, odd: true)
Expand All @@ -233,8 +205,6 @@ def test_errors_full_messages_uses_format
end
end

# validates_numericality_of :less_than w/ mocks

COMMON_CASES.each do |name, validation_options, generate_message_options|
test "validates_numericality_of for :less_than on generated message #{name}" do
Person.validates_numericality_of :title, validation_options.merge(only_integer: true, less_than: 0)
Expand All @@ -246,15 +216,14 @@ def test_errors_full_messages_uses_format
end
end


# To make things DRY this macro is defined to define 3 tests for every validation case.
# To make things DRY this macro is created to define 3 tests for every validation case.
def self.set_expectations_for_validation(validation, error_type, &block_that_sets_validation)
if error_type == :confirmation
attribute = :title_confirmation
else
attribute = :title
end
# test "validates_confirmation_of finds custom model key translation when blank"

test "#{validation} finds custom model key translation when #{error_type}" do
I18n.backend.store_translations 'en', activemodel: { errors: { models: { person: { attributes: { attribute => { error_type => 'custom message' } } } } } }
I18n.backend.store_translations 'en', errors: { messages: { error_type => 'global message'}}
Expand All @@ -264,7 +233,6 @@ def self.set_expectations_for_validation(validation, error_type, &block_that_set
assert_equal ['custom message'], @person.errors[attribute]
end

# test "validates_confirmation_of finds custom model key translation with interpolation when blank"
test "#{validation} finds custom model key translation with interpolation when #{error_type}" do
I18n.backend.store_translations 'en', activemodel: { errors: { models: { person: { attributes: { attribute => { error_type => 'custom message with %{extra}' } } } } } }
I18n.backend.store_translations 'en', errors: { messages: {error_type => 'global message'} }
Expand All @@ -274,7 +242,6 @@ def self.set_expectations_for_validation(validation, error_type, &block_that_set
assert_equal ['custom message with extra information'], @person.errors[attribute]
end

# test "validates_confirmation_of finds global default key translation when blank"
test "#{validation} finds global default key translation when #{error_type}" do
I18n.backend.store_translations 'en', errors: { messages: {error_type => 'global message'} }

Expand All @@ -284,27 +251,19 @@ def self.set_expectations_for_validation(validation, error_type, &block_that_set
end
end

# validates_confirmation_of w/o mocks

set_expectations_for_validation "validates_confirmation_of", :confirmation do |person, options_to_merge|
Person.validates_confirmation_of :title, options_to_merge
person.title_confirmation = 'foo'
end

# validates_acceptance_of w/o mocks

set_expectations_for_validation "validates_acceptance_of", :accepted do |person, options_to_merge|
Person.validates_acceptance_of :title, options_to_merge.merge(allow_nil: false)
end

# validates_presence_of w/o mocks

set_expectations_for_validation "validates_presence_of", :blank do |person, options_to_merge|
Person.validates_presence_of :title, options_to_merge
end

# validates_length_of :within w/o mocks

set_expectations_for_validation "validates_length_of", :too_short do |person, options_to_merge|
Person.validates_length_of :title, options_to_merge.merge(within: 3..5)
end
Expand All @@ -314,61 +273,43 @@ def self.set_expectations_for_validation(validation, error_type, &block_that_set
person.title = "too long"
end

# validates_length_of :is w/o mocks

set_expectations_for_validation "validates_length_of", :wrong_length do |person, options_to_merge|
Person.validates_length_of :title, options_to_merge.merge(is: 5)
end

# validates_format_of w/o mocks

set_expectations_for_validation "validates_format_of", :invalid do |person, options_to_merge|
Person.validates_format_of :title, options_to_merge.merge(with: /\A[1-9][0-9]*\z/)
end

# validates_inclusion_of w/o mocks

set_expectations_for_validation "validates_inclusion_of", :inclusion do |person, options_to_merge|
Person.validates_inclusion_of :title, options_to_merge.merge(in: %w(a b c))
end

# validates_exclusion_of w/o mocks

set_expectations_for_validation "validates_exclusion_of", :exclusion do |person, options_to_merge|
Person.validates_exclusion_of :title, options_to_merge.merge(in: %w(a b c))
person.title = 'a'
end

# validates_numericality_of without :only_integer w/o mocks

set_expectations_for_validation "validates_numericality_of", :not_a_number do |person, options_to_merge|
Person.validates_numericality_of :title, options_to_merge
person.title = 'a'
end

# validates_numericality_of with :only_integer w/o mocks

set_expectations_for_validation "validates_numericality_of", :not_an_integer do |person, options_to_merge|
Person.validates_numericality_of :title, options_to_merge.merge(only_integer: true)
person.title = '1.0'
end

# validates_numericality_of :odd w/o mocks

set_expectations_for_validation "validates_numericality_of", :odd do |person, options_to_merge|
Person.validates_numericality_of :title, options_to_merge.merge(only_integer: true, odd: true)
person.title = 0
end

# validates_numericality_of :less_than w/o mocks

set_expectations_for_validation "validates_numericality_of", :less_than do |person, options_to_merge|
Person.validates_numericality_of :title, options_to_merge.merge(only_integer: true, less_than: 0)
person.title = 1
end

# test with validates_with

def test_validations_with_message_symbol_must_translate
I18n.backend.store_translations 'en', errors: { messages: { custom_error: "I am a custom error" } }
Person.validates_presence_of :title, message: :custom_error
Expand Down

0 comments on commit a9ab7e8

Please sign in to comment.