From a34c2217b6f2c09377e23396532666fd70a00c0e Mon Sep 17 00:00:00 2001
From: Earlopain <earlopain@protonmail.com>
Date: Fri, 25 Nov 2022 19:56:14 +0100
Subject: [PATCH] [Tests] Use factory_bot_rails and clean up test_helper
 requires

---
 Gemfile             | 10 +++++-----
 Gemfile.lock        |  5 ++++-
 test/test_helper.rb | 20 +++++++++++---------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5e6f36301..c31bc4726 100644
--- a/Gemfile
+++ b/Gemfile
@@ -60,9 +60,9 @@ group :docker do
 end
 
 group :test do
-  gem "shoulda-context"
-  gem "shoulda-matchers"
-  gem "factory_bot"
-  gem "mocha", :require => "mocha/minitest"
-  gem "webmock"
+  gem "shoulda-context", require: false
+  gem "shoulda-matchers", require: false
+  gem "factory_bot_rails", require: false
+  gem "mocha", require: false
+  gem "webmock", require: false
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index c2eeccd21..b5c5bdba7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -138,6 +138,9 @@ GEM
     erubi (1.11.0)
     factory_bot (6.2.1)
       activesupport (>= 5.0.0)
+    factory_bot_rails (6.2.0)
+      factory_bot (~> 6.2.0)
+      railties (>= 5.0.0)
     faraday (1.10.2)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -406,7 +409,7 @@ DEPENDENCIES
   dtext_rb!
   elasticsearch-model
   elasticsearch-rails
-  factory_bot
+  factory_bot_rails
   httparty
   listen
   mailgun-ruby
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 72cb96d57..2929d8a2a 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,14 +1,16 @@
-ENV["RAILS_ENV"] = "test"
+ENV["RAILS_ENV"] ||= "test"
+ENV["MT_NO_EXPECTATIONS"] = "true"
+require_relative "../config/environment"
+require "rails/test_help"
 
-require File.expand_path('../../config/environment', __FILE__)
-require 'rails/test_help'
-require 'cache'
-require 'webmock/minitest'
+require "factory_bot_rails"
+require "mocha/minitest"
+require "shoulda-context"
+require "shoulda-matchers"
+require "webmock/minitest"
 
-require 'sidekiq/testing'
-Sidekiq::Testing::fake!
-
-Dir[File.expand_path(File.dirname(__FILE__) + "/factories/*.rb")].each {|file| require file}
+require "sidekiq/testing"
+Sidekiq::Testing.fake!
 
 Shoulda::Matchers.configure do |config|
   config.integrate do |with|