resque_manager 3.3.1 → 3.3.2

data/test/functional/resque_manager/resque_controller_test.rb

@@ -23,7 +23,7 @@ module ResqueManager
 
       context '#poll' do
         should 'respond with success and start the live polling' do
-          get :poll, { page: 'overview', use_route: :resque_manager }
+          get :poll, {page: 'overview', use_route: :resque_manager}
           assert_response :success
           assert_select 'p.poll', text: /Last Updated: [0-9]{2}:[0-9]{2}:[0-9]{2}/, count: 1
         end
@@ -40,7 +40,7 @@ module ResqueManager
       context '#remove_job' do
         should 'always redirect' do
           @request.env['HTTP_REFERER'] = '/resque/queues/single_record_loader'
-          post :remove_job, { class: SingleRecordLoader, use_route: :resque_manager }
+          post :remove_job, {class: SingleRecordLoader, use_route: :resque_manager}
           assert_redirected_to '/resque/queues/single_record_loader'
         end
 
@@ -48,7 +48,7 @@ module ResqueManager
           ResqueManager.applications.expects(:blank?).returns(true)
           Resque.expects(:dequeue)
           @request.env['HTTP_REFERER'] = '/resque/queues/single_record_loader'
-          post :remove_job, { class: SingleRecordLoader, use_route: :resque_manager }
+          post :remove_job, {class: SingleRecordLoader, use_route: :resque_manager}
           assert_redirected_to '/resque/queues/single_record_loader'
         end
       end
@@ -63,7 +63,7 @@ module ResqueManager
           worker = Resque::Worker.new(:data_contribution_file)
           worker.expects(:quit)
           ResqueManager::ResqueController.any_instance.expects(:find_worker).returns(worker)
-          post :stop_worker, { worker: worker, use_route: :resque_manager }
+          post :stop_worker, {worker: worker, use_route: :resque_manager}
           assert_redirected_to '/resque/workers'
         end
       end
@@ -78,7 +78,7 @@ module ResqueManager
           worker = Resque::Worker.new(:data_contribution_file)
           worker.expects(:pause)
           ResqueManager::ResqueController.any_instance.expects(:find_worker).returns(worker)
-          post :pause_worker, { worker: worker, use_route: :resque_manager }
+          post :pause_worker, {worker: worker, use_route: :resque_manager}
           assert_redirected_to '/resque/workers'
         end
       end
@@ -93,7 +93,7 @@ module ResqueManager
           worker = Resque::Worker.new(:data_contribution_file)
           worker.expects(:continue)
           ResqueManager::ResqueController.any_instance.expects(:find_worker).returns(worker)
-          post :continue_worker, { worker: worker, use_route: :resque_manager }
+          post :continue_worker, {worker: worker, use_route: :resque_manager}
           assert_redirected_to '/resque/workers'
         end
       end
@@ -108,7 +108,7 @@ module ResqueManager
           worker = Resque::Worker.new(:data_contribution_file)
           worker.expects(:restart)
           ResqueManager::ResqueController.any_instance.expects(:find_worker).returns(worker)
-          post :restart_worker, { worker: worker, use_route: :resque_manager }
+          post :restart_worker, {worker: worker, use_route: :resque_manager}
           assert_redirected_to '/resque/workers'
         end
       end
@@ -122,7 +122,7 @@ module ResqueManager
         should 'continue a worker and redirect' do
           worker = Resque::Worker.new(:data_contribution_file)
           Resque::Worker.expects(:start)
-          post :start_worker, { worker: worker, use_route: :resque_manager }
+          post :start_worker, {worker: worker, use_route: :resque_manager}
           assert_redirected_to '/resque/workers'
         end
       end
@@ -159,7 +159,7 @@ module ResqueManager
           # Resque.schedule.keys.expects(:include?).returns(true)
           # Stub on array instead of Resque.schedule.keys otherwise the stub never works.
           Array.any_instance.expects(:include?).returns(true).at_least_once
-          post :add_scheduled_job, { name: 'key', use_route: :resque_manager }
+          post :add_scheduled_job, {name: 'key', use_route: :resque_manager}
           assert_redirected_to '/resque/schedule'
           errors = flash[:error].split('<br>')
           assert_includes errors, 'You must enter an ip address for the server you want this job to run on.', errors.inspect
@@ -171,7 +171,7 @@ module ResqueManager
           ip = '0.0.0.0'
           Resque.redis.expects(:rpush)
           ResqueScheduler.expects(:restart).with(ip)
