foreman-tasks 0.10.4 → 0.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9103450a91bdc6f9bee1c15d50063375050da83
-  data.tar.gz: be2ba86f7efd177e77839d2dc03f2e14ea2daebe
+  metadata.gz: f8c05ea538a9cdd681bcd80073a82d7fdd8aa15f
+  data.tar.gz: cdfc54af9ee6edfe6165e744fb5b4b5eea22209a
 SHA512:
-  metadata.gz: 6dbf21fc4596c5953fdef37ca2e45beb32d267a39fd895e5f055d641feae0b113d474d632cb2d6a41c16d789dc584634511be8b5a39dbfdcf5e9e57a26288ffd
-  data.tar.gz: 1ee999e8e037c53781e9afe746864fe78c894774f4bc32df820db53397bdbb5739aa1d99c1baf3f7094b7f4234b5c85a91076c58977938fcea20315caf75373a
+  metadata.gz: 31dad9d8f904055a9a17b6a7d06e73d1b0e6ed9eaf3e6702845e3edaf6318ce80d2948b558759ca808b800965dcde2564491c6cae8e8325988cc2ed4acaf29f5
+  data.tar.gz: db3c8119caec600812d8353f30be0ed80d965ece6255f6191725804188e7459d9c5651fa758f16d6b1d3f62caf442872925f0da0e0bf05aff4b548f1757beeb8

data/.rubocop.yml

