From 8e3bfa0d72ff9bd11abdf3002c1ab44f89aab83f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Sat, 26 Oct 2019 13:26:35 +0200
Subject: [PATCH] Apply Style/RedundantReturn rubocop rule

We were already following this pattern most of the time.
---
 .rubocop.yml                                | 3 +++
 app/helpers/signature_sheets_helper.rb      | 4 ++--
 app/models/debate.rb                        | 2 +-
 app/models/i18n_content.rb                  | 2 +-
 app/models/proposal.rb                      | 2 +-
 app/models/signature_sheet.rb               | 6 +++---
 spec/shared/features/nested_documentable.rb | 2 +-
 spec/shared/features/nested_imageable.rb    | 2 +-
 8 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 07b6f9b26..887da4cf0 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -409,6 +409,9 @@ Style/Proc:
 Style/RedundantFreeze:
   Enabled: true
 
+Style/RedundantReturn:
+  Enabled: true
+
 Style/SafeNavigation:
   Enabled: true
 
diff --git a/app/helpers/signature_sheets_helper.rb b/app/helpers/signature_sheets_helper.rb
index 0c32bd925..252973f0a 100644
--- a/app/helpers/signature_sheets_helper.rb
+++ b/app/helpers/signature_sheets_helper.rb
@@ -26,7 +26,7 @@ module SignatureSheetsHelper
     text_help += tag(:br)
     text_help += t("admin.signature_sheets.new.text_help.required_fields_structure_note")
 
-    return text_help
+    text_help
   end
 
   def example_text_help
@@ -45,6 +45,6 @@ module SignatureSheetsHelper
     end
 
     text_example += "#{example_1}; #{example_2}"
-    return text_example
+    text_example
   end
 end
diff --git a/app/models/debate.rb b/app/models/debate.rb
index 7512a5342..84f08c6c0 100644
--- a/app/models/debate.rb
+++ b/app/models/debate.rb
@@ -165,6 +165,6 @@ class Debate < ApplicationRecord
   def self.debates_orders(user)
     orders = %w[hot_score confidence_score created_at relevance]
     orders << "recommendations" if Setting["feature.user.recommendations_on_debates"] && user&.recommended_debates
-    return orders
+    orders
   end
 end
diff --git a/app/models/i18n_content.rb b/app/models/i18n_content.rb
index c742db04a..53af6f51e 100644
--- a/app/models/i18n_content.rb
+++ b/app/models/i18n_content.rb
@@ -40,7 +40,7 @@ class I18nContent < ApplicationRecord
     return output.update({ path => input }) unless input.is_a? Hash
 
     input.map { |key, value| flat_hash(value, [path, key].compact.join("."), output) }
-    return output
+    output
   end
 
   def self.content_for(tab)
diff --git a/app/models/proposal.rb b/app/models/proposal.rb
index ce223cdaa..c9b5a5d19 100644
--- a/app/models/proposal.rb
+++ b/app/models/proposal.rb
@@ -243,7 +243,7 @@ class Proposal < ApplicationRecord
   def self.proposals_orders(user)
     orders = %w[hot_score confidence_score created_at relevance archival_date]
     orders << "recommendations" if Setting["feature.user.recommendations_on_proposals"] && user&.recommended_proposals
-    return orders
+    orders
   end
 
   def skip_user_verification?
diff --git a/app/models/signature_sheet.rb b/app/models/signature_sheet.rb
index fae7b7a3c..aa6fdbb71 100644
--- a/app/models/signature_sheet.rb
+++ b/app/models/signature_sheet.rb
@@ -52,11 +52,11 @@ class SignatureSheet < ApplicationRecord
 
     def parse_postal_code(required_fields_to_verify)
       if Setting.force_presence_date_of_birth? && Setting.force_presence_postal_code?
-        return required_fields_to_verify[2]
+        required_fields_to_verify[2]
       elsif Setting.force_presence_postal_code?
-        return required_fields_to_verify[1]
+        required_fields_to_verify[1]
       else
-        return nil
+        nil
       end
     end
 end
diff --git a/spec/shared/features/nested_documentable.rb b/spec/shared/features/nested_documentable.rb
index d714e5b4e..679cdfee1 100644
--- a/spec/shared/features/nested_documentable.rb
+++ b/spec/shared/features/nested_documentable.rb
@@ -308,7 +308,7 @@ def documentable_redirected_to_resource_show_or_navigate_to
   find("a", text: "Not now, go to my proposal")
   click_on "Not now, go to my proposal"
 rescue
-  return
+  nil
 end
 
 def documentable_attach_new_file(path, success = true)
diff --git a/spec/shared/features/nested_imageable.rb b/spec/shared/features/nested_imageable.rb
index b1f3ed0ec..4ea707588 100644
--- a/spec/shared/features/nested_imageable.rb
+++ b/spec/shared/features/nested_imageable.rb
@@ -254,7 +254,7 @@ def imageable_redirected_to_resource_show_or_navigate_to
   find("a", text: "Not now, go to my proposal")
   click_on "Not now, go to my proposal"
 rescue
-  return
+  nil
 end
 
 def imageable_attach_new_file(_imageable_factory_name, path, success = true)