Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix delayed_job tests for delayed_job >= 4.1 #309

Merged
merged 1 commit into from
Sep 28, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions lib/rollbar/delayed_job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ def self.wrap_worker
self.wrapped = true
end

def self.wrap_worker!
self.wrapped = false

wrap_worker
end

def self.around_invoke_job(&block)
::Delayed::Worker.lifecycle.around(:invoke_job, &block)
end
Expand Down
8 changes: 7 additions & 1 deletion spec/delayed/backend/test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,13 @@ def self.run
end

def self.worker
@worker ||= ::Delayed::Worker.new
prepare_worker unless @worker

@worker
end

def self.prepare_worker
@worker = ::Delayed::Worker.new
end

class Job
Expand Down
6 changes: 4 additions & 2 deletions spec/rollbar/delayed_job_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
require 'spec_helper'
require 'delayed_job'
require 'rollbar/delayed_job'
require 'delayed/backend/test'

describe Rollbar::Delayed, :reconfigure_notifier => true do
class FailingJob
Expand All @@ -12,9 +13,10 @@ def do_job_please!(a, b)
end

before do
Rollbar::Delayed.wrap_worker
Delayed::Worker.backend = :test
Delayed::Backend::Test.prepare_worker
Rollbar::Delayed.wrap_worker!

Delayed::Worker.backend = :test
Delayed::Backend::Test::Job.delete_all
end

Expand Down