From da12346695bd3e8079e0e10d2f6a6ccbc1515552 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 22 Jul 2017 10:00:16 -0500 Subject: [PATCH] Nix more needless requires --- app/jobs/active_storage/purge_job.rb | 2 -- test/models/attachments_test.rb | 5 ----- test/models/blob_test.rb | 1 - test/test_helper.rb | 4 ++++ 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/jobs/active_storage/purge_job.rb b/app/jobs/active_storage/purge_job.rb index b59d3687f8..87eb19815d 100644 --- a/app/jobs/active_storage/purge_job.rb +++ b/app/jobs/active_storage/purge_job.rb @@ -1,5 +1,3 @@ -require "active_job" - class ActiveStorage::PurgeJob < ActiveJob::Base # FIXME: Limit this to a custom ActiveStorage error retry_on StandardError diff --git a/test/models/attachments_test.rb b/test/models/attachments_test.rb index 9b88b18247..bfe631e5cb 100644 --- a/test/models/attachments_test.rb +++ b/test/models/attachments_test.rb @@ -1,10 +1,5 @@ require "test_helper" require "database/setup" -require "active_storage/blob" - -require "active_job" -ActiveJob::Base.queue_adapter = :test -ActiveJob::Base.logger = nil # ActiveRecord::Base.logger = Logger.new(STDOUT) diff --git a/test/models/blob_test.rb b/test/models/blob_test.rb index ddc000ed51..02fe653c33 100644 --- a/test/models/blob_test.rb +++ b/test/models/blob_test.rb @@ -1,6 +1,5 @@ require "test_helper" require "database/setup" -require "active_storage/blob" class ActiveStorage::BlobTest < ActiveSupport::TestCase test "create after upload sets byte size and checksum" do diff --git a/test/test_helper.rb b/test/test_helper.rb index 5508061f6a..a92c03cf7f 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -8,6 +8,10 @@ require "active_support/testing/autorun" require "byebug" +require "active_job" +ActiveJob::Base.queue_adapter = :test +ActiveJob::Base.logger = nil + require "active_storage" require "active_storage/service" -- GitLab