-          post :add_scheduled_job, { 'name'=> 'TestName', 'class' => 'SingleRecordLoader', 'ip' => ip, 'args' => nil, 'description' => 'Test job', 'cron' => 'TestCron', use_route: :resque_manager }
+          post :add_scheduled_job, {'name' => 'TestName', 'class' => 'SingleRecordLoader', 'ip' => ip, 'args' => nil, 'description' => 'Test job', 'cron' => 'TestCron', use_route: :resque_manager}
           assert_nil flash[:error]
         end
       end
@@ -186,7 +186,7 @@ module ResqueManager
           Resque.stubs(:list_range).returns([{'SingleRecordLoader' => 'test data'}])
           Resque.redis.expects(:lrem).with(:scheduled, 0, {'SingleRecordLoader' => 'test data'}.to_json)
           ResqueScheduler.expects(:restart).with('0.0.0.0')
-          post :remove_from_schedule, { ip: '0.0.0.0', job_name: 'SingleRecordLoader', use_route: :resque_manager }
+          post :remove_from_schedule, {ip: '0.0.0.0', job_name: 'SingleRecordLoader', use_route: :resque_manager}
           assert_redirected_to '/resque/schedule'
         end
       end
@@ -194,7 +194,7 @@ module ResqueManager
       context '#start_scheduler' do
         should 'always redirect to schedule and call ResqueScheduler.start' do
           ResqueScheduler.expects(:start).with('0.0.0.0')
-          post :start_scheduler, { ip: '0.0.0.0', use_route: :resque_manager }
+          post :start_scheduler, {ip: '0.0.0.0', use_route: :resque_manager}
           assert_redirected_to '/resque/schedule'
         end
       end
@@ -202,7 +202,7 @@ module ResqueManager
       context '#stop_scheduler' do
         should 'always redirect to schedule and call ResqueScheduler.start' do
           ResqueScheduler.expects(:quit).with('0.0.0.0')
-          post :stop_scheduler, { ip: '0.0.0.0', use_route: :resque_manager }
+          post :stop_scheduler, {ip: '0.0.0.0', use_route: :resque_manager}
           assert_redirected_to '/resque/schedule'
         end
       end
@@ -211,15 +211,22 @@ module ResqueManager
         should 'respond with a status in json format' do
           hash = Resque::Plugins::Status::Hash.set('UUID', 'message')
           Resque::Plugins::Status::Hash.stubs(:status_ids).returns(%w(UUID))
-          post :statuses,  { format: :js, use_route: :resque_manager }
+          get :statuses, {format: :js, use_route: :resque_manager}
           assert_equal hash, JSON.parse(@response.body).first, JSON.parse(@response.body).inspect
         end
+
+        should 'render the page in html format' do
+          hash = Resque::Plugins::Status::Hash.set('UUID', 'message')
+          Resque::Plugins::Status::Hash.stubs(:status_ids).returns(%w(UUID))
+          get :statuses, {use_route: :resque_manager}
+          assert_select 'h1', 'Statuses'
+        end
       end
 
       context '#clear_statuses' do
         should 'always redirect to statuses page and call Resque::Plugins::Status::Hash.clear' do
           Resque::Plugins::Status::Hash.expects(:clear)
-          post :clear_statuses, use_route: :resque_manager
+          get :clear_statuses, use_route: :resque_manager
           assert_redirected_to '/resque/statuses'
         end
       end
@@ -227,15 +234,21 @@ module ResqueManager
       context '#status' do
         should 'render a status in json' do
           hash = Resque::Plugins::Status::Hash.set('UUID', 'message')
-          post :status, { id: 'UUID', format: :js, use_route: :resque_manager }
+          get :status, {id: 'UUID', format: :js, use_route: :resque_manager}
           assert_equal hash, JSON.parse(@response.body), JSON.parse(@response.body).inspect
         end
+
+        should 'render a status in html' do
+          hash = Resque::Plugins::Status::Hash.set('UUID', 'message')
+          post :status, {id: 'UUID', use_route: :resque_manager}
+          assert_select 'h1', /Statuses:/
+        end
       end
 
       context '#kill' do
         should 'redirect to statuses and kill a status' do
           Resque::Plugins::Status::Hash.set('UUID', 'message')
-          post :kill, { id: 'UUID', use_route: :resque_manager }
+          post :kill, {id: 'UUID', use_route: :resque_manager}
           assert_redirected_to '/resque/statuses'
           hash = Resque::Plugins::Status::Hash.get('UUID')
           assert_equal 'killed', hash['status']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque_manager
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Kevin Tyll
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails