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

jobs: migrate file deletion jobs to ActiveJob.

Browse Source
This commit is contained in:
evazion
2019-08-16 20:49:35 -05:00
parent 2b6361369e
commit 868a2256d1
6 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/models/upload_service_test.rb
View File

@@ -838,7 +838,7 @@ class UploadServiceTest < ActiveSupport::TestCase
as_user { @post.replace!(replacement_url: "https://www.pixiv.net/member_illust.php?mode=medium&illust_id=62247350") }
travel_to((PostReplacement::DELETION_GRACE_PERIOD + 1).days.from_now) do
Delayed::Worker.new.work_off
workoff_active_jobs
end
rescue Net::OpenTimeout
skip "Remote connection to Pixiv failed"
@@ -887,7 +887,7 @@ class UploadServiceTest < ActiveSupport::TestCase
assert_nothing_raised { @post.file(:preview) }
travel_to((PostReplacement::DELETION_GRACE_PERIOD + 1).days.from_now) do
Delayed::Worker.new.work_off
workoff_active_jobs
end
assert_nothing_raised { @post.file(:original) }
@@ -914,20 +914,24 @@ class UploadServiceTest < ActiveSupport::TestCase
@post2.replace!(replacement_url: "https://www.pixiv.net/member_illust.php?mode=medium&illust_id=62247364")
assert_equal("4ceadc314938bc27f3574053a3e1459a", @post1.md5)
assert_equal("cad1da177ef309bf40a117c17b8eecf5", @post2.md5)
@post2.reload
@post2.replace!(replacement_url: "https://raikou1.donmai.us/d3/4e/d34e4cf0a437a5d65f8e82b7bcd02606.jpg")
assert_equal("d34e4cf0a437a5d65f8e82b7bcd02606", @post2.md5)
Upload.destroy_all
@post1.reload
@post2.reload
@post1.replace!(replacement_url: "https://www.pixiv.net/member_illust.php?mode=medium&illust_id=62247364")
@post2.replace!(replacement_url: "https://www.pixiv.net/member_illust.php?mode=medium&illust_id=62247350")
assert_equal("cad1da177ef309bf40a117c17b8eecf5", @post1.md5)
assert_equal("4ceadc314938bc27f3574053a3e1459a", @post2.md5)
end
Timecop.travel(Time.now + PostReplacement::DELETION_GRACE_PERIOD + 1.day) do
Delayed::Worker.new.work_off
travel_to (PostReplacement::DELETION_GRACE_PERIOD + 1).days.from_now do
assert_raise(Post::DeletionError) do
workoff_active_jobs
end
end
assert_nothing_raised { @post1.file(:original) }

9
test/test_helper.rb
View File

@@ -53,8 +53,15 @@ module TestHelpers
Thread.current[:pixiv_comic_session_cache_key] = Cache.get(PixivWebAgent::COMIC_SESSION_CACHE_KEY)
end
end
end
# XXX replace with `perform_enqueued_jobs` after rails 6 upgrade.
def workoff_active_jobs
queue_adapter.enqueued_jobs.each do |job_data|
klass = job_data[:job]
klass.perform_now(*job_data[:args])
end
end
end
class ActiveSupport::TestCase
include ActiveJob::TestHelper