Skip to content

Fixes #119: Select Jobs in queue that are for the given Worker class #120

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.

Sign up for GitHub

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

Open
pboling wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes #119: Select Jobs in queue that are for the given Worker class #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c67c1d9
Fixes #119: Only select Jobs in queue that are for the given Worker c…
pboling Dec 11, 2015
534f0b2
Allow given class to be String or Constant
pboling Dec 11, 2015
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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,7 @@ Contributors
* Ilya Katz (@ilyakatz) : Cleanup README.md for RSpec 3
* (@addbrick) : Compare times as integers in `have_scheduled` matcher
* Serious Haircut (@serioushaircut) : Fix ArgumentListMatcher to make it work with any\_args
* Peter Boling (@pboling) : Fix `queue` to return jobs of Worker class specified to correct `size`

Copyright
=========
Expand Down
11 changes: 10 additions & 1 deletion lib/resque_spec/matchers.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,18 @@ def in(queue_name)

def queue(actual)
if @queue_name
# All the Jobs in a queue
ResqueSpec.queue_by_name(@queue_name)
else
ResqueSpec.queue_for(actual)
# Only the Jobs for the given class (actual) in a queue.
# Why? A single queue can be used by multiple workers.
ResqueSpec.queue_for(actual).select do |queued|
if actual.respond_to?(:name)
queued[:class] == actual.name
else
queued[:class].to_s == actual.to_s
end
end
end
end
end
Expand Down