Merge branch 'rails-6-1' of https://github.com/tomasdundacek/active_i…

…nteraction into v4.0.0

.github/workflows/test.yml

@@ -32,7 +32,7 @@ jobs:
     strategy:
       matrix:
         ruby: ["2.7"]
-        activemodel: ["6.0", "5.2", "5.1", "5.0"]
+        activemodel: ["6.1", "6.0", "5.2", "5.1", "5.0"]
 
     steps:
     - uses: actions/checkout@v2

gemfiles/activemodel-6.1.rb

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activemodel', '~> 6.1.0'
+gem 'activerecord', '~> 6.1.0'
+unless defined?(JRUBY_VERSION) # rubocop:disable Style/IfUnlessModifier
+  gem 'sqlite3', '~> 1.4.1'
+end

lib/active_interaction/errors.rb

@@ -149,9 +149,10 @@ def merge_detail!(attribute, detail, message)
       if attribute?(attribute) || attribute == :base
         options = detail.dup
         error = options.delete(:error)
-        options[:message] = message
 
-        add(attribute, error, options) unless added?(attribute, error, options)
+        unless added?(attribute, error, options)
+          add(attribute, error, options.merge(message: message))
+        end
       else
         merge_message!(attribute, message)
       end

spec/active_interaction/errors_spec.rb

@@ -168,7 +168,7 @@ class B < ActiveRecord::Base
 
         it 'merges the nested errors' do
           a.valid?
-          expect(a.errors.messages).to eql('b.name': ["can't be blank"])
+          expect(a.errors.messages).to eq('b.name': ["can't be blank"])
           expect(a.errors.size).to eql 1
           expect { errors.merge!(a.errors) }.to_not raise_error
           expect(errors.size).to eql 1