jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests: clean up test_helper.rb initialization.

Browse Source
This commit is contained in:
evazion
2020-06-11 02:41:44 -05:00
parent 8e50f1d1a0
commit e14a577ed9
2 changed files with 14 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Gemfile
View File

@@ -83,12 +83,12 @@ group :test do
gem "shoulda-context" gem "shoulda-context"
gem "shoulda-matchers" gem "shoulda-matchers"
gem "factory_bot" gem "factory_bot"
gem "mocha" gem "mocha", require: "mocha/minitest"
gem "ffaker" gem "ffaker"
gem "simplecov", :require => false gem "simplecov", require: false
gem "webmock" gem "webmock", require: "webmock/minitest"
gem "minitest-ci" gem "minitest-ci"
gem "minitest-reporters" gem "minitest-reporters", require: "minitest/reporters"
gem "mock_redis" gem "mock_redis"
gem "capybara" gem "capybara"
gem "selenium-webdriver" gem "selenium-webdriver"

45
test/test_helper.rb
View File

@@ -1,18 +1,13 @@
ENV["RAILS_ENV"] = "test" ENV["RAILS_ENV"] = "test"
require 'simplecov' require 'simplecov'
require File.expand_path('../config/environment', __dir__) require_relative "../config/environment"
require 'rails/test_help' require 'rails/test_help'
require 'cache'
require 'webmock/minitest' Dir["#{Rails.root}/test/factories/*.rb"].sort.each { |file| require file }
require 'mocha/minitest' Dir["#{Rails.root}/test/test_helpers/*.rb"].sort.each { |file| require file }
require 'minitest/reporters'
Minitest::Reporters.use!(Minitest::Reporters::ProgressReporter.new) Minitest::Reporters.use!(Minitest::Reporters::ProgressReporter.new)
Dir[File.expand_path(File.dirname(__FILE__) + "/factories/*.rb")].sort.each {|file| require file}
Dir[File.expand_path(File.dirname(__FILE__) + "/test_helpers/*.rb")].sort.each {|file| require file}
Shoulda::Matchers.configure do |config| Shoulda::Matchers.configure do |config|
config.integrate do |with| config.integrate do |with|
with.test_framework :minitest with.test_framework :minitest
@@ -20,11 +15,7 @@ Shoulda::Matchers.configure do |config|
end end
end end
module TestHelpers Rails.application.load_seed
def as(user, &block)
CurrentUser.as(user, &block)
end
end
class ActiveSupport::TestCase class ActiveSupport::TestCase
include ActiveJob::TestHelper include ActiveJob::TestHelper
@@ -35,7 +26,6 @@ class ActiveSupport::TestCase
include DownloadTestHelper include DownloadTestHelper
include IqdbTestHelper include IqdbTestHelper
include UploadTestHelper include UploadTestHelper
include TestHelpers
mock_post_version_service! mock_post_version_service!
mock_pool_version_service! mock_pool_version_service!
@@ -66,15 +56,14 @@ class ActiveSupport::TestCase
FileUtils.rm_rf(Danbooru.config.storage_manager.base_dir) FileUtils.rm_rf(Danbooru.config.storage_manager.base_dir)
Cache.clear Cache.clear
end end
def as(user, &block)
CurrentUser.as(user, &block)
end
end end
class ActionDispatch::IntegrationTest class ActionDispatch::IntegrationTest
include TestHelpers register_encoder :xml, response_parser: ->(body) { Nokogiri.XML(body) }
extend PostArchiveTestHelper
extend PoolArchiveTestHelper
mock_post_version_service!
mock_pool_version_service!
def method_authenticated(method_name, url, user, **options) def method_authenticated(method_name, url, user, **options)
post session_path, params: { name: user.name, password: user.password } post session_path, params: { name: user.name, password: user.password }
@@ -96,18 +85,4 @@ class ActionDispatch::IntegrationTest
def delete_auth(url, user, **options) def delete_auth(url, user, **options)
method_authenticated(:delete, url, user, **options) method_authenticated(:delete, url, user, **options)
end end
def setup
super
Socket.stubs(:gethostname).returns("www.example.com")
ActionDispatch::IntegrationTest.register_encoder :xml, response_parser: ->(body) { Nokogiri.XML(body) }
end
def teardown
super
Cache.clear
end
end end
Rails.application.load_seed