From 3c6c6de6648b5069e456865044950d7fa0542f43 Mon Sep 17 00:00:00 2001
From: Julia Nguyen <julianguyen@users.noreply.github.com>
Date: Sun, 8 Dec 2024 19:32:18 -0800
Subject: [PATCH] Require shoulda/matchers and database_cleaner in
 spec_helper.rb (#2340)

---
 Gemfile             | 2 +-
 Gemfile.lock        | 4 ++--
 spec/spec_helper.rb | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index da436e0d14..de6025a920 100644
--- a/Gemfile
+++ b/Gemfile
@@ -100,7 +100,7 @@ end
 group :test do
   gem 'database_cleaner'
   gem 'rails-controller-testing'
-  gem 'shoulda-matchers', '~> 5.3.0'
+  gem 'shoulda-matchers', '~> 6.0'
   gem 'simplecov', '~> 0.17.0'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 94fb49b65c..3425284ad0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -538,7 +538,7 @@ GEM
     semantic_range (3.0.0)
     sentry-ruby (5.9.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-    shoulda-matchers (5.3.0)
+    shoulda-matchers (6.4.0)
       activesupport (>= 5.2.0)
     sidekiq (6.5.10)
       connection_pool (>= 2.2.5, < 3)
@@ -686,7 +686,7 @@ DEPENDENCIES
   sdoc (= 1.0.0)
   selenium-webdriver (~> 4.22.0)
   sentry-ruby
-  shoulda-matchers (~> 5.3.0)
+  shoulda-matchers (~> 6.0)
   sidekiq (= 6.5.10)
   sidekiq-cron (~> 1.1)
   sidekiq-failures
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 06541aba57..c47acfec85 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -11,6 +11,8 @@
 require 'rspec/collection_matchers'
 require 'capybara/rails'
 require 'capybara/rspec'
+require 'shoulda/matchers'
+require 'database_cleaner'
 
 include Warden::Test::Helpers
 Warden.test_mode!