@@ -76,3 +76,5 @@ Layout/IndentHeredoc:
     - '*.gemspec'
     - bin/*
 
+Lint/RescueWithoutErrorClass:
+  Enabled: false

data/app/helpers/foreman_tasks/foreman_tasks_helper.rb

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 module ForemanTasks
   module ForemanTasksHelper
     def recurring_logic_state(recurring_logic)

data/app/lib/actions/base.rb

@@ -1,5 +1,7 @@
 module Actions
   class Base < Dynflow::Action
+    middleware.use ::Actions::Middleware::RailsExecutorWrap if Rails::VERSION::MAJOR > 4
+
     def task
       @task ||= ::ForemanTasks::Task::DynflowTask.where(:external_id => execution_plan_id).first!
     end

data/app/lib/actions/entry_action.rb

@@ -28,7 +28,8 @@ module Actions
     # The additional args can include more resources and/or a hash
     # with more data describing the action that should appear in the
     # action's input.
-    def action_subject(resource, *additional_args) # TODO redo as a middleware
+    # TODO redo as a middleware
+    def action_subject(resource, *additional_args)
       Type! resource, ForemanTasks::Concerns::ActionSubject
       input.update serialize_args(resource, *resource.all_related_resources, *additional_args)
 

data/app/lib/actions/middleware/rails_executor_wrap.rb

@@ -0,0 +1,25 @@
+module Actions
+  module Middleware
+    # In development with Rails auto-reloading and using `sync_task` method,
+    # it could lead to dead-locking due to the Rails main thread locking the
+    # the class loader.
+    #
+    # This middleware marks the part of the code that can
+    # use the auto-loader so that Rails know they should avoid the locking there.
+    # See https://github.com/ruby-concurrency/concurrent-ruby/issues/585#issuecomment-256131537
+    # for more details.
+    class RailsExecutorWrap < Dynflow::Middleware
+      def run(*args)
+        Rails.application.executor.wrap do
+          pass(*args)
+        end
+      end
+
+      def finalize
+        Rails.application.executor.wrap do
+          pass
+        end
+      end
+    end
+  end
+end

data/app/models/foreman_tasks/task.rb

@@ -17,10 +17,10 @@ module ForemanTasks
     before_create :generate_id
 
     belongs_to :parent_task, :class_name => 'ForemanTasks::Task'
-    has_many :sub_tasks, :class_name => 'ForemanTasks::Task', :foreign_key => :parent_task_id
-    has_many :locks
+    has_many :sub_tasks, :class_name => 'ForemanTasks::Task', :foreign_key => :parent_task_id, :dependent => :nullify
+    has_many :locks, :dependent => :destroy
 
-    has_many :task_group_members
+    has_many :task_group_members, :dependent => :destroy
     has_many :task_groups, :through => :task_group_members
     if Rails::VERSION::MAJOR < 4
       has_many :recurring_logic_task_groups, :through => :task_group_members, :conditions => { :type => 'ForemanTasks::TaskGroups::RecurringLogicTaskGroup' }, :source => :task_group
@@ -134,26 +134,28 @@ module ForemanTasks
       return { :conditions => '0 = 1' } if value == 'current_user' && User.current.nil?
 
       key = 'owners.login' if key == 'user'
+      # using uniq suffix to avoid colisions when searching by two different owners via ScopedSearch
+      uniq_suffix = SecureRandom.hex(3)
       key_name = connection.quote_column_name(key.sub(/^.*\./, ''))
       joins = <<-SQL
-      INNER JOIN foreman_tasks_locks AS foreman_tasks_locks_owner
-                 ON (foreman_tasks_locks_owner.task_id = foreman_tasks_tasks.id AND
-                     foreman_tasks_locks_owner.resource_type = 'User' AND
-                     foreman_tasks_locks_owner.name = '#{Lock::OWNER_LOCK_NAME}')
+      INNER JOIN foreman_tasks_locks AS foreman_tasks_locks_owner#{uniq_suffix}
+                 ON (foreman_tasks_locks_owner#{uniq_suffix}.task_id = foreman_tasks_tasks.id AND
+                     foreman_tasks_locks_owner#{uniq_suffix}.resource_type = 'User' AND
+                     foreman_tasks_locks_owner#{uniq_suffix}.name = '#{Lock::OWNER_LOCK_NAME}')
       SQL
       if key !~ /\.id\Z/
         joins << <<-SQL
-        INNER JOIN users
-                   ON (users.id = foreman_tasks_locks_owner.resource_id)
+        INNER JOIN users as users#{uniq_suffix}
+                   ON (users#{uniq_suffix}.id = foreman_tasks_locks_owner#{uniq_suffix}.resource_id)
         SQL
       end
       condition = if key.blank?
-                    sanitize_sql_for_conditions(["users.login #{operator} ? or users.firstname #{operator} ? ", value, value])
+                    sanitize_sql_for_conditions(["users#{uniq_suffix}.login #{operator} ? or users#{uniq_suffix}.firstname #{operator} ? ", value, value])
                   elsif key =~ /\.id\Z/
                     value = User.current.id if value == 'current_user'
-                    sanitize_sql_for_conditions(["foreman_tasks_locks_owner.resource_id #{operator} ?", value])
+                    sanitize_sql_for_conditions(["foreman_tasks_locks_owner#{uniq_suffix}.resource_id #{operator} ?", value])
                   else
-                    sanitize_sql_for_conditions(["users.#{key_name} #{operator} ?", value])
+                    sanitize_sql_for_conditions(["users#{uniq_suffix}.#{key_name} #{operator} ?", value])
                   end
       { :conditions => condition, :joins => joins }
     end

data/app/models/foreman_tasks/task_group.rb

@@ -1,7 +1,7 @@
 module ForemanTasks
   class TaskGroup < ActiveRecord::Base
-    has_many :task_group_members
-    has_many :tasks, :through => :task_group_members
+    has_many :task_group_members, :dependent => :destroy
+    has_many :tasks, :through => :task_group_members, :dependent => :nullify
 
     def resource_name
       raise NotImplementedError

data/app/models/foreman_tasks/task_groups/recurring_logic_task_group.rb

@@ -1,7 +1,7 @@
 module ForemanTasks
   module TaskGroups
     class RecurringLogicTaskGroup < ::ForemanTasks::TaskGroup
-      has_one :recurring_logic, :foreign_key => :task_group_id
+      has_one :recurring_logic, :foreign_key => :task_group_id, :dependent => :nullify
 
       alias resource recurring_logic
 

data/app/models/foreman_tasks/triggering.rb

@@ -21,7 +21,7 @@ module ForemanTasks
     TIME_REGEXP = /\A\d{4}-\d{2}-\d{2} \d{2}:\d{2}\Z/
     DAYS_REGEXP = /\A(\s*\d{1,2}\s*)(,\s*\d{1,2}\s*)*\Z/
 
-    has_one :recurring_logic, :foreign_key => :triggering_id
+    has_one :recurring_logic, :foreign_key => :triggering_id, :dependent => :nullify
 
     validates :mode, :inclusion => { :in => ALLOWED_MODES,
                                      :message => _('%{value} is not allowed triggering mode') }

data/app/views/foreman_tasks/tasks/dashboard/_latest_tasks_in_error_warning.html.erb

@@ -11,7 +11,7 @@
       <td class="ellipsis"><%= link_to task.humanized[:action], defined?(main_app) ? main_app.foreman_tasks_task_path(task.id) : foreman_tasks_task_path(task.id) %></td>
       <td><%= task.state %></td>
       <td><%= task.result %></td>
-      <td><%= task.started_at ? (_('%s ago') % time_ago_in_words(task.started_at)) : _('N/A') %></td>
+      <td><%= task.started_at ? (_(date_time_relative(task.started_at))) : _('N/A') %></td>
     </tr>
   <% end %>
 </table>

data/app/views/foreman_tasks/tasks/dashboard/_tasks_status.html.erb

@@ -11,7 +11,7 @@
       <td><%= result.state %></td>
       <td><%= result.result %></td>
       <td><%= link_to result.count, main_app.foreman_tasks_tasks_path(:search => "state=#{result.state}&result=#{result.result}") %></td>
-      <td><%= result.started_at ? (_('%s ago') % time_ago_in_words(result.started_at)) : _('N/A') %></td>
+      <td><%= result.started_at ? (_(date_time_relative(result.started_at))) : _('N/A') %></td>
     </tr>
   <% end %>
 </table>

data/app/views/foreman_tasks/tasks/index.html.erb

@@ -15,26 +15,26 @@ $(document).on('click', ".table-two-pane td.two-pane-link", function(e) {
 });
 
 </script>
-<table class="table table-bordered table-striped table-two-pane">
+<table class="<%= table_css_classes('table-fixed table-two-pane') %>">
   <tr>
-    <th><%= _("Action") %></th>
-    <th><%= _("State") %></th>
-    <th><%= _("Result") %></th>
-    <th><%= sort :started_at, :as => _("Started at") %></th>
-    <th><%= sort :ended_at, :as => _("Ended at") %></th>
-    <th><%= _("User") %></th>
+    <th class="col-md-4"><%= _("Action") %></th>
+    <th class="col-md-1"><%= _("State") %></th>
+    <th class="col-md-1"><%= _("Result") %></th>
+    <th class="col-md-2"><%= sort :started_at, :as => _("Started at") %></th>
+    <th class="col-md-2"><%= sort :ended_at, :as => _("Ended at") %></th>
+    <th class="col-md-2"><%= _("User") %></th>
   </tr>
   <% for task in @tasks %>
     <tr>
-      <td class="task-id two-pane-link">
-        <%= link_to_if_authorized(trunc_with_tooltip(format_task_input(task, true), 80),
+      <td class="task-id two-pane-link ellipsis">
+        <%= link_to_if_authorized(format_task_input(task, true),
         hash_for_foreman_tasks_task_path(:id => task)) %>
       </td>
-      <td><%= task.state %></td>
-      <td><%= task.result %></td>
-      <td><%= task.started_at.try(:in_time_zone) %></td>
-      <td><%= task.ended_at.try(:in_time_zone) %></td>
-      <td><%= task.username %></td>
+      <td class="ellipsis"><%= task.state %></td>
+      <td class="ellipsis"><%= task.result %></td>
+      <td class="ellipsis"><%= task.started_at.try(:in_time_zone) %></td>
+      <td class="ellipsis"><%= task.ended_at.try(:in_time_zone) %></td>
+      <td class="ellipsis"><%= task.username %></td>
     </tr>
   <% end %>
 </table>

data/foreman-tasks.gemspec

@@ -33,4 +33,6 @@ same resource. It also optionally provides Dynflow infrastructure for using it f
   s.add_dependency "sinatra" # for Dynflow web console
   s.add_dependency "parse-cron", '~> 0.1.4'
   s.add_dependency "get_process_mem" # for memory polling
+
+  s.add_development_dependency 'factory_bot_rails', '~> 4.8.0'
 end

data/lib/foreman_tasks.rb

@@ -20,16 +20,27 @@ module ForemanTasks
   end
 
   def self.trigger_task(async, action, *args, &block)
-    Match! async, true, false
-
-    match trigger(action, *args, &block),
-          (on ::Dynflow::World::PlaningFailed.call(error: ~any) do |error|
-            raise error
-          end),
-          (on ::Dynflow::World::Triggered.call(execution_plan_id: ~any, future: ~any) do |id, finished|
-            finished.wait if async == false
-            ForemanTasks::Task::DynflowTask.where(:external_id => id).first!
-          end)
+    rails_safe_trigger_task do
+      Match! async, true, false
+      match trigger(action, *args, &block),
+            (on ::Dynflow::World::PlaningFailed.call(error: ~any) do |error|
+              raise error
+            end),
+            (on ::Dynflow::World::Triggered.call(execution_plan_id: ~any, future: ~any) do |id, finished|
+              finished.wait if async == false
+              ForemanTasks::Task::DynflowTask.where(:external_id => id).first!
+            end)
+    end
+  end
+
+  def self.rails_safe_trigger_task
+    if Rails::VERSION::MAJOR > 4
+      ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
+        yield
+      end
+    else
+      yield
+    end
   end
 
   def self.async_task(action, *args, &block)

data/lib/foreman_tasks/dynflow.rb

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 require 'dynflow'
 
 module ForemanTasks

data/lib/foreman_tasks/dynflow/console_authorizer.rb

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 module ForemanTasks
   class Dynflow::ConsoleAuthorizer
     def initialize(env)

data/lib/foreman_tasks/engine.rb

@@ -41,7 +41,7 @@ module ForemanTasks
 
     initializer 'foreman_tasks.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :"foreman-tasks" do
-        requires_foreman '>= 1.15.0'
+        requires_foreman '>= 1.16.0'
         divider :top_menu, :parent => :monitor_menu, :last => true
         menu :top_menu, :tasks,
              :url_hash => { :controller => 'foreman_tasks/tasks', :action => :index },
@@ -121,7 +121,7 @@ module ForemanTasks
     end
 
     initializer 'foreman_tasks.set_core_settings' do
-      ForemanTasksCore::SettingsLoader.settings_registry.keys.each do |settings_keys|
+      ForemanTasksCore::SettingsLoader.settings_registry.each_key do |settings_keys|
         settings = settings_keys.inject({}) do |h, settings_key|
           h.merge(SETTINGS[settings_key] || {})
         end

data/lib/foreman_tasks/tasks/export_tasks.rake

@@ -241,7 +241,7 @@ namespace :foreman_tasks do
     end
 
     format = ENV['TASK_FORMAT'] || 'html'
-    export_filename = ENV['TASK_FILE'] || "/tmp/task-export-#{DateTime.now.to_i}.#{format == 'csv' ? 'csv' : 'tar.gz'}"
+    export_filename = ENV['TASK_FILE'] || "/tmp/task-export-#{Time.now.to_i}.#{format == 'csv' ? 'csv' : 'tar.gz'}"
 
     tasks = ForemanTasks::Task.search_for(filter)
 

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '0.10.4'.freeze
+  VERSION = '0.10.6'.freeze
 end

data/test/controllers/api/recurring_logics_controller_test.rb

@@ -9,7 +9,7 @@ module ForemanRecurringLogic
         User.current = User.where(:login => 'apiadmin').first
         @request.env['HTTP_ACCEPT'] = 'application/json'
         @request.env['CONTENT_TYPE'] = 'application/json'
-        @recurring_logic = FactoryGirl.create(:recurring_logic)
+        @recurring_logic = FactoryBot.create(:recurring_logic)
       end
 
       describe 'GET /api/recurring_logics' do

data/test/controllers/api/tasks_controller_test.rb

@@ -13,7 +13,7 @@ module ForemanTasks
 
       describe 'GET /api/tasks/show' do
         it 'searches for task' do
-          task = FactoryGirl.create(:dynflow_task, :user_create_task)
+          task = FactoryBot.create(:dynflow_task, :user_create_task)
           get :show, :id => task.id
           assert_response :success
           assert_template 'api/tasks/show'

data/test/factories/recurring_logic_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :recurring_logic, :class => ForemanTasks::RecurringLogic do
     cron_line '* * * * *'
     after(:build) { |logic| logic.task_group = build(:recurring_logic_task_group) }

data/test/factories/task_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :some_task, :class => ForemanTasks::Task do
     sequence(:label) { |n| "task#{n}" }
     type 'ForemanTasks::Task'

data/test/factories/triggering_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :triggering, :class => ForemanTasks::Triggering do
     mode :immediate
 

data/test/foreman_tasks_test_helper.rb

@@ -4,8 +4,8 @@ require_relative './support/dummy_proxy_action'
 
 require 'dynflow/testing'
 
-FactoryGirl.definition_file_paths = ["#{ForemanTasks::Engine.root}/test/factories"]
-FactoryGirl.find_definitions
+FactoryBot.definition_file_paths = ["#{ForemanTasks::Engine.root}/test/factories"]
+FactoryBot.find_definitions
 
 ForemanTasks.dynflow.require!
 ForemanTasks.dynflow.config.disable_active_record_actions = true

data/test/helpers/foreman_tasks/tasks_helper_test.rb

@@ -4,7 +4,7 @@ module ForemanTasks
   class TasksHelperTest < ActionView::TestCase
     describe 'when formatting simple input' do
       before do
-        @task = FactoryGirl.build(:dynflow_task, :user_create_task)
+        @task = FactoryBot.build(:dynflow_task, :user_create_task)
         humanized = { :humanized_name => 'Create', :humanized_input => [[:user, { :text => "user 'Anonymous Admin'", :link => nil }]] }
         @task.instance_variable_set('@humanized_cache', humanized)
         @task.stubs(:input).returns('user' => { 'id' => 1, 'name' => 'Anonymous Admin' }, 'locale' => 'en')
@@ -22,7 +22,7 @@ module ForemanTasks
 
     describe 'when formatting input' do
       before do
-        @task = FactoryGirl.build(:dynflow_task, :product_create_task)
+        @task = FactoryBot.build(:dynflow_task, :product_create_task)
         humanized = { :humanized_name => 'Create',
                       :humanized_input => [[:product, { :text => "product 'product-2'", :link => '#/products/3/info' }], [:organization, { :text => "organization 'test-0'", :link => '/organizations/3/edit' }]] }
         @task.instance_variable_set('@humanized_cache', humanized)

data/test/unit/actions/action_with_sub_plans_test.rb

@@ -34,7 +34,7 @@ module ForemanTasks
 
     describe Actions::ActionWithSubPlans do
       let(:task) do
-        user = FactoryGirl.create(:user)
+        user = FactoryBot.create(:user)
         triggered = ForemanTasks.trigger(ParentAction, user)
         raise triggered.error if triggered.respond_to?(:error)
         triggered.finished.wait(2)

data/test/unit/cleaner_test.rb

@@ -10,13 +10,13 @@ class TasksTest < ActiveSupport::TestCase
     it 'is able to delete tasks (including the dynflow plans) based on filter' do
       cleaner = ForemanTasks::Cleaner.new(:filter => 'label = "Actions::User::Create"', :after => '10d')
 
-      tasks_to_delete = [FactoryGirl.create(:dynflow_task, :user_create_task),
-                         FactoryGirl.create(:dynflow_task, :user_create_task)]
-      tasks_to_keep   = [FactoryGirl.create(:dynflow_task, :user_create_task) do |task|
+      tasks_to_delete = [FactoryBot.create(:dynflow_task, :user_create_task),
+                         FactoryBot.create(:dynflow_task, :user_create_task)]
+      tasks_to_keep   = [FactoryBot.create(:dynflow_task, :user_create_task) do |task|
                            task.started_at = task.ended_at = Time.zone.now
                            task.save
                          end,
-                         FactoryGirl.create(:dynflow_task, :product_create_task)]
+                         FactoryBot.create(:dynflow_task, :product_create_task)]
       cleaner.expects(:tasks_to_csv)
       cleaner.delete
       ForemanTasks::Task.where(id: tasks_to_delete).must_be_empty
@@ -31,13 +31,13 @@ class TasksTest < ActiveSupport::TestCase
 
     it 'deletes all tasks matching the filter when the time limit is not specified' do
       cleaner = ForemanTasks::Cleaner.new(:filter => 'label = "Actions::User::Create"')
-      tasks_to_delete = [FactoryGirl.create(:dynflow_task, :user_create_task),
-                         FactoryGirl.create(:dynflow_task, :user_create_task) do |task|
+      tasks_to_delete = [FactoryBot.create(:dynflow_task, :user_create_task),
+                         FactoryBot.create(:dynflow_task, :user_create_task) do |task|
                            task.started_at = task.ended_at = Time.zone.now
                            task.save
                          end]
 
-      tasks_to_keep   = [FactoryGirl.create(:dynflow_task, :product_create_task)]
+      tasks_to_keep   = [FactoryBot.create(:dynflow_task, :product_create_task)]
       cleaner.expects(:tasks_to_csv)
       cleaner.delete
       ForemanTasks::Task.where(id: tasks_to_delete).must_be_empty
@@ -46,10 +46,10 @@ class TasksTest < ActiveSupport::TestCase
 
     it 'supports passing empty filter (just delete all)' do
       cleaner = ForemanTasks::Cleaner.new(:filter => '', :after => '10d')
-      tasks_to_delete = [FactoryGirl.create(:dynflow_task, :user_create_task),
-                         FactoryGirl.create(:dynflow_task, :product_create_task)]
+      tasks_to_delete = [FactoryBot.create(:dynflow_task, :user_create_task),
+                         FactoryBot.create(:dynflow_task, :product_create_task)]
 
-      tasks_to_keep   = [FactoryGirl.create(:dynflow_task, :user_create_task) do |task|
+      tasks_to_keep   = [FactoryBot.create(:dynflow_task, :user_create_task) do |task|
                            task.started_at = task.ended_at = Time.zone.now
                            task.save
                          end]
@@ -62,8 +62,8 @@ class TasksTest < ActiveSupport::TestCase
     it 'backs tasks up before deleting' do
       dir = '/tmp'
       cleaner = ForemanTasks::Cleaner.new(:filter => '', :after => '10d', :backup_dir => dir)
-      tasks_to_delete = [FactoryGirl.create(:dynflow_task, :user_create_task),
-                         FactoryGirl.create(:dynflow_task, :product_create_task)]
+      tasks_to_delete = [FactoryBot.create(:dynflow_task, :user_create_task),
+                         FactoryBot.create(:dynflow_task, :product_create_task)]
 
       r, w = IO.pipe
       cleaner.expects(:with_backup_file)

data/test/unit/dynflow_console_authorizer_test.rb

@@ -8,8 +8,8 @@ module ForemanTasks
       User.current = User.where(:login => 'apiadmin').first
     end
 
-    let(:own_task)     { FactoryGirl.create(:dynflow_task, :set_owner => user) }
-    let(:foreign_task) { FactoryGirl.create(:dynflow_task) }
+    let(:own_task)     { FactoryBot.create(:dynflow_task, :set_owner => user) }
+    let(:foreign_task) { FactoryBot.create(:dynflow_task) }
 
     let(:edit_foreman_tasks_permission) do
       Permission.where(:name => :edit_foreman_tasks).first
@@ -24,7 +24,7 @@ module ForemanTasks
     end
 
     describe 'admin user' do
-      let(:user) { FactoryGirl.create(:user, :admin) }
+      let(:user) { FactoryBot.create(:user, :admin) }
       it 'can see all tasks' do
         assert dynflow_console_authorized?
         assert dynflow_console_authorized?(own_task)
@@ -34,9 +34,9 @@ module ForemanTasks
 
     describe 'user with unlimited edit_foreman_tasks permissions' do
       let(:user) do
-        user_role = FactoryGirl.create(:user_user_role)
-        FactoryGirl.create(:filter,
-                           :role => user_role.role, :permissions => [edit_foreman_tasks_permission])
+        user_role = FactoryBot.create(:user_user_role)
+        FactoryBot.create(:filter,
+                          :role => user_role.role, :permissions => [edit_foreman_tasks_permission])
         user_role.owner
       end
 
@@ -49,10 +49,10 @@ module ForemanTasks
 
     describe 'user with limited edit_foreman_tasks permissions' do
       let(:user) do
-        user_role = FactoryGirl.create(:user_user_role)
-        FactoryGirl.create(:filter,
-                           :search => 'owner.id = current_user',
-                           :role => user_role.role, :permissions => [edit_foreman_tasks_permission])
+        user_role = FactoryBot.create(:user_user_role)
+        FactoryBot.create(:filter,
+                          :search => 'owner.id = current_user',
+                          :role => user_role.role, :permissions => [edit_foreman_tasks_permission])
         user_role.owner
       end
 
@@ -64,7 +64,7 @@ module ForemanTasks
     end
 
     describe 'user without edit_foreman_tasks permissions' do
-      let(:user) { FactoryGirl.create(:user) }
+      let(:user) { FactoryBot.create(:user) }
       it 'can not see any tasks' do
         refute dynflow_console_authorized?
         refute dynflow_console_authorized?(own_task)

data/test/unit/proxy_selector_test.rb

@@ -12,7 +12,7 @@ describe ForemanTasks::ProxySelector do
       count = 3
       ProxyAPI::ForemanDynflow::DynflowProxy.any_instance.expects(:tasks_count).raises
                                             .then.times(count - 1).returns(0)
-      proxies = FactoryGirl.create_list(:smart_proxy, count)
+      proxies = FactoryBot.create_list(:smart_proxy, count)
 
       available = proxies.reduce([]) do |found, _|
         found << proxy_selector.select_by_jobs_count(proxies)
@@ -40,14 +40,14 @@ describe ForemanTasks::ProxySelector do
       count = 3
       ProxyAPI::ForemanDynflow::DynflowProxy.any_instance.expects(:tasks_count).times(count).raises
       proxy_selector.stubs(:available_proxies =>
-                           { :global => FactoryGirl.create_list(:smart_proxy, count) })
+                           { :global => FactoryBot.create_list(:smart_proxy, count) })
       proxy_selector.determine_proxy.must_equal :not_available
     end
 
     it 'returns first available proxy, prioritizing by strategy' do
       ProxyAPI::ForemanDynflow::DynflowProxy.any_instance.expects(:tasks_count).returns(0)
-      fallback_proxy = FactoryGirl.build(:smart_proxy)
-      global_proxy = FactoryGirl.build(:smart_proxy)
+      fallback_proxy = FactoryBot.build(:smart_proxy)
+      global_proxy = FactoryBot.build(:smart_proxy)
       ForemanTasks::ProxySelector.any_instance.stubs(:available_proxies =>
                                                      { :fallback => [fallback_proxy],
                                                        :global => [global_proxy] })

data/test/unit/recurring_logic_test.rb

@@ -89,14 +89,14 @@ class RecurringLogicsTest < ActiveSupport::TestCase
     end
 
     it 'can be created from triggering' do
-      triggering = FactoryGirl.build(:triggering, :recurring, :end_time_limited)
+      triggering = FactoryBot.build(:triggering, :recurring, :end_time_limited)
       logic = ForemanTasks::RecurringLogic.new_from_triggering(triggering)
       # Mysql coerces the times a bit
       logic.end_time.must_be_close_to(triggering.end_time, 1.second)
     end
 
     describe 'validation' do
-      let(:logic) { FactoryGirl.build(:recurring_logic) }
+      let(:logic) { FactoryBot.build(:recurring_logic) }
 
       it 'is valid by default' do
         logic.must_be :valid?

data/test/unit/task_test.rb

@@ -2,33 +2,39 @@ require 'foreman_tasks_test_helper'
 
 class TasksTest < ActiveSupport::TestCase
   describe 'filtering by current user' do
-    before { @original_current_user = User.current }
-    after  { User.current = @original_current_user }
+    before do
+      @original_current_user = User.current
+      @user_one = FactoryBot.create(:user)
+      @user_two = FactoryBot.create(:user)
 
-    test 'can search the tasks by current_user' do
-      user_one = FactoryGirl.create(:user)
-      user_two = FactoryGirl.create(:user)
+      @task_one = FactoryBot.create(:some_task, :set_owner => @user_one)
+      FactoryBot.create(:some_task, :set_owner => @user_two)
+
+      User.current = @user_one
+    end
+    after { User.current = @original_current_user }
 
-      task_one = FactoryGirl.create(:some_task, :set_owner => user_one)
-      FactoryGirl.create(:some_task, :set_owner => user_two)
+    test 'can search the tasks by current_user' do
+      assert_equal [@task_one], ForemanTasks::Task.search_for('owner.id = current_user')
+    end
 
-      User.current = user_one
-      assert_equal [task_one], ForemanTasks::Task.search_for('owner.id = current_user')
+    test 'can search the tasks by current_user in combination with implicit search' do
+      assert_equal [@task_one], ForemanTasks::Task.search_for("owner.id = current_user AND #{@task_one.label}")
     end
   end
 
   describe 'authorization filtering' do
     it 'can filter by the task subject' do
-      user_role  = FactoryGirl.create(:user_user_role)
+      user_role  = FactoryBot.create(:user_user_role)
       user       = user_role.owner
       role       = user_role.role
-      permission = FactoryGirl.build(:permission)
+      permission = FactoryBot.build(:permission)
       permission.resource_type = 'ForemanTasks::Task'
       permission.save!
-      FactoryGirl.create(:filter, :role => role, :permissions => [permission])
+      FactoryBot.create(:filter, :role => role, :permissions => [permission])
 
       User.current = user
-      task = FactoryGirl.create(:dynflow_task)
+      task = FactoryBot.create(:dynflow_task)
 
       auth = Authorizer.new(user)
       assert auth.can?(permission.name.to_sym, task)
@@ -36,8 +42,8 @@ class TasksTest < ActiveSupport::TestCase
   end
 
   describe 'consistency check' do
-    let(:consistent_task) { FactoryGirl.create(:dynflow_task, :sync_with_dynflow => true) }
-    let(:inconsistent_task) { FactoryGirl.create(:dynflow_task, :inconsistent_dynflow_task) }
+    let(:consistent_task) { FactoryBot.create(:dynflow_task, :sync_with_dynflow => true) }
+    let(:inconsistent_task) { FactoryBot.create(:dynflow_task, :inconsistent_dynflow_task) }
 
     it 'ensures the tasks marked as running are really running in Dynflow' do
       running_task_count = ForemanTasks::Task::DynflowTask.running.count
@@ -54,7 +60,7 @@ class TasksTest < ActiveSupport::TestCase
 
   describe 'task without valid execution plan' do
     let(:task) do
-      FactoryGirl.create(:dynflow_task).tap do |task|
+      FactoryBot.create(:dynflow_task).tap do |task|
         task.external_id = 'missing-task'
       end
     end
@@ -80,7 +86,7 @@ class TasksTest < ActiveSupport::TestCase
         :pending   => 0
       }
     end
-    let(:task) { FactoryGirl.create(:dynflow_task) }
+    let(:task) { FactoryBot.create(:dynflow_task) }
 
     describe 'without sub tasks' do
       it 'calculates the progress report correctly' do
@@ -89,8 +95,8 @@ class TasksTest < ActiveSupport::TestCase
     end
 
     describe 'with sub tasks' do
-      let(:failed) { FactoryGirl.create(:dynflow_task).tap { |t| t.result = :error } }
-      let(:success) { FactoryGirl.create(:dynflow_task).tap { |t| t.result = :success } }
+      let(:failed) { FactoryBot.create(:dynflow_task).tap { |t| t.result = :error } }
+      let(:success) { FactoryBot.create(:dynflow_task).tap { |t| t.result = :success } }
       before { task.sub_tasks = [success, failed] }
 
       it 'calculate the progress report correctly' do
@@ -99,7 +105,6 @@ class TasksTest < ActiveSupport::TestCase
       end
 
       it 'calculates the progress report correctly when using batch planning' do
-        # rubocop:disable Style/RedundantSelf - not redundant, as otherwise it conflicts with local variable
         result_base = self.result_base.merge(:success => 1, :error => 1, :total => 25)
         fake_action = OpenStruct.new(:total_count => 25)
         task.stubs(:main_action).returns(fake_action)
@@ -116,8 +121,8 @@ class TasksTest < ActiveSupport::TestCase
   end
 
   describe 'recurring task' do
-    let(:logic) { FactoryGirl.build(:recurring_logic) }
-    let(:task) { FactoryGirl.create(:some_task) }
+    let(:logic) { FactoryBot.build(:recurring_logic) }
+    let(:task) { FactoryBot.create(:some_task) }
 
     it 'can indicate it is recurring' do
       refute task.recurring?
@@ -128,7 +133,7 @@ class TasksTest < ActiveSupport::TestCase
   end
 
   describe 'delayed task' do
-    let(:task) { FactoryGirl.create(:some_task) }
+    let(:task) { FactoryBot.create(:some_task) }
 
     it 'can indicate it is delayed' do
       refute task.delayed?

data/test/unit/triggering_test.rb

@@ -3,18 +3,18 @@ require 'foreman_tasks_test_helper'
 class TriggeringTest < ActiveSupport::TestCase
   describe 'validation' do
     it 'is valid when immediate' do
-      FactoryGirl.build(:triggering).must_be :valid?
+      FactoryBot.build(:triggering).must_be :valid?
     end
 
     it 'is validates future execution' do
-      triggering = FactoryGirl.build(:triggering, :future)
+      triggering = FactoryBot.build(:triggering, :future)
       triggering.must_be :valid?
       triggering.start_before = triggering.start_at - 120
       triggering.wont_be :valid?
     end
 
     it 'is invalid when recurring logic is invalid' do
-      triggering = FactoryGirl.build(:triggering, :recurring)
+      triggering = FactoryBot.build(:triggering, :recurring)
       triggering.must_be :valid?
       triggering.recurring_logic.stubs(:valid?).returns(false)
       triggering.wont_be :valid?
@@ -22,7 +22,7 @@ class TriggeringTest < ActiveSupport::TestCase
   end
 
   it 'cannot have mode set to arbitrary value' do
-    triggering = FactoryGirl.build(:triggering)
+    triggering = FactoryBot.build(:triggering)
     triggering.must_be :valid?
     proc { triggering.mode = 'bogus' }.must_raise ArgumentError
     proc { triggering.mode = 27 }.must_raise ArgumentError

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.6
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2017-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_bot_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.8.0
 description: |
   The goal of this plugin is to unify the way of showing task statuses across the Foreman instance.
   It defines Task model for keeping the information about the tasks and Lock for assigning the tasks
@@ -125,6 +139,7 @@ files:
 - app/lib/actions/helpers/with_delegated_action.rb
 - app/lib/actions/middleware/inherit_task_groups.rb
 - app/lib/actions/middleware/keep_current_user.rb
+- app/lib/actions/middleware/rails_executor_wrap.rb
 - app/lib/actions/middleware/recurring_logic.rb
 - app/lib/actions/proxy_action.rb
 - app/lib/actions/serializers/active_record_serializer.rb