diff --git a/test/functional/tag_alias_corrections_controller_test.rb b/test/functional/tag_alias_corrections_controller_test.rb index 9a1b8a56f..344653ed4 100644 --- a/test/functional/tag_alias_corrections_controller_test.rb +++ b/test/functional/tag_alias_corrections_controller_test.rb @@ -7,7 +7,6 @@ class TagAliasCorrectionsControllerTest < ActionController::TestCase CurrentUser.user = @admin CurrentUser.ip_addr = "127.0.0.1" MEMCACHE.flush_all - Delayed::Worker.delay_jobs = false @tag_alias = FactoryGirl.create(:tag_alias, :antecedent_name => "aaa", :consequent_name => "bbb") end diff --git a/test/functional/tag_alias_requests_controller_test.rb b/test/functional/tag_alias_requests_controller_test.rb index fa7fe89cb..092dee541 100644 --- a/test/functional/tag_alias_requests_controller_test.rb +++ b/test/functional/tag_alias_requests_controller_test.rb @@ -7,7 +7,6 @@ class TagAliasRequestsControllerTest < ActionController::TestCase CurrentUser.user = @user CurrentUser.ip_addr = "127.0.0.1" MEMCACHE.flush_all - Delayed::Worker.delay_jobs = false end teardown do diff --git a/test/functional/tag_aliases_controller_test.rb b/test/functional/tag_aliases_controller_test.rb index 1d099e8d9..3d1acd5c9 100644 --- a/test/functional/tag_aliases_controller_test.rb +++ b/test/functional/tag_aliases_controller_test.rb @@ -7,7 +7,6 @@ class TagAliasesControllerTest < ActionController::TestCase CurrentUser.user = @user CurrentUser.ip_addr = "127.0.0.1" MEMCACHE.flush_all - Delayed::Worker.delay_jobs = false end teardown do diff --git a/test/functional/tag_implication_requests_controller_test.rb b/test/functional/tag_implication_requests_controller_test.rb index a440cd10e..456187dc6 100644 --- a/test/functional/tag_implication_requests_controller_test.rb +++ b/test/functional/tag_implication_requests_controller_test.rb @@ -9,7 +9,6 @@ class TagImplicationRequestsControllerTest < ActionController::TestCase CurrentUser.user = @user CurrentUser.ip_addr = "127.0.0.1" MEMCACHE.flush_all - Delayed::Worker.delay_jobs = false end teardown do diff --git a/test/functional/tag_implications_controller_test.rb b/test/functional/tag_implications_controller_test.rb index e6408eb02..7c3bc58b7 100644 --- a/test/functional/tag_implications_controller_test.rb +++ b/test/functional/tag_implications_controller_test.rb @@ -7,7 +7,6 @@ class TagImplicationsControllerTest < ActionController::TestCase CurrentUser.user = @user CurrentUser.ip_addr = "127.0.0.1" MEMCACHE.flush_all - Delayed::Worker.delay_jobs = false end teardown do diff --git a/test/test_helper.rb b/test/test_helper.rb index 167b0fe2e..0f973978c 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -105,3 +105,4 @@ if defined?(MEMCACHE) end MEMCACHE = MockMemcache.new +Delayed::Worker.delay_jobs = false diff --git a/test/unit/alias_and_implication_importer_test.rb b/test/unit/alias_and_implication_importer_test.rb index 3297fef6d..77b811841 100644 --- a/test/unit/alias_and_implication_importer_test.rb +++ b/test/unit/alias_and_implication_importer_test.rb @@ -3,7 +3,6 @@ require 'test_helper' class AliasAndImplicationImporterTest < ActiveSupport::TestCase context "The alias and implication importer" do setup do - Delayed::Worker.delay_jobs = true CurrentUser.user = FactoryGirl.create(:admin_user) CurrentUser.ip_addr = "127.0.0.1" end @@ -20,9 +19,9 @@ class AliasAndImplicationImporterTest < ActiveSupport::TestCase end should "process it" do - assert_difference("Delayed::Job.count", 2) do - @importer.process! - end + @importer.process! + assert(TagAlias.exists?(antecedent_name: "abc", consequent_name: "def")) + assert(TagImplication.exists?(antecedent_name: "aaa", consequent_name: "bbb")) end end diff --git a/test/unit/artist_test.rb b/test/unit/artist_test.rb index c233b2cd5..cc062c0b8 100644 --- a/test/unit/artist_test.rb +++ b/test/unit/artist_test.rb @@ -19,7 +19,6 @@ class ArtistTest < ActiveSupport::TestCase CurrentUser.user = user CurrentUser.ip_addr = "127.0.0.1" MEMCACHE.flush_all - Delayed::Worker.delay_jobs = false end teardown do diff --git a/test/unit/bulk_update_request_test.rb b/test/unit/bulk_update_request_test.rb index 74a62f4bf..2cd9609e1 100644 --- a/test/unit/bulk_update_request_test.rb +++ b/test/unit/bulk_update_request_test.rb @@ -6,7 +6,6 @@ class BulkUpdateRequestTest < ActiveSupport::TestCase @admin = FactoryGirl.create(:admin_user) CurrentUser.user = @admin CurrentUser.ip_addr = "127.0.0.1" - Delayed::Worker.delay_jobs = false end teardown do diff --git a/test/unit/downloads/pixiv_test.rb b/test/unit/downloads/pixiv_test.rb index f7587c8b2..4bdc76532 100644 --- a/test/unit/downloads/pixiv_test.rb +++ b/test/unit/downloads/pixiv_test.rb @@ -27,7 +27,6 @@ module Downloads context "An ugoira site for pixiv" do setup do - Delayed::Worker.delay_jobs = false @tempfile = Tempfile.new("danbooru-test") @download = Downloads::File.new("http://www.pixiv.net/member_illust.php?mode=medium&illust_id=46378654", @tempfile.path) @download.download! diff --git a/test/unit/post_test.rb b/test/unit/post_test.rb index 354b2d333..56fadd80d 100644 --- a/test/unit/post_test.rb +++ b/test/unit/post_test.rb @@ -13,7 +13,6 @@ class PostTest < ActiveSupport::TestCase CurrentUser.user = @user CurrentUser.ip_addr = "127.0.0.1" MEMCACHE.flush_all - Delayed::Worker.delay_jobs = false mock_saved_search_service! end @@ -520,7 +519,6 @@ class PostTest < ActiveSupport::TestCase context "with an artist tag that is then changed to copyright" do setup do CurrentUser.user = FactoryGirl.create(:builder_user) - Delayed::Worker.delay_jobs = false @post = Post.find(@post.id) @post.update(:tag_string => "art:abc") @post = Post.find(@post.id) @@ -528,10 +526,6 @@ class PostTest < ActiveSupport::TestCase @post.reload end - teardown do - Delayed::Worker.delay_jobs = true - end - should "update the category of the tag" do assert_equal(Tag.categories.copyright, Tag.find_by_name("abc").category) end diff --git a/test/unit/related_tag_query_test.rb b/test/unit/related_tag_query_test.rb index d8c57b0d3..01507098d 100644 --- a/test/unit/related_tag_query_test.rb +++ b/test/unit/related_tag_query_test.rb @@ -6,7 +6,6 @@ class RelatedTagQueryTest < ActiveSupport::TestCase CurrentUser.user = user CurrentUser.ip_addr = "127.0.0.1" MEMCACHE.flush_all - Delayed::Worker.delay_jobs = false end context "a related tag query without a category constraint" do diff --git a/test/unit/tag_alias_correction_test.rb b/test/unit/tag_alias_correction_test.rb index 4ab8e7b7d..c9e48575d 100644 --- a/test/unit/tag_alias_correction_test.rb +++ b/test/unit/tag_alias_correction_test.rb @@ -7,7 +7,6 @@ class TagAliasCorrectionTest < ActiveSupport::TestCase CurrentUser.user = @mod CurrentUser.ip_addr = "127.0.0.1" MEMCACHE.flush_all - Delayed::Worker.delay_jobs = false @post = FactoryGirl.create(:post, :tag_string => "aaa") @tag_alias = FactoryGirl.create(:tag_alias, :antecedent_name => "aaa", :consequent_name => "bbb") end diff --git a/test/unit/tag_alias_request_test.rb b/test/unit/tag_alias_request_test.rb index e2cffe41b..15aa68196 100644 --- a/test/unit/tag_alias_request_test.rb +++ b/test/unit/tag_alias_request_test.rb @@ -7,7 +7,6 @@ class TagAliasRequestTest < ActiveSupport::TestCase CurrentUser.user = @user CurrentUser.ip_addr = "127.0.0.1" MEMCACHE.flush_all - Delayed::Worker.delay_jobs = false end teardown do diff --git a/test/unit/tag_alias_test.rb b/test/unit/tag_alias_test.rb index 8b5322718..3681d0ee5 100644 --- a/test/unit/tag_alias_test.rb +++ b/test/unit/tag_alias_test.rb @@ -12,7 +12,6 @@ class TagAliasTest < ActiveSupport::TestCase end CurrentUser.ip_addr = "127.0.0.1" MEMCACHE.flush_all - Delayed::Worker.delay_jobs = false mock_saved_search_service! end diff --git a/test/unit/tag_implication_request_test.rb b/test/unit/tag_implication_request_test.rb index e99c13ad4..a9047aee7 100644 --- a/test/unit/tag_implication_request_test.rb +++ b/test/unit/tag_implication_request_test.rb @@ -7,7 +7,6 @@ class TagImplicationRequestTest < ActiveSupport::TestCase CurrentUser.user = @user CurrentUser.ip_addr = "127.0.0.1" MEMCACHE.flush_all - Delayed::Worker.delay_jobs = false end teardown do diff --git a/test/unit/tag_implication_test.rb b/test/unit/tag_implication_test.rb index 910dd8604..e3e49c602 100644 --- a/test/unit/tag_implication_test.rb +++ b/test/unit/tag_implication_test.rb @@ -8,7 +8,6 @@ class TagImplicationTest < ActiveSupport::TestCase CurrentUser.ip_addr = "127.0.0.1" @user = FactoryGirl.create(:user) MEMCACHE.flush_all - Delayed::Worker.delay_jobs = false end teardown do diff --git a/test/unit/tag_subscription_test.rb b/test/unit/tag_subscription_test.rb index a3a57aa55..4da3d6416 100644 --- a/test/unit/tag_subscription_test.rb +++ b/test/unit/tag_subscription_test.rb @@ -5,7 +5,6 @@ class TagSubscriptionTest < ActiveSupport::TestCase user = FactoryGirl.create(:user) CurrentUser.user = user CurrentUser.ip_addr = "127.0.0.1" - Delayed::Worker.delay_jobs = false MEMCACHE.flush_all end diff --git a/test/unit/tag_test.rb b/test/unit/tag_test.rb index 5959e9a7b..ce60e0311 100644 --- a/test/unit/tag_test.rb +++ b/test/unit/tag_test.rb @@ -6,7 +6,6 @@ class TagTest < ActiveSupport::TestCase CurrentUser.user = user CurrentUser.ip_addr = "127.0.0.1" MEMCACHE.flush_all - Delayed::Worker.delay_jobs = false end teardown do diff --git a/test/unit/upload_test.rb b/test/unit/upload_test.rb index 627f41200..686de5058 100644 --- a/test/unit/upload_test.rb +++ b/test/unit/upload_test.rb @@ -16,13 +16,11 @@ class UploadTest < ActiveSupport::TestCase CurrentUser.user = user CurrentUser.ip_addr = "127.0.0.1" MEMCACHE.flush_all - Delayed::Worker.delay_jobs = false end teardown do CurrentUser.user = nil CurrentUser.ip_addr = nil - Delayed::Worker.delay_jobs = true @upload.delete_temp_file if @upload end diff --git a/test/unit/user_deletion_test.rb b/test/unit/user_deletion_test.rb index 1a6db0811..3fd9b2bda 100644 --- a/test/unit/user_deletion_test.rb +++ b/test/unit/user_deletion_test.rb @@ -4,7 +4,6 @@ class UserDeletionTest < ActiveSupport::TestCase context "an invalid user deletion" do context "for an invalid password" do setup do - Delayed::Worker.delay_jobs = false @user = FactoryGirl.create(:user) CurrentUser.user = @user CurrentUser.ip_addr = "127.0.0.1" @@ -20,7 +19,6 @@ class UserDeletionTest < ActiveSupport::TestCase context "for an admin" do setup do - Delayed::Worker.delay_jobs = false @user = FactoryGirl.create(:admin_user) CurrentUser.user = @user CurrentUser.ip_addr = "127.0.0.1" @@ -37,8 +35,6 @@ class UserDeletionTest < ActiveSupport::TestCase context "a valid user deletion" do setup do - Delayed::Worker.delay_jobs = false - @user = FactoryGirl.create(:user) CurrentUser.user = @user CurrentUser.ip_addr = "127.0.0.1"