2 files changed, 17 insertions, 2 deletions
diff --git a/test/cases/queue_naming_test.rb b/test/cases/queue_naming_test.rb
new file mode 100644
index 0000000000..e171474686
--- /dev/null
+++ b/test/cases/queue_naming_test.rb
@@ -0,0 +1,17 @@
+require 'helper'
+require 'jobs/hello_job'
+
+class QueueNamingTest < ActiveSupport::TestCase
+  test 'name derived from base' do
+    assert_equal "active_jobs", HelloJob.queue_name
+  end
+  
+  test 'name appended in job' do
+    begin
+      HelloJob.queue_as :greetings
+      assert_equal "active_jobs_greetings", HelloJob.queue_name
+    ensure
+      HelloJob.queue_name = HelloJob.queue_base_name
+    end
+  end
+end
diff --git a/test/jobs/hello_job.rb b/test/jobs/hello_job.rb
index 469123fe0a..d0e65f9674 100644
--- a/test/jobs/hello_job.rb
+++ b/test/jobs/hello_job.rb
@@ -1,6 +1,4 @@
 class HelloJob < ActiveJob::Base
-  @queue = :greetings
-
   def self.perform(greeter = "David")
     $BUFFER << "#{greeter} says hello"
   end