foreman-tasks 0.10.9 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f56949ea2cda099243fd048786274ee80dd94920
-  data.tar.gz: 307449f1fe7f6a18fa029bf6f418e257231f2484
+  metadata.gz: abb4a2ffa0ff0ef6082c2ebe1a8a90d89b5b3b27
+  data.tar.gz: 35f084894f1692002cc5a76458b28f34763d9778
 SHA512:
-  metadata.gz: 7a9d26057cf27ab1255eec075b935c201864ea4e47b46f3aae45e61a121b65d8817bdec5e878fd8822962e2d32cadb2e0fff3ab41c58a62f5a5c23a77dca9750
-  data.tar.gz: 99a89d2b357dd0a8a96dbcf3f9651bfafe14ad125b75c26455291e65ea064260f77715d45d936b6874ddf9659ba5a92794bdad6d5efe6b3dde6ada0b12b3f8e3
+  metadata.gz: da1b67abb754259dddb59013b176c38cfcb4c2f69d09640bf89a862f784b08d53ee30ca228723ab24aabb1db2770249e57b07cce9bb756df214feac2becd3393
+  data.tar.gz: 02be42c80788f710e700f8c502177c584a421517e76678299859258a08b2c1267c9134afd088b0801bce3390f9e19feafc3afb3affa0cd5c65df31c23cb0698e

data/.rubocop.yml

@@ -64,7 +64,7 @@ Metrics/BlockLength:
   Exclude:
     - lib/foreman_tasks/tasks/**/*
 
-Style/FileName:
+Naming/FileName:
   Exclude:
     - '*.gemspec'
     - Gemfile
@@ -76,6 +76,9 @@ Layout/IndentHeredoc:
     - '*.gemspec'
     - bin/*
 
+Style/RescueStandardError:
+  Enabled: false
+
 Style/IfUnlessModifier:
   Enabled: false
 
@@ -91,5 +94,8 @@ Style/SafeNavigation:
 Performance/RegexpMatch:
   Enabled: false
 
+Rails/InverseOf:
+  Enabled: false
+
 Style/FormatStringToken:
   Enabled: false

data/.rubocop_todo.yml

@@ -1,117 +1,136 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config --exclude-limit 0`
-# on 2017-12-20 11:41:34 +0100 using RuboCop version 0.49.1.
+# `rubocop --auto-gen-config`
+# on 2016-12-21 14:29:23 +0200 using RuboCop version 0.46.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: final_newline, final_blank_line
-Layout/TrailingBlankLines:
-  Enabled: false
-
-# Offense count: 1
 Lint/EmptyWhen:
-  Enabled: false
+  Exclude:
+    - 'app/lib/actions/proxy_action.rb'
+
+Lint/ShadowingOuterLocalVariable:
+  Exclude:
+    - 'bin/dynflow-executor'
 
-# Offense count: 2
 Lint/UselessAssignment:
-  Enabled: false
+  Exclude:
+    - 'lib/foreman_tasks/tasks/export_tasks.rake'
 
-# Offense count: 32
 Metrics/AbcSize:
   Max: 41
 
-# Offense count: 15
-# Configuration parameters: CountComments, ExcludedMethods.
+# Configuration parameters: CountComments.
 Metrics/BlockLength:
   Max: 105
 
-# Offense count: 12
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
   Max: 230
 
-# Offense count: 9
 Metrics/CyclomaticComplexity:
-  Max: 9
+  Max: 10
 
-# Offense count: 453
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
-  Max: 211
+  Max: 244
 
-# Offense count: 51
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 29
+  Max: 37
 
-# Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 168
+  Max: 170
 
-# Offense count: 1
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 6
 
-# Offense count: 4
 Metrics/PerceivedComplexity:
-  Max: 9
+  Max: 10
 
-# Offense count: 4
-# Cop supports --auto-correct.
 # Configuration parameters: Include.
-# Include: spec/**/*, test/**/*
+# Include: app/**/*.rb, config/**/*.rb, lib/**/*.rb
+Rails/Exit:
+  Exclude:
+    - 'lib/**/*.rake'
+
 Rails/HttpPositionalArguments:
   Enabled: false
 
-# Offense count: 1
 # Configuration parameters: Include.
 # Include: app/**/*.rb, config/**/*.rb, db/**/*.rb, lib/**/*.rb
 Rails/Output:
-  Enabled: false
+  Exclude:
+    - 'lib/foreman_tasks/cleaner.rb'
 
-# Offense count: 5
 Rails/OutputSafety:
