forked from e621ng/e621ng
[Tests] Use factory_bot_rails and clean up test_helper requires
This commit is contained in:
parent
00c1dc27e1
commit
a34c2217b6
10
Gemfile
10
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
|
||||
|
@ -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
|
||||
|
@ -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|
|
||||
|
Loading…
Reference in New Issue
Block a user