From cde235d321df92562b4e5693af4369f8beb1ab4e Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Mon, 29 Jan 2024 15:59:30 +0100
Subject: [PATCH] Fixes #37116 - Enable bullet in the test environment

bullet is a tool to find n+1 query patterns. We already have it enabled
in development, but not in testing. If we configure it to raise
exceptions, we should have better guards against inefficient patterns.
---
 bundler.d/development.rb    | 1 -
 bundler.d/test.rb           | 1 +
 config/environments/test.rb | 6 ++++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bundler.d/development.rb b/bundler.d/development.rb
index f17b5a2d91c..b2d3f61cf6f 100644
--- a/bundler.d/development.rb
+++ b/bundler.d/development.rb
@@ -18,7 +18,6 @@
 
   gem 'rainbow', '>= 2.2.1'
 
-  gem 'bullet', '>= 6.1.0'
   gem "parallel_tests"
   gem 'spring', '>= 1.0', '< 3'
   gem 'benchmark-ips', '>= 2.8.2'
diff --git a/bundler.d/test.rb b/bundler.d/test.rb
index cc0e935014b..6b133f5e5a1 100644
--- a/bundler.d/test.rb
+++ b/bundler.d/test.rb
@@ -1,4 +1,5 @@
 group :test do
+  gem 'bullet', '>= 6.1.0'
   gem 'mocha', '~> 2.1'
   gem 'minitest', '~> 5.1'
   gem 'minitest-reporters', '~> 1.4', :require => false
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 5ed9ce61c2f..5240732a31d 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -74,4 +74,10 @@
     end
     ASDeprecationTracker.resume!
   end
+
+  config.after_initialize do
+    Bullet.enable = true
+    Bullet.bullet_logger = true
+    Bullet.raise = true # raise an error if n+1 query occurs
+  end
 end