-  Enabled: false
+  Exclude:
+    - 'app/helpers/foreman_tasks/foreman_tasks_helper.rb'
 
-# Offense count: 11
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
-  Enabled: false
+  Exclude:
+    - 'app/lib/actions/action_with_sub_plans.rb'
+    - 'app/models/foreman_tasks/task/dynflow_task.rb'
+    - 'app/models/foreman_tasks/task/status_explicator.rb'
+    - 'app/models/foreman_tasks/task/summarizer.rb'
+    - 'app/models/foreman_tasks/task/task_cancelled_exception.rb'
+    - 'app/models/setting/foreman_tasks.rb'
+    - 'lib/foreman_tasks/dynflow/configuration.rb'
+    - 'lib/foreman_tasks/dynflow/console_authorizer.rb'
+    - 'lib/foreman_tasks/dynflow/persistence.rb'
+    - 'test/controllers/api/recurring_logics_controller_test.rb'
+    - 'test/controllers/api/tasks_controller_test.rb'
+    - 'test/unit/actions/action_with_sub_plans_test.rb'
 
-# Offense count: 2
 Style/DoubleNegation:
-  Enabled: false
+  Exclude:
+    - 'app/models/foreman_tasks/lock.rb'
+    - 'app/models/foreman_tasks/recurring_logic.rb'
+
+# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts.
+Naming/FileName:
+  Exclude:
+    - 'db/seeds.d/20-foreman_tasks_permissions.rb'
+    - 'db/seeds.d/60-dynflow_proxy_feature.rb'
+    - 'db/seeds.d/61-foreman_tasks_bookmarks.rb'
+    - 'lib/foreman-tasks.rb'
+
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: format, sprintf, percent
+Style/FormatString:
+  Exclude:
+    - 'app/models/foreman_tasks/task/dynflow_task.rb'
+    - 'lib/foreman_tasks/tasks/export_tasks.rake'
 
-# Offense count: 31
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Enabled: false
 
-# Offense count: 1
 # Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
 # NamePrefix: is_, has_, have_
 # NamePrefixBlacklist: is_, has_, have_
 # NameWhitelist: is_a?
-Style/PredicateName:
-  Enabled: false
+Naming/PredicateName:
+  Exclude:
+    - 'spec/**/*'
+    - 'app/models/foreman_tasks/task/status_explicator.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/RedundantSelf:
-  Enabled: false
-
-# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
 # SupportedStyles: slashes, percent_r, mixed
 Style/RegexpLiteral:
-  Enabled: false
+  Exclude:
+    - 'lib/foreman_tasks/dynflow/console_authorizer.rb'
+
+# Configuration parameters: Methods.
+# Methods: {"reduce"=>["acc", "elem"]}, {"inject"=>["acc", "elem"]}
+Style/SingleLineBlockParams:
+  Exclude:
+    - 'app/models/foreman_tasks/concerns/action_subject.rb'
+    - 'app/models/foreman_tasks/lock.rb'

data/app/models/foreman_tasks/concerns/action_triggering.rb

@@ -4,11 +4,13 @@ module ForemanTasks
       extend ActiveSupport::Concern
 
       included do
-        after_create :plan_hook_action
-        after_update :plan_hook_action
-        after_destroy :plan_hook_action
+        raise "Use 'prepend' instead of 'include' for ForemanTasks::Concerns::ActionTriggering"
+      end
 
-        alias_method_chain :save, :dynflow_task_wrap
+      def self.prepended(base)
+        base.after_create :plan_hook_action
+        base.after_update :plan_hook_action
+        base.after_destroy :plan_hook_action
       end
 
       # These three *_action methods are called before the save/destroy actually occurs
@@ -21,8 +23,8 @@ module ForemanTasks
       # @override
       def destroy_action; end
 
-      def save_with_dynflow_task_wrap(*args)
-        dynflow_task_wrap(:save) { save_without_dynflow_task_wrap(*args) }
+      def save(*args)
+        dynflow_task_wrap(:save) { super(*args) }
       end
 
       def save!(*args)

data/db/migrate/20131205204140_create_foreman_tasks.rb

@@ -1,4 +1,4 @@
-class CreateForemanTasks < ActiveRecord::Migration
+class CreateForemanTasks < ActiveRecord::Migration[4.2]
   def change
     create_table :foreman_tasks_tasks, :id => false, :primary_key => :id do |t|
       t.string :id, null: false

data/db/migrate/20131209122644_create_foreman_tasks_locks.rb

