From ca1373a3667debdac2829d017e232d83e2c1881c Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 30 Oct 2020 16:40:40 +0000
Subject: [PATCH] Fix Style/RescueStandardError and Style/RegexpLiteral

---
 .rubocop_todo.yml                         | 16 ----------------
 lib/spree/core/controller_helpers/auth.rb |  2 +-
 lib/spree/core/delegate_belongs_to.rb     |  2 +-
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 1e2fcdc224..3acb58cc25 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1281,22 +1281,6 @@ Style/NumericPredicate:
     - 'lib/spree/money_decorator.rb'
     - 'lib/tasks/sample_data.rake'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
-# SupportedStyles: slashes, percent_r, mixed
-Style/RegexpLiteral:
-  Exclude:
-    - 'lib/spree/core/controller_helpers/auth.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: implicit, explicit
-Style/RescueStandardError:
-  Exclude:
-    - 'lib/spree/core/delegate_belongs_to.rb'
-
 # Offense count: 231
 Style/Send:
   Exclude:
diff --git a/lib/spree/core/controller_helpers/auth.rb b/lib/spree/core/controller_helpers/auth.rb
index c6c18b9be1..553754c934 100644
--- a/lib/spree/core/controller_helpers/auth.rb
+++ b/lib/spree/core/controller_helpers/auth.rb
@@ -43,7 +43,7 @@ module Spree
             end
           end
 
-          disallowed_urls.map!{ |url| url[/\/\w+$/] }
+          disallowed_urls.map!{ |url| url[%r{/\w+$}] }
           return if disallowed_urls.include?(request.fullpath)
 
           session['spree_user_return_to'] = request.fullpath.gsub('//', '/')
diff --git a/lib/spree/core/delegate_belongs_to.rb b/lib/spree/core/delegate_belongs_to.rb
index bfbf0b1fc0..6c96134b1e 100644
--- a/lib/spree/core/delegate_belongs_to.rb
+++ b/lib/spree/core/delegate_belongs_to.rb
@@ -61,7 +61,7 @@ module DelegateBelongsTo
         methods.reject!{ |x| default_rejected_delegate_columns.include?(x.to_s) }
       end
       methods
-    rescue
+    rescue StandardError
       []
     end