foreman-tasks 11.0.2 → 11.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14937b8abb913127b2f1ab4028a967e25ed56ae35a476dc99dfd4bce07d9ec2a
-  data.tar.gz: 124922626f20e21268d8fd2c341be934af3d17a1e1fe9df34a61d8a90718508f
+  metadata.gz: 92def6f8ee5c4a0ba4207f55389c6ac200c9d213d381f6ca611713f860190cd7
+  data.tar.gz: 366f26cab603dcdd70b5dcfb2b5e47a8b5f6bb28420c5f4a77379638c59765ff
 SHA512:
-  metadata.gz: ed4850116bdc86ba5118a2c1a08e4d475285f3236dee047f8b3c98c24c5eb4030b31a409b0293e5016153e92522f90ef31fccca48e901c7ca30f56b95f55d06b
-  data.tar.gz: c93ab2b4c78fac530e6bef4efca4c0baee0d03931522b15726526406881f8e538cec47dbba5ad863f86faca1a3ec025585453b3b47560435cd56fb1cd6fffb20
+  metadata.gz: d833d6c5563a5f8ec7579488d9d8c2724681be431becf1f8322138b07291845a05c946d3977b79809bc7d992585092509e78ba8d79f55c966416c76233c0077a
+  data.tar.gz: d2fdf22b85e575ffc4654f5c9a38bb6163af027f19855acdd209cf6dc86928ed1ca7b9dabb5b4485480e1ef4fe45b0a7c71e2690aa4691b7c8cffc9ec259805c

data/app/controllers/foreman_tasks/api/tasks_controller.rb

@@ -160,7 +160,7 @@ module ForemanTasks
         to_stop_length = to_stop.count
         skipped_length = total_length - to_stop_length
 
-        to_stop.find_each { |task| task.update(state: :stopped) }
+        to_stop.find_each(&:halt)
 
         if params[:search]
           notification = UINotifications::Tasks::TaskBulkStop.new(filtered_scope.first, to_stop_length, skipped_length)

data/lib/foreman_tasks/dynflow.rb

@@ -18,6 +18,11 @@ module ForemanTasks
           { _('Back to tasks') => "/#{ForemanTasks::TasksController.controller_path}" }
         end
         set(:world) { ::Rails.application.dynflow.world }
+        # Do not show Sinatra's pretty error pages in production
+        set(:show_exceptions) { ::Rails.env.development? }
+        # Let the errors propagate out from Sinatra to Rails.
+        # Without this, we'd only get a mostly blank 500 ISE page
+        set(:raise_errors) { !::Rails.env.development? }
       end
     end
   end

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '11.0.2'.freeze
+  VERSION = '11.0.3'.freeze
 end

data/test/controllers/api/tasks_controller_test.rb

@@ -202,6 +202,47 @@ module ForemanTasks
           assert_equal({ 'result' => 'success' }, task.main_action.output['proxy_output'])
         end
       end
+
+      describe 'POST /api/tasks/bulk_stop' do
+        it 'requires search or task_ids parameter' do
+          post :bulk_stop
+          assert_response :bad_request
+          data = JSON.parse(response.body)
+          assert_includes data['error']['message'], 'Please provide at least one of search or task_ids parameters'
+        end
+
+        it 'stops tasks by task_ids and calls halt' do
+          task1 = FactoryBot.create(:task_with_locks, :user_create_task, state: 'running')
+          task2 = FactoryBot.create(:dynflow_task, :user_create_task, state: 'pending')
+          task3 = FactoryBot.create(:dynflow_task, :user_create_task, state: 'stopped')
+          post :bulk_stop, params: { task_ids: [task1.id, task2.id, task3.id] }
+          assert_response :success
+          data = JSON.parse(response.body)
+          assert_equal 3, data['total']
+          assert_equal 2, data['stopped_length']
+          assert_equal 1, data['skipped_length']
+          wait_for { task1.reload.state == 'stopped' }
+          wait_for { task2.reload.state == 'stopped' }
+          assert_predicate task1.locks, :empty?
+        end
+
+        it 'stops tasks by search query' do
+          task1 = FactoryBot.create(:task_with_locks, :user_create_task, state: 'running')
+          task2 = FactoryBot.create(:dynflow_task, :user_create_task, state: 'pending')
+
+          UINotifications::Tasks::TaskBulkStop.any_instance.expects(:deliver!)
+
+          post :bulk_stop, params: { search: 'label = Actions::User::Create' }
+          assert_response :success
+          data = JSON.parse(response.body)
+          assert_equal 2, data['total']
+          assert_equal 2, data['stopped_length']
+          assert_equal 0, data['skipped_length']
+          wait_for { task1.reload.state == 'stopped' }
+          wait_for { task2.reload.state == 'stopped' }
+          assert_predicate task1.locks, :empty?
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 11.0.2
+  version: 11.0.3
 platform: ruby
 authors:
 - Ivan Nečas