@@ -1,4 +1,4 @@
-class CreateForemanTasksLocks < ActiveRecord::Migration
+class CreateForemanTasksLocks < ActiveRecord::Migration[4.2]
   def change
     create_table :foreman_tasks_locks do |t|
       t.string :task_id, index: true, null: false

data/db/migrate/20140324104010_remove_foreman_tasks_progress.rb

@@ -1,4 +1,4 @@
-class RemoveForemanTasksProgress < ActiveRecord::Migration
+class RemoveForemanTasksProgress < ActiveRecord::Migration[4.2]
   def change
     remove_column :foreman_tasks_tasks, :progress
   end

data/db/migrate/20140813215942_add_parent_task_id.rb

@@ -1,4 +1,4 @@
-class AddParentTaskId < ActiveRecord::Migration
+class AddParentTaskId < ActiveRecord::Migration[4.2]
   def change
     add_column :foreman_tasks_tasks, :parent_task_id, :string, index: true
   end

data/db/migrate/20150814204140_add_task_type_value_index.rb

@@ -1,4 +1,4 @@
-class AddTaskTypeValueIndex < ActiveRecord::Migration
+class AddTaskTypeValueIndex < ActiveRecord::Migration[4.2]
   def change
     add_index :foreman_tasks_tasks, [:type, :label]
   end

data/db/migrate/20150817102538_add_delay_attributes.rb

@@ -1,4 +1,4 @@
-class AddDelayAttributes < ActiveRecord::Migration
+class AddDelayAttributes < ActiveRecord::Migration[4.2]
   def change
     add_column :foreman_tasks_tasks, :start_at, :datetime, index: true, default: nil, null: true
     add_column :foreman_tasks_tasks, :start_before, :datetime, index: true, default: nil, null: true

data/db/migrate/20150907124936_create_recurring_logic.rb

@@ -1,4 +1,4 @@
-class CreateRecurringLogic < ActiveRecord::Migration
+class CreateRecurringLogic < ActiveRecord::Migration[4.2]
   def change
     create_table :foreman_tasks_recurring_logics do |t|
       t.string :cron_line, :null => false

data/db/migrate/20150907131503_create_task_groups.rb

@@ -1,4 +1,4 @@
-class CreateTaskGroups < ActiveRecord::Migration
+class CreateTaskGroups < ActiveRecord::Migration[4.2]
   def up
     create_table :foreman_tasks_task_groups do |t|
       t.string :type, index: true, null: false

data/db/migrate/20151022123457_add_recurring_logic_state.rb

@@ -1,4 +1,4 @@
-class AddRecurringLogicState < ActiveRecord::Migration
+class AddRecurringLogicState < ActiveRecord::Migration[4.2]
   def up
     add_column :foreman_tasks_recurring_logics, :state, :string, :index => true
   end

data/db/migrate/20151112152108_create_triggerings.rb

@@ -1,4 +1,4 @@
-class CreateTriggerings < ActiveRecord::Migration
+class CreateTriggerings < ActiveRecord::Migration[4.2]
   def up
     create_table :foreman_tasks_triggerings do |t|
       t.string :mode, null: false

data/db/migrate/20160920151810_add_more_lock_indexes.rb

@@ -1,4 +1,4 @@
-class AddMoreLockIndexes < ActiveRecord::Migration
+class AddMoreLockIndexes < ActiveRecord::Migration[4.2]
   def change
     add_index(:foreman_tasks_tasks, [:id, :state],
               :name => 'index_foreman_tasks_id_state')

data/db/migrate/20160924213030_change_tasks_widget_names.rb

@@ -1,4 +1,4 @@
-class ChangeTasksWidgetNames < ActiveRecord::Migration
+class ChangeTasksWidgetNames < ActiveRecord::Migration[4.2]
   def up
     Widget.where(:name => 'Tasks Status table')\
           .update_all(:name => 'Task Status')

data/db/migrate/20161003091412_add_missing_indexes.rb

@@ -1,4 +1,4 @@
-class AddMissingIndexes < ActiveRecord::Migration
+class AddMissingIndexes < ActiveRecord::Migration[4.2]
   # since this is just making sure the indexes we defined before are
   # really added we don't define the down direction here.
   # The support for defining index at column definition was added in Rails here

data/deploy/foreman-tasks.sysconfig

@@ -1,5 +1,6 @@
 FOREMAN_USER=foreman
 BUNDLER_EXT_HOME=/usr/share/foreman
