fix #417 by allowing explicitly made detailed errors on :base mergeable

AaronLasseigne · Jun 9, 2017 · 017276a · 017276a
1 parent 4ae9a05
commit 017276a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/active_interaction/errors.rb b/lib/active_interaction/errors.rb
@@ -126,7 +126,7 @@ def merge_details!(other)
     end
 
     def merge_detail!(other, attribute, detail, error)
-      if attribute?(attribute)
+      if attribute?(attribute) || attribute == :base
         add(attribute, error, detail) unless added?(attribute, error, detail)
       else
         translated_error = translate(other, attribute, error)

diff --git a/spec/active_interaction/errors_spec.rb b/spec/active_interaction/errors_spec.rb
@@ -68,6 +68,17 @@ def self.name
         end
       end
 
+      context 'that is a symbol on base' do
+        before do
+          other.add(:base)
+        end
+
+        it 'adds the error' do
+          errors.merge!(other)
+          expect(errors.details[:base]).to eql [{ error: :invalid }]
+        end
+      end
+
       context 'that is a string' do
         let(:message) { SecureRandom.hex }