Merge pull request #105 from validates-email-format-of/fix-i18n-key-handling

Author: alexdunae

lib/validates_email_format_of/active_model.rb

@@ -9,7 +9,7 @@ module ActiveModel
   module Validations
     class EmailFormatValidator < EachValidator
       def validate_each(record, attribute, value)
-        (ValidatesEmailFormatOf.validate_email_format(value, options.merge(generate_message: true)) || []).each do |error|
+        (ValidatesEmailFormatOf.validate_email_format(value, options) || []).each do |error|
           record.errors.add(attribute, error)
         end
       end

spec/spec_helper.rb

@@ -4,7 +4,9 @@
 require "byebug"
 
 RSpec::Matchers.define :have_errors_on_email do
-  match do |actual|
+  match do |user|
+    actual = user.errors.full_messages
+    expect(user.errors.added?(:email, ValidatesEmailFormatOf::ERROR_MESSAGE_I18N_KEY))
     expect(actual).not_to be_nil, "#{actual} should not be nil"
     expect(actual).not_to be_empty, "#{actual} should not be empty"
     expect(actual.size).to eq(@reasons.size), "#{actual} should have #{@reasons.size} elements"
@@ -19,7 +21,7 @@
   chain :and_because do |reason|
     (@reasons ||= []) << reason
   end
-  match_when_negated do |actual|
-    expect(actual).to(be_empty)
+  match_when_negated do |user|
+    expect(user.errors).to(be_empty)
   end
 end

spec/validates_email_format_of_spec.rb

@@ -22,7 +22,7 @@ def self.model_name
         ActiveModel::Name.new(self, nil, "User")
       end
     end
-    user.new(example.example_group_instance.email).tap(&:valid?).errors.full_messages
+    user.new(example.example_group_instance.email).tap(&:valid?)
   end
   let(:options) { {} }
   let(:email) { |example| example.example_group.description }
@@ -248,13 +248,17 @@ def self.model_name
           let(:mx_record) { [] }
           describe email do
             it { should have_errors_on_email.because("is not routable") }
+            it "adds the i18n key" do
+              subject.errors.added?(:email, ValidatesEmailFormatOf::ERROR_MX_MESSAGE_I18N_KEY)
+            end
           end
           describe "with a custom error message" do
             let(:options) { {check_mx: true, mx_message: "There ain't no such domain!"} }
             describe email do
               it { should have_errors_on_email.because("There ain't no such domain!") }
             end
           end
+
           describe "i18n" do
             before(:each) do
               allow(I18n.config).to receive(:locale).and_return(locale)
@@ -383,7 +387,7 @@ def self.model_name
           ActiveModel::Name.new(self, nil, "User")
         end
       end
-      user.new(example.example_group_instance.email).tap(&:valid?).errors.full_messages
+      user.new(example.example_group_instance.email).tap(&:valid?)
     end
 
     it_should_behave_like :all_specs