Skip to content

Commit

Permalink
Merge pull request collectiveidea#851 from dblock/not-manipulating-sa…
Browse files Browse the repository at this point in the history
…me-instance

Fix shared specs for back-ends that reload objects.
  • Loading branch information
sferik committed Sep 24, 2015
2 parents 57540d7 + a9472c5 commit d4ce93d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
@@ -1,3 +1,7 @@
Next
====
* Fix shared specs for back-ends that reload objects

4.1.0 - 2015-09-22
==================
* Alter `Delayed::Command` to work with or without Rails
Expand Down
3 changes: 1 addition & 2 deletions lib/delayed/backend/shared_spec.rb
Expand Up @@ -542,7 +542,7 @@ def create_job(opts = {})
it 'marks the job as failed' do
Delayed::Worker.destroy_failed_jobs = false
job = described_class.create! :handler => '--- !ruby/object:JobThatDoesNotExist {}'
expect(job).to receive(:destroy_failed_jobs?).and_return(false)
expect_any_instance_of(described_class).to receive(:destroy_failed_jobs?).and_return(false)
worker.work_off
job.reload
expect(job).to be_failed
Expand Down Expand Up @@ -574,7 +574,6 @@ def create_job(opts = {})
it 're-schedules jobs after failing' do
worker.work_off
@job.reload
expect(@job.error).to_not be_nil
expect(@job.last_error).to match(/did not work/)
expect(@job.last_error).to match(/sample_jobs.rb:\d+:in `perform'/)
expect(@job.attempts).to eq(1)
Expand Down

0 comments on commit d4ce93d

Please sign in to comment.