Merge pull request rails#52397 from yahonda/follow_up_52392

Address ApplicationTests::QueryLogsTest errors
sampatbadhe · Jul 23, 2024 · a17aa63 · a17aa63
2 parents 2ea68a1 + 8be777b
commit a17aa63
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
@@ -400,7 +400,7 @@ class Railtie < Rails::Railtie # :nodoc:
           end
 
           if app.config.active_record.query_log_tags_format
-            ActiveRecord::QueryLogs.update_formatter(app.config.active_record.query_log_tags_format)
+            ActiveRecord::QueryLogs.tags_formatter = app.config.active_record.query_log_tags_format
           end
 
           if app.config.active_record.cache_query_log_tags

diff --git a/railties/test/application/query_logs_test.rb b/railties/test/application/query_logs_test.rb
@@ -277,11 +277,11 @@ def app
 
       get "/", {}, { "HTTPS" => "on" }
       comment = last_response.body.strip
-      assert_equal %(/*action:index,namespaced_controller:users,controller:users*/), comment
+      assert_match %(/*action:index,controller:users,namespaced_controller:users*/), comment
 
       get "/namespaced/users", {}, { "HTTPS" => "on" }
       comment = last_response.body.strip
-      assert_equal %(/*action:index,namespaced_controller:name_spaced/users,controller:users*/), comment
+      assert_match %(/*action:index,controller:users,namespaced_controller:name_spaced/users*/), comment
     end
 
     private