From 1fb162bb4c77d68b5a2293c0b09a331bb9ec2e17 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Tue, 13 Jul 2021 23:04:38 +0100
Subject: [PATCH] Result of running rubocop -a, safe auto correct

---
 .rubocop_todo.yml                                | 16 ----------------
 app/models/spree/payment/processing.rb           |  4 ++--
 app/models/spree/stock/availability_validator.rb |  4 ++--
 spec/features/consumer/account/payments_spec.rb  |  7 +++----
 spec/queries/payments_requiring_action_spec.rb   |  7 +++----
 5 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 755275de5a..a643372650 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -16,16 +16,6 @@ Gemspec/RequiredRubyVersion:
     - 'engines/order_management/order_management.gemspec'
     - 'engines/web/web.gemspec'
 
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: with_first_argument, with_fixed_indentation
-Layout/ArgumentAlignment:
-  Exclude:
-    - 'app/models/spree/stock/availability_validator.rb'
-    - 'spec/features/consumer/account/payments_spec.rb'
-    - 'spec/queries/payments_requiring_action_spec.rb'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
@@ -683,12 +673,6 @@ Style/PreferredHashMethods:
   Exclude:
     - 'app/controllers/api/v0/shipments_controller.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/RedundantSelf:
-  Exclude:
-    - 'app/models/spree/payment/processing.rb'
-
 # Offense count: 223
 Style/Send:
   Exclude:
diff --git a/app/models/spree/payment/processing.rb b/app/models/spree/payment/processing.rb
index d4e0ba1af0..581a9b5c51 100644
--- a/app/models/spree/payment/processing.rb
+++ b/app/models/spree/payment/processing.rb
@@ -236,8 +236,8 @@ module Spree
             if response.cvv_result
               self.cvv_response_code = response.cvv_result['code']
               self.cvv_response_message = response.cvv_result['message']
-              if self.cvv_response_message.present?
-                return self.require_authorization!
+              if cvv_response_message.present?
+                return require_authorization!
               end
             end
           end
diff --git a/app/models/spree/stock/availability_validator.rb b/app/models/spree/stock/availability_validator.rb
index b4f6a9c4e0..2679457d51 100644
--- a/app/models/spree/stock/availability_validator.rb
+++ b/app/models/spree/stock/availability_validator.rb
@@ -47,8 +47,8 @@ module Spree
         display_name = variant.name.to_s
         display_name += %{(#{variant.options_text})} if variant.options_text.present?
         line_item.errors.add(:quantity, Spree.t(:out_of_stock,
-                                        scope: :order_populator,
-                                        item: display_name.inspect))
+                                                scope: :order_populator,
+                                                item: display_name.inspect))
       end
     end
   end
diff --git a/spec/features/consumer/account/payments_spec.rb b/spec/features/consumer/account/payments_spec.rb
index 48d76a2cd1..8bfc71cb22 100644
--- a/spec/features/consumer/account/payments_spec.rb
+++ b/spec/features/consumer/account/payments_spec.rb
@@ -16,10 +16,9 @@ feature "Payments requiring action", js: true do
     context "there is a payment requiring authorization" do
       let!(:payment) do
         create(:payment,
-          order: order,
-          cvv_response_message: "https://stripe.com/redirect",
-          state: "requires_authorization"
-        )
+               order: order,
+               cvv_response_message: "https://stripe.com/redirect",
+               state: "requires_authorization")
       end
 
       it "shows a table of payments requiring authorization" do
diff --git a/spec/queries/payments_requiring_action_spec.rb b/spec/queries/payments_requiring_action_spec.rb
index 27bad63977..32958b288e 100644
--- a/spec/queries/payments_requiring_action_spec.rb
+++ b/spec/queries/payments_requiring_action_spec.rb
@@ -11,10 +11,9 @@ describe PaymentsRequiringAction do
     context "payment has a cvv_response_message" do
       let(:payment) do
         create(:payment,
-          order: order,
-          cvv_response_message: "https://stripe.com/redirect",
-          state: "requires_authorization"
-        )
+               order: order,
+               cvv_response_message: "https://stripe.com/redirect",
+               state: "requires_authorization")
       end
 
       it "finds the payment" do