+RAILS_RELATIVE_URL_ROOT=$FOREMAN_PREFIX
 RAILS_ENV=production
 FOREMAN_LOGGING=warn
 FOREMAN_LOGGING_SQL=warn

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/authorizer_ext.rb

@@ -4,15 +4,11 @@ module ForemanTasks
   module AuthorizerExt
     extend ActiveSupport::Concern
 
-    included do
-      alias_method_chain :resource_name, :authorized_resource_name
-    end
-
-    def resource_name_with_authorized_resource_name(klass)
+    def resource_name(klass)
       if klass.respond_to?(:authorized_resource_name)
         klass.authorized_resource_name
       else
-        resource_name_without_authorized_resource_name(klass)
+        super klass
       end
     end
   end

data/lib/foreman_tasks/engine.rb

@@ -140,7 +140,7 @@ module ForemanTasks
     config.to_prepare do
       ForemanTasks.dynflow.eager_load_actions! if ForemanTasks.dynflow.initialized?
 
-      Authorizer.send(:include, AuthorizerExt)
+      Authorizer.send(:prepend, AuthorizerExt)
     end
 
     config.after_initialize do

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '0.10.9'.freeze
+  VERSION = '0.11.0'.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/controllers/recurring_logics_controller_test.rb

@@ -5,10 +5,10 @@ module ForemanTasks
     basic_index_test('recurring_logics')
     basic_pagination_per_page_test
 
-    # rubocop:disable Style/AccessorMethodName
+    # rubocop:disable Naming/AccessorMethodName
     def get_factory_name
       :recurring_logic
     end
-    # rubocop:enable Style/AccessorMethodName
+    # rubocop:enable Naming/AccessorMethodName
   end
 end

data/test/controllers/tasks_controller_test.rb

@@ -7,11 +7,11 @@ module ForemanTasks
       basic_pagination_per_page_test
       basic_pagination_rendered_test
 
-      # rubocop:disable Style/AccessorMethodName
+      # rubocop:disable Naming/AccessorMethodName
       def get_factory_name
         :dynflow_task
       end
-      # rubocop:enable Style/AccessorMethodName
+      # rubocop:enable Naming/AccessorMethodName
     end
   end
 end

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')
@@ -21,7 +21,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_groups_test.rb

@@ -63,11 +63,11 @@ module ForemanTasks
         children_count = 3
         task = spawn_task.call ParentAction, children_count
         # Parent task has task groups of its children
-        task.task_groups.map(&:id).must_equal [1, 2, 3, 4]
+        task.task_groups.map(&:id).sort.must_equal [1, 2, 3, 4]
         # Children have the parent's and their own, they don't have their siblings' task groups
         task.sub_tasks.count.must_equal children_count
         task.sub_tasks.each do |sub_task|
-          sub_task.task_groups.map(&:id).must_equal [1, sub_task.input[:id]]
+          sub_task.task_groups.map(&:id).sort.must_equal [1, sub_task.input[:id]].sort
         end
       end
     end

data/test/unit/task_test.rb

@@ -4,11 +4,11 @@ class TasksTest < ActiveSupport::TestCase
   describe 'filtering by current user' do
     before do
       @original_current_user = User.current
-      @user_one = FactoryGirl.create(:user)
-      @user_two = FactoryGirl.create(:user)
+      @user_one = FactoryBot.create(:user)
+      @user_two = FactoryBot.create(:user)
 
-      @task_one = FactoryGirl.create(:some_task, :set_owner => @user_one)
-      FactoryGirl.create(:some_task, :set_owner => @user_two)
+      @task_one = FactoryBot.create(:some_task, :set_owner => @user_one)
+      FactoryBot.create(:some_task, :set_owner => @user_two)
 
       User.current = @user_one
     end
@@ -25,16 +25,16 @@ class TasksTest < ActiveSupport::TestCase
 
   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)
@@ -42,17 +42,15 @@ 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
       consistent_task.state.must_equal 'planned'
       inconsistent_task.state.must_equal 'running'
 
-      fixed_count = ForemanTasks::Task::DynflowTask.consistency_check
+      ForemanTasks::Task::DynflowTask.consistency_check
 
-      fixed_count.must_equal running_task_count + 1
       consistent_task.reload.state.must_equal 'planned'
       inconsistent_task.reload.state.must_equal 'planned'
     end
@@ -60,7 +58,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
@@ -86,7 +84,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
@@ -95,8 +93,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
@@ -121,8 +119,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?
@@ -133,7 +131,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.9
+  version: 0.11.0
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-09 00:00:00.000000000 Z
+date: 2017-12-20 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