fix rubocop errors

rvshare · Jan 10, 2021 · 84ec7e7 · 84ec7e7
1 parent aa60431
commit 84ec7e7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -4,6 +4,7 @@ AllCops:
   - example/db/schema.rb
   - tmp/**/*
   - vendor/**/*
+  - bin/**/*
 ClassLength:
   Max: 120
 Documentation:

diff --git a/lib/active_interaction/concerns/runnable.rb b/lib/active_interaction/concerns/runnable.rb
@@ -76,9 +76,9 @@ def run
       self.result = run_callbacks(:execute) do
         begin
           execute
-        rescue Interrupt => interrupt
-          errors.backtrace = interrupt.errors.backtrace || interrupt.backtrace
-          errors.merge!(interrupt.errors)
+        rescue Interrupt => e
+          errors.backtrace = e.errors.backtrace || e.backtrace
+          errors.merge!(e.errors)
         end
       end
     end

diff --git a/spec/active_interaction/errors_spec.rb b/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 eql('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