From: Tom Hughes <tom@compton.nu>
Date: Thu, 13 May 2021 18:28:26 +0000 (+0100)
Subject: Fix rubocop Rake/MethodDefinitionInTask warnings
X-Git-Tag: live~1580
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6db5b2e6f31579cdedc4b85ab3298e429d1c3bbe

Fix rubocop Rake/MethodDefinitionInTask warnings
---

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index f49440e81..3059d5773 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -178,11 +178,6 @@ Rake/Desc:
     - 'lib/tasks/subscribe_old_changesets.rake'
     - 'lib/tasks/testing.rake'
 
-# Offense count: 3
-Rake/MethodDefinitionInTask:
-  Exclude:
-    - 'lib/tasks/eslint.rake'
-
 # Offense count: 558
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
diff --git a/lib/tasks/eslint.rake b/lib/tasks/eslint.rake
index 320651b5a..7f96531d9 100644
--- a/lib/tasks/eslint.rake
+++ b/lib/tasks/eslint.rake
@@ -1,20 +1,20 @@
 task "eslint" => "eslint:check"
 
-namespace "eslint" do
-  def yarn_path
-    Rails.root.join("bin/yarn").to_s
-  end
+def yarn_path
+  Rails.root.join("bin/yarn").to_s
+end
 
-  def config_file
-    Rails.root.join("config/eslint.json").to_s
-  end
+def config_file
+  Rails.root.join("config/eslint.json").to_s
+end
 
-  def js_files
-    Rails.application.assets.each_file.select do |file|
-      file.ends_with?(".js") && !file.match?(%r{/(gems|vendor|i18n|node_modules)/})
-    end
+def js_files
+  Rails.application.assets.each_file.select do |file|
+    file.ends_with?(".js") && !file.match?(%r{/(gems|vendor|i18n|node_modules)/})
   end
+end
 
+namespace "eslint" do
   task :check => :environment do
     system(yarn_path, "run", "eslint", "-c", config_file, *js_files) || abort
   end