Skip to content

Commit

Permalink
use descendants to get class that inherited ActiveJob::Base
Browse files Browse the repository at this point in the history
`subclasses` get only child classes.
Therefore, if create a job common parent class as `ApplicationJob`,
inherited class does not get properly.
  • Loading branch information
y-yagi committed Sep 5, 2016
1 parent 55c5dff commit 0b21977
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 1 deletion.
2 changes: 1 addition & 1 deletion activejob/lib/active_job/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module TestHelper
def before_setup # :nodoc:
test_adapter = queue_adapter_for_test

@old_queue_adapters = (ActiveJob::Base.subclasses << ActiveJob::Base).select do |klass|
@old_queue_adapters = (ActiveJob::Base.descendants << ActiveJob::Base).select do |klass|
# only override explicitly set adapters, a quirk of `class_attribute`
klass.singleton_class.public_instance_methods(false).include?(:_queue_adapter)
end.map do |klass|
Expand Down
7 changes: 7 additions & 0 deletions activejob/test/cases/test_helper_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
require "jobs/logging_job"
require "jobs/nested_job"
require "jobs/rescue_job"
require "jobs/inherited_job"
require "models/person"

class EnqueuedJobsTest < ActiveJob::TestCase
Expand Down Expand Up @@ -521,3 +522,9 @@ def test_assert_job_has_custom_queue_adapter_set
assert_instance_of CustomQueueAdapter, HelloJob.queue_adapter
end
end

class InheritedJobTest < ActiveJob::TestCase
def test_queue_adapter_is_test_adapter
assert_instance_of ActiveJob::QueueAdapters::TestAdapter, InheritedJob.queue_adapter
end
end
4 changes: 4 additions & 0 deletions activejob/test/jobs/application_job.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
require_relative "../support/job_buffer"

class ApplicationJob < ActiveJob::Base
end
5 changes: 5 additions & 0 deletions activejob/test/jobs/inherited_job.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
require_relative "application_job"

class InheritedJob < ApplicationJob
self.queue_adapter = :inline
end

0 comments on commit 0b21977

Please sign in to comment.