Skip to content

Commit

Permalink
Bringing this Rails 6 compliant based on the work of Josh M Sharpe Ju…
Browse files Browse the repository at this point in the history
  • Loading branch information
soonahn committed Feb 21, 2023
1 parent ee3a38c commit 5bac26b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 32 deletions.
5 changes: 1 addition & 4 deletions lib/active_scheduler/resque_wrapper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ def self.wrap(schedule)
class_name = opts[:class] || job
next if class_name =~ /#{self.to_s}/

klass = class_name.constantize
next unless klass <= ActiveJob::Base

queue = opts[:queue] || klass.queue_name
queue = opts[:queue]
args = opts[:args]
named_args = opts[:named_args] || false

Expand Down
28 changes: 0 additions & 28 deletions spec/active_scheduler/resque_wrapper_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,6 @@
)
end

context "job is not an active job descendant" do
it "doesn't wrap" do
stub_const("SimpleJob", Class.new)
expect(wrapped['simple_job']).to eq(
"class" => "SimpleJob",
"queue" => "simple",
"description" => "It's a simple job.",
"every" => "30s",
"rails_env" => "test",
"args" => ['foo-arg-1', 'foo-arg-2'],
)
end
end

context 'with a custom wrapper class' do
class CustomWrapper < ActiveScheduler::ResqueWrapper
end
Expand Down Expand Up @@ -122,20 +108,6 @@ class CustomWrapper < ActiveScheduler::ResqueWrapper
end
end

context "when the queue is blank" do
let(:schedule) { YAML.load_file 'spec/fixtures/no_queue.yaml' }

it "uses the job's queue" do
simple_job = Class.new(ActiveJob::Base) do
queue_as :myscheduledjobqueue
end

stub_const("SimpleJob", simple_job)

expect(wrapped['no_queue_job']['queue']).to eq 'myscheduledjobqueue'
end
end

context "when the schedule name is the class name" do
let(:schedule) { YAML.load_file 'spec/fixtures/schedule_name_is_class_name.yaml' }

Expand Down

0 comments on commit 5bac26b

Please sign in to comment.