From 584176adfa2a9fa9f39191a33c3b1a9125a18113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Wed, 6 Sep 2023 12:54:01 +0200 Subject: [PATCH] Add and apply Style/ArrayIntersect rubocop rule The `intersect?` method has been added in Ruby 3.1, and it's more readable than `(a & b).any?`. --- .rubocop.yml | 3 +++ app/helpers/translatable_form_helper.rb | 2 +- app/models/sdg/process_enabled.rb | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index db163bee7..ac0daad61 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -627,6 +627,9 @@ Style/AndOr: Style/ArrayCoercion: Enabled: true +Style/ArrayIntersect: + Enabled: true + Style/BlockDelimiters: Enabled: true diff --git a/app/helpers/translatable_form_helper.rb b/app/helpers/translatable_form_helper.rb index 388ec5a20..f77ca0b00 100644 --- a/app/helpers/translatable_form_helper.rb +++ b/app/helpers/translatable_form_helper.rb @@ -8,7 +8,7 @@ module TranslatableFormHelper end def backend_translations_enabled? - (controller.class.module_parents & [Admin, Management, Valuation, SDGManagement]).any? + controller.class.module_parents.intersect?([Admin, Management, Valuation, SDGManagement]) end def highlight_translation_html_class diff --git a/app/models/sdg/process_enabled.rb b/app/models/sdg/process_enabled.rb index 29b567bcf..0378155e2 100644 --- a/app/models/sdg/process_enabled.rb +++ b/app/models/sdg/process_enabled.rb @@ -43,6 +43,6 @@ class SDG::ProcessEnabled def relatable? return true if controller_path_name? - (SDG::Related::RELATABLE_TYPES & [record_or_name.class.name, record_or_name]).any? + SDG::Related::RELATABLE_TYPES.intersect?([record_or_name.class.name, record_or_name]) end end