Skip to content

Commit 2b3a440

Browse files
committed
/failed/requeue/all throws exception when has multiple failed jobs
1 parent 2936d6f commit 2b3a440

File tree

3 files changed

+20
-1
lines changed

3 files changed

+20
-1
lines changed

lib/resque/server.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ def show_for_polling(page)
192192

193193
post "/failed/requeue/all" do
194194
Resque::Failure.count.times do |num|
195-
Resque::Failure.requeue_and_remove(num)
195+
Resque::Failure.requeue_and_remove(0)
196196
end
197197
redirect u('failed')
198198
end

lib/resque/server/test_helper.rb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ def app
99
Resque::Server.new
1010
end
1111

12+
def add_failed_jobs
13+
Resque::Failure.create(:exception => Exception.new, :worker => Resque::Worker.new(:test), :queue => "queue", :payload => {'class' => 'TestClass'})
14+
Resque::Failure.create(:exception => Exception.new, :worker => Resque::Worker.new(:test), :queue => "queue", :payload => {'class' => 'TestClass'})
15+
Resque::Failure.create(:exception => Exception.new, :worker => Resque::Worker.new(:test), :queue => "queue", :payload => {'class' => 'TestClass'})
16+
Resque::Failure.create(:exception => Exception.new, :worker => Resque::Worker.new(:test), :queue => "queue", :payload => {'class' => 'TestClass'})
17+
end
18+
1219
def self.should_respond_with_success
1320
it "should respond with success" do
1421
assert last_response.ok?, last_response.errors

test/resque-web_test.rb

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,15 @@
5757

5858
should_respond_with_success
5959
end
60+
61+
describe "on POST to /failed/requeue/all" do
62+
before {
63+
add_failed_jobs
64+
post "/failed/requeue/all"
65+
}
66+
67+
it "should redirect to /failed and contain '0 jobs'" do
68+
follow_redirect!
69+
assert last_response.body.include?('<b>0</b> jobs')
70+
end
71+
end

0 commit comments

Comments
 (0)