test/functional/failures_controller_test.rb in resque-web-0.0.3 vs test/functional/failures_controller_test.rb in resque-web-0.0.4

@@ -1,73 +1,74 @@
 require 'test_helper'
 
 module ResqueWeb
   class FailuresControllerTest < ActionController::TestCase
+    include ControllerTestHelpers
+
     setup do
       @routes = Engine.routes
     end
 
     describe "GET /failures" do
       it "renders the index page" do
-        get :index
+        visit(:index)
         assert_template :index
       end
     end
 
     describe "DELETE /failures/:id" do
       it "deletes the failure" do
         Resque::Failure.expects(:remove).with('123')
-        delete :destroy, :id=>123
+        visit(:destroy, {:id => 123}, :method => :delete)
         assert_redirected_to failures_path
       end
     end
 
     describe "DELETE /failures/destroy_all" do
       it "deletes all failures" do
         Resque::Failure.expects(:clear).with('failed')
-        delete :destroy_all
+        visit(:destroy_all, nil, :method => :delete)
         assert_redirected_to failures_path
       end
     end
 
     describe "PUT /failures/:id/retry" do
       it "retries the failure and remove the original message" do
         Resque::Failure.expects(:requeue_and_remove).with('123')
-        put :retry,:id=>123
+        visit(:retry, {:id => 123}, :method => :put)
         assert_redirected_to failures_path
       end
       it "retries should work also in case of pre 2.0 Resque" do
         Resque::Failure.expects(:requeue).with('123')
         Resque::Failure.expects(:remove).with('123')
-        put :retry,:id=>123
+        visit(:retry, {:id => 123}, :method => :put)
         assert_redirected_to failures_path
       end
     end
 
     describe "PUT /failures/retry_all" do
       it "retries all failures using requeue if no queue specified" do
         Resque::Failure.stubs(:count).returns(2)
         Resque::Failure.stubs(:requeue_and_remove).returns(true)
         Resque::Failure.expects(:requeue_and_remove).with(0)
         Resque::Failure.expects(:requeue_and_remove).with(1)
-        put :retry_all
+        visit(:retry_all, nil, :method => :put)
         assert_redirected_to failures_path
       end
       it "retries all failures should also work case of pre 2.0 Resque" do
         Resque::Failure.stubs(:count).returns(2)
         Resque::Failure.stubs(:requeue).returns(true)
         Resque::Failure.expects(:requeue).with(0)
         Resque::Failure.expects(:remove).with(0)
         Resque::Failure.expects(:requeue).with(1)
         Resque::Failure.expects(:remove).with(1)
-        put :retry_all
+        visit(:retry_all, nil, :method => :put)
         assert_redirected_to failures_path
       end
       it "retries all failures using requeue_queue if queue specified" do
         Resque::Failure.expects(:requeue_queue).with('myqueue')
-        put :retry_all,:queue=>"myqueue"
+        visit(:retry_all, {:queue=>"myqueue"}, :method => :put)
         assert_redirected_to failures_path(:queue=>'myqueue')
       end
     end
-
   end
 end