mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
b517347be1
Fixes #34366 Currently setting queue_name_prefix will not combine a prefix with the default_queue_name; it will only affect queue names set with `queue_as`. With this PR the prefix will affect the default_queue_name as well. Closes #19831 Currently setting default_queue_name doesn't actually affect the queue_name default (although default_queue_name does get used if you pass a falsey `part_name` to `queue_as`). This PR would get default_queue_name working as expected as well. Because the queue_name default is now a lambda wrapping the default_queue_name, rather than the default_queue_name itself, I had to update one test to use the instance method `#queue_name` (which `instance_exec`s the value) instead of the class method. I think this change is OK, since only the instance method is documented. There was a question about whether we want a `default_queue_name` configuration. If we want to get rid of it, I would also be happy to open a PR for that instead. It has been around for a while now, but it also hasn't really worked for a while now. r? @matthewd since you had an opinion about this before
131 lines
3.8 KiB
Ruby
131 lines
3.8 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require "helper"
|
|
require "jobs/hello_job"
|
|
require "jobs/logging_job"
|
|
require "jobs/nested_job"
|
|
|
|
class QueueNamingTest < ActiveSupport::TestCase
|
|
test "name derived from base" do
|
|
assert_equal "default", HelloJob.new.queue_name
|
|
end
|
|
|
|
test "uses given queue name job" do
|
|
original_queue_name = HelloJob.queue_name
|
|
|
|
begin
|
|
HelloJob.queue_as :greetings
|
|
assert_equal "greetings", HelloJob.new.queue_name
|
|
ensure
|
|
HelloJob.queue_name = original_queue_name
|
|
end
|
|
end
|
|
|
|
test "allows a blank queue name" do
|
|
original_queue_name = HelloJob.queue_name
|
|
|
|
begin
|
|
HelloJob.queue_as ""
|
|
assert_equal "", HelloJob.new.queue_name
|
|
ensure
|
|
HelloJob.queue_name = original_queue_name
|
|
end
|
|
end
|
|
|
|
test "does not use a nil queue name" do
|
|
original_queue_name = HelloJob.queue_name
|
|
|
|
begin
|
|
HelloJob.queue_as nil
|
|
assert_equal "default", HelloJob.new.queue_name
|
|
ensure
|
|
HelloJob.queue_name = original_queue_name
|
|
end
|
|
end
|
|
|
|
test "evals block given to queue_as to determine queue" do
|
|
original_queue_name = HelloJob.queue_name
|
|
|
|
begin
|
|
HelloJob.queue_as { :another }
|
|
assert_equal "another", HelloJob.new.queue_name
|
|
ensure
|
|
HelloJob.queue_name = original_queue_name
|
|
end
|
|
end
|
|
|
|
test "can use arguments to determine queue_name in queue_as block" do
|
|
original_queue_name = HelloJob.queue_name
|
|
|
|
begin
|
|
HelloJob.queue_as { arguments.first == "1" ? :one : :two }
|
|
assert_equal "one", HelloJob.new("1").queue_name
|
|
assert_equal "two", HelloJob.new("3").queue_name
|
|
ensure
|
|
HelloJob.queue_name = original_queue_name
|
|
end
|
|
end
|
|
|
|
test "queue_name_prefix prepended to the queue name with default delimiter" do
|
|
original_queue_name_prefix = ActiveJob::Base.queue_name_prefix
|
|
original_queue_name = HelloJob.queue_name
|
|
|
|
begin
|
|
ActiveJob::Base.queue_name_prefix = "aj"
|
|
HelloJob.queue_as :low
|
|
assert_equal "aj_low", HelloJob.queue_name
|
|
ensure
|
|
ActiveJob::Base.queue_name_prefix = original_queue_name_prefix
|
|
HelloJob.queue_name = original_queue_name
|
|
end
|
|
end
|
|
|
|
test "queue_name_prefix prepended to the queue name with custom delimiter" do
|
|
original_queue_name_prefix = ActiveJob::Base.queue_name_prefix
|
|
original_queue_name_delimiter = ActiveJob::Base.queue_name_delimiter
|
|
original_queue_name = HelloJob.queue_name
|
|
|
|
begin
|
|
ActiveJob::Base.queue_name_delimiter = "."
|
|
ActiveJob::Base.queue_name_prefix = "aj"
|
|
HelloJob.queue_as :low
|
|
assert_equal "aj.low", HelloJob.queue_name
|
|
ensure
|
|
ActiveJob::Base.queue_name_prefix = original_queue_name_prefix
|
|
ActiveJob::Base.queue_name_delimiter = original_queue_name_delimiter
|
|
HelloJob.queue_name = original_queue_name
|
|
end
|
|
end
|
|
|
|
test "using a custom default_queue_name" do
|
|
original_default_queue_name = ActiveJob::Base.default_queue_name
|
|
|
|
begin
|
|
ActiveJob::Base.default_queue_name = "default_queue_name"
|
|
|
|
assert_equal "default_queue_name", HelloJob.new.queue_name
|
|
ensure
|
|
ActiveJob::Base.default_queue_name = original_default_queue_name
|
|
end
|
|
end
|
|
|
|
test "queue_name_prefix prepended to the default_queue_name" do
|
|
original_queue_name_prefix = ActiveJob::Base.queue_name_prefix
|
|
original_default_queue_name = ActiveJob::Base.default_queue_name
|
|
|
|
begin
|
|
ActiveJob::Base.queue_name_prefix = "prefix"
|
|
ActiveJob::Base.default_queue_name = "default_queue_name"
|
|
|
|
assert_equal "prefix_default_queue_name", HelloJob.new.queue_name
|
|
ensure
|
|
ActiveJob::Base.queue_name_prefix = original_queue_name_prefix
|
|
ActiveJob::Base.default_queue_name = original_default_queue_name
|
|
end
|
|
end
|
|
|
|
test "uses queue passed to #set" do
|
|
job = HelloJob.set(queue: :some_queue).perform_later
|
|
assert_equal "some_queue", job.queue_name
|
|
end
|
|
end
|