From 255dd7b98d217815f7f1eeb58978d5508e279249 Mon Sep 17 00:00:00 2001
From: Eduardo Navarro <enavarro@suse.com>
Date: Tue, 28 May 2024 13:47:21 +0200
Subject: [PATCH 1/2] Fix RSpec/SpecFilePathFormat RuboCop offenses manually

---
 .rubocop_todo.yml                                     | 11 -----------
 spec/unit/{ => influx_db/rails}/configuration_spec.rb |  0
 .../unit/{ => influx_db/rails}/sql/normalizer_spec.rb |  0
 spec/unit/{ => influx_db/rails}/sql/query_spec.rb     |  0
 .../rails_spec.rb}                                    |  0
 5 files changed, 11 deletions(-)
 rename spec/unit/{ => influx_db/rails}/configuration_spec.rb (100%)
 rename spec/unit/{ => influx_db/rails}/sql/normalizer_spec.rb (100%)
 rename spec/unit/{ => influx_db/rails}/sql/query_spec.rb (100%)
 rename spec/unit/{block_instrumentation_spec.rb => influx_db/rails_spec.rb} (100%)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 1fef0c9..283d868 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -64,17 +64,6 @@ RSpec/RepeatedDescription:
   Exclude:
     - 'spec/requests/active_record_sql_metrics_spec.rb'
 
-# Offense count: 4
-# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
-# Include: **/*_spec.rb
-RSpec/SpecFilePathFormat:
-  Exclude:
-    - '**/spec/routing/**/*'
-    - 'spec/unit/block_instrumentation_spec.rb'
-    - 'spec/unit/configuration_spec.rb'
-    - 'spec/unit/sql/normalizer_spec.rb'
-    - 'spec/unit/sql/query_spec.rb'
-
 # Offense count: 1
 # Configuration parameters: Include.
 # Include: **/*_spec*rb*, **/spec/**/*
diff --git a/spec/unit/configuration_spec.rb b/spec/unit/influx_db/rails/configuration_spec.rb
similarity index 100%
rename from spec/unit/configuration_spec.rb
rename to spec/unit/influx_db/rails/configuration_spec.rb
diff --git a/spec/unit/sql/normalizer_spec.rb b/spec/unit/influx_db/rails/sql/normalizer_spec.rb
similarity index 100%
rename from spec/unit/sql/normalizer_spec.rb
rename to spec/unit/influx_db/rails/sql/normalizer_spec.rb
diff --git a/spec/unit/sql/query_spec.rb b/spec/unit/influx_db/rails/sql/query_spec.rb
similarity index 100%
rename from spec/unit/sql/query_spec.rb
rename to spec/unit/influx_db/rails/sql/query_spec.rb
diff --git a/spec/unit/block_instrumentation_spec.rb b/spec/unit/influx_db/rails_spec.rb
similarity index 100%
rename from spec/unit/block_instrumentation_spec.rb
rename to spec/unit/influx_db/rails_spec.rb

From ed20a20b6d38e7a3a19f6b8defe9667ebf546873 Mon Sep 17 00:00:00 2001
From: Eduardo Navarro <enavarro@suse.com>
Date: Tue, 28 May 2024 13:50:16 +0200
Subject: [PATCH 2/2] Regenerate RuboCop TODO file

---
 .rubocop_todo.yml | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 283d868..c79bc65 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -31,20 +31,16 @@ RSpec/DescribeClass:
     - '**/spec/views/**/*'
     - 'spec/integration/influxdb_rails_sends_metrics_spec.rb'
 
-# Offense count: 36
+# Offense count: 35
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 19
 
-# Offense count: 5
+# Offense count: 1
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
 # Include: **/*_spec*rb*, **/spec/**/*
 RSpec/FilePath:
   Exclude:
-    - 'spec/unit/block_instrumentation_spec.rb'
-    - 'spec/unit/configuration_spec.rb'
-    - 'spec/unit/sql/normalizer_spec.rb'
-    - 'spec/unit/sql/query_spec.rb'
     - 'spec/unit/tags.rb'
 
 # Offense count: 3
@@ -56,13 +52,8 @@ RSpec/MultipleExpectations:
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
   Exclude:
-    - 'spec/unit/configuration_spec.rb'
-    - 'spec/unit/sql/query_spec.rb'
-
-# Offense count: 2
-RSpec/RepeatedDescription:
-  Exclude:
-    - 'spec/requests/active_record_sql_metrics_spec.rb'
+    - 'spec/unit/influx_db/rails/configuration_spec.rb'
+    - 'spec/unit/influx_db/rails/sql/query_spec.rb'
 
 # Offense count: 1
 # Configuration parameters: Include.