tests: replace workoff_active_jobs with perform_enqueued_jobs.
This commit is contained in:
@@ -93,7 +93,7 @@ class ArtistTest < ActiveSupport::TestCase
|
||||
end
|
||||
|
||||
should "create a new tag implication" do
|
||||
workoff_active_jobs
|
||||
perform_enqueued_jobs
|
||||
assert_equal(1, TagImplication.where(:antecedent_name => "aaa", :consequent_name => "banned_artist").count)
|
||||
assert_equal("aaa banned_artist", @post.reload.tag_string)
|
||||
end
|
||||
|
||||
@@ -74,7 +74,7 @@ class BulkUpdateRequestTest < ActiveSupport::TestCase
|
||||
@bur.approve!(@admin)
|
||||
|
||||
assert_enqueued_jobs(3)
|
||||
workoff_active_jobs
|
||||
perform_enqueued_jobs
|
||||
|
||||
@ta = TagAlias.where(:antecedent_name => "foo", :consequent_name => "bar").first
|
||||
@ti = TagImplication.where(:antecedent_name => "bar", :consequent_name => "baz").first
|
||||
|
||||
@@ -127,7 +127,7 @@ class TagAliasTest < ActiveSupport::TestCase
|
||||
ta = FactoryBot.create(:tag_alias, :antecedent_name => "...", :consequent_name => "bbb")
|
||||
|
||||
ta.approve!(approver: @admin)
|
||||
workoff_active_jobs
|
||||
perform_enqueued_jobs
|
||||
|
||||
assert_equal(%w(123 456 bbb), ss.reload.query.split.sort)
|
||||
end
|
||||
@@ -139,7 +139,7 @@ class TagAliasTest < ActiveSupport::TestCase
|
||||
|
||||
ta = FactoryBot.create(:tag_alias, :antecedent_name => "aaa", :consequent_name => "ccc")
|
||||
ta.approve!(approver: @admin)
|
||||
workoff_active_jobs
|
||||
perform_enqueued_jobs
|
||||
|
||||
assert_equal("bbb ccc", post1.reload.tag_string)
|
||||
assert_equal("ccc ddd", post2.reload.tag_string)
|
||||
@@ -162,7 +162,7 @@ class TagAliasTest < ActiveSupport::TestCase
|
||||
# XXX this is broken, it depends on the order the jobs are executed in.
|
||||
ta2.approve!(approver: @admin)
|
||||
ta1.approve!(approver: @admin)
|
||||
workoff_active_jobs
|
||||
perform_enqueued_jobs
|
||||
|
||||
assert_equal("ccc", ta1.reload.consequent_name)
|
||||
end
|
||||
@@ -171,7 +171,7 @@ class TagAliasTest < ActiveSupport::TestCase
|
||||
ti = FactoryBot.create(:tag_implication, :antecedent_name => "aaa", :consequent_name => "bbb")
|
||||
ta = FactoryBot.create(:tag_alias, :antecedent_name => "bbb", :consequent_name => "ccc")
|
||||
ta.approve!(approver: @admin)
|
||||
workoff_active_jobs
|
||||
perform_enqueued_jobs
|
||||
|
||||
assert_equal("ccc", ti.reload.consequent_name)
|
||||
end
|
||||
@@ -190,7 +190,7 @@ class TagAliasTest < ActiveSupport::TestCase
|
||||
ta = FactoryBot.create(:tag_alias, :antecedent_name => "aaa", :consequent_name => "bbb")
|
||||
|
||||
ta.approve!(approver: @admin)
|
||||
workoff_active_jobs
|
||||
perform_enqueued_jobs
|
||||
|
||||
assert_equal(1, tag2.reload.category)
|
||||
end
|
||||
@@ -211,7 +211,7 @@ class TagAliasTest < ActiveSupport::TestCase
|
||||
@wiki1 = FactoryBot.create(:wiki_page, :title => "aaa")
|
||||
@wiki2 = FactoryBot.create(:wiki_page, :title => "bbb")
|
||||
@alias.approve!(approver: @admin)
|
||||
workoff_active_jobs
|
||||
perform_enqueued_jobs
|
||||
end
|
||||
end
|
||||
|
||||
@@ -228,14 +228,14 @@ class TagAliasTest < ActiveSupport::TestCase
|
||||
should "update the topic when processed" do
|
||||
assert_difference("ForumPost.count") do
|
||||
@alias.approve!(approver: @admin)
|
||||
workoff_active_jobs
|
||||
perform_enqueued_jobs
|
||||
end
|
||||
end
|
||||
|
||||
should "update the parent post" do
|
||||
previous = @post.body
|
||||
@alias.approve!(approver: @admin)
|
||||
workoff_active_jobs
|
||||
perform_enqueued_jobs
|
||||
assert_not_equal(previous, @post.reload.body)
|
||||
end
|
||||
|
||||
|
||||
@@ -246,7 +246,7 @@ class TagImplicationTest < ActiveSupport::TestCase
|
||||
|
||||
ti1.approve!
|
||||
ti2.approve!
|
||||
workoff_active_jobs
|
||||
perform_enqueued_jobs
|
||||
|
||||
assert_equal("aaa bbb ccc xxx yyy", p1.reload.tag_string)
|
||||
end
|
||||
@@ -262,7 +262,7 @@ class TagImplicationTest < ActiveSupport::TestCase
|
||||
should "update the topic when processed" do
|
||||
assert_difference("ForumPost.count") do
|
||||
@implication.approve!
|
||||
workoff_active_jobs
|
||||
perform_enqueued_jobs
|
||||
end
|
||||
|
||||
assert_match(/The tag implication .* has been approved/, @post.reload.body)
|
||||
|
||||
Reference in New Issue
Block a user