From 511f7e16212dfd4d4756b723bbd16991ec2bc0b8 Mon Sep 17 00:00:00 2001
From: Eduardo Navarro <enavarro@suse.com>
Date: Mon, 27 May 2024 18:23:41 +0200
Subject: [PATCH 1/2] Regenerate RuboCop TODO file

With `bin/rubocop --regenerate-todo`
---
 .rubocop_todo.yml | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index eea7484..57b2cfa 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-07-18 20:10:02 UTC using RuboCop version 1.54.2.
+# on 2024-05-27 16:23:11 UTC using RuboCop version 1.55.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -64,6 +64,30 @@ 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/**/*
+RSpec/SpecFilePathSuffix:
+  Exclude:
+    - 'spec/unit/tags.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+RSpecRails/MinitestAssertions:
+  Exclude:
+    - 'spec/requests/logger_spec.rb'
+
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 Rake/Desc:

From 05ad00d8c035473f057eb42b0531ab24f60cdcda Mon Sep 17 00:00:00 2001
From: Eduardo Navarro <enavarro@suse.com>
Date: Mon, 27 May 2024 18:32:22 +0200
Subject: [PATCH 2/2] Autocorrect RSpecRails/MinitestAssertions...

... RuboCop offenses
---
 .rubocop_todo.yml            | 6 ------
 spec/requests/logger_spec.rb | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 57b2cfa..1fef0c9 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -82,12 +82,6 @@ RSpec/SpecFilePathSuffix:
   Exclude:
     - 'spec/unit/tags.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-RSpecRails/MinitestAssertions:
-  Exclude:
-    - 'spec/requests/logger_spec.rb'
-
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 Rake/Desc:
diff --git a/spec/requests/logger_spec.rb b/spec/requests/logger_spec.rb
index 7e389e2..cc59106 100644
--- a/spec/requests/logger_spec.rb
+++ b/spec/requests/logger_spec.rb
@@ -8,6 +8,6 @@
       get "/metrics"
     end
 
-    assert_includes out, "error message"
+    expect(out).to include("error message")
   end
 end