foreman-tasks 0.10.8 → 0.10.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 517f4fe1176d5f003fda0b4e9e85631b932ae537
-  data.tar.gz: 4770f771d8f0974a3527e43eae421bbf47b40a77
+  metadata.gz: f56949ea2cda099243fd048786274ee80dd94920
+  data.tar.gz: 307449f1fe7f6a18fa029bf6f418e257231f2484
 SHA512:
-  metadata.gz: fcba604b31584a5cb1929cd4acbcfee621abb3e688cb91a30336dbd0bbabf849363acf32c4f3ce4dbd7dd714e6bdb80eca5d4495fe1a4c09517c3b41056a6728
-  data.tar.gz: 8a413be826f98c0a45ba60ea6a86f9a6e6807ea96e54d4a5b6fa7de28733acf169ceed1e79e55e042be85ce218943ecc01f7c531ac93a5e473dc60867795cb2d
+  metadata.gz: 7a9d26057cf27ab1255eec075b935c201864ea4e47b46f3aae45e61a121b65d8817bdec5e878fd8822962e2d32cadb2e0fff3ab41c58a62f5a5c23a77dca9750
+  data.tar.gz: 99a89d2b357dd0a8a96dbcf3f9651bfafe14ad125b75c26455291e65ea064260f77715d45d936b6874ddf9659ba5a92794bdad6d5efe6b3dde6ada0b12b3f8e3

data/.rubocop.yml

@@ -76,5 +76,20 @@ Layout/IndentHeredoc:
     - '*.gemspec'
     - bin/*
 
-Lint/RescueWithoutErrorClass:
+Style/IfUnlessModifier:
+  Enabled: false
+
+Style/NumericPredicate:
+  Enabled: false
+
+Style/IfUnlessModifier:
+  Enabled: false
+
+Style/SafeNavigation:
+  Enabled: false
+
+Performance/RegexpMatch:
+  Enabled: false
+
+Style/FormatStringToken:
   Enabled: false

data/.rubocop_todo.yml

@@ -1,136 +1,117 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2016-12-21 14:29:23 +0200 using RuboCop version 0.46.0.
+# `rubocop --auto-gen-config --exclude-limit 0`
+# on 2017-12-20 11:41:34 +0100 using RuboCop version 0.49.1.
 # 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.
 
-Lint/EmptyWhen:
-  Exclude:
-    - 'app/lib/actions/proxy_action.rb'
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: final_newline, final_blank_line
+Layout/TrailingBlankLines:
+  Enabled: false
 
-Lint/ShadowingOuterLocalVariable:
-  Exclude:
-    - 'bin/dynflow-executor'
+# Offense count: 1
+Lint/EmptyWhen:
+  Enabled: false
 
+# Offense count: 2
 Lint/UselessAssignment:
-  Exclude:
-    - 'lib/foreman_tasks/tasks/export_tasks.rake'
+  Enabled: false
 
+# Offense count: 32
 Metrics/AbcSize:
   Max: 41
 
-# Configuration parameters: CountComments.
+# Offense count: 15
+# Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
   Max: 105
 
+# Offense count: 12
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
   Max: 230
 
+# Offense count: 9
 Metrics/CyclomaticComplexity:
-  Max: 10
+  Max: 9
 
+# Offense count: 453
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
-  Max: 244
+  Max: 211
 
+# Offense count: 51
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 37
+  Max: 29
 
+# Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 170
+  Max: 168
 
+# Offense count: 1
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 6
 
+# Offense count: 4
 Metrics/PerceivedComplexity:
-  Max: 10
+  Max: 9
 
+# Offense count: 4
+# Cop supports --auto-correct.
 # Configuration parameters: Include.
-# Include: app/**/*.rb, config/**/*.rb, lib/**/*.rb
-Rails/Exit:
-  Exclude:
-    - 'lib/**/*.rake'
-
+# Include: spec/**/*, test/**/*
 Rails/HttpPositionalArguments:
   Enabled: false
 
+# Offense count: 1
 # Configuration parameters: Include.
 # Include: app/**/*.rb, config/**/*.rb, db/**/*.rb, lib/**/*.rb
 Rails/Output:
-  Exclude:
-    - 'lib/foreman_tasks/cleaner.rb'
+  Enabled: false
 
+# Offense count: 5
 Rails/OutputSafety:
-  Exclude:
-    - 'app/helpers/foreman_tasks/foreman_tasks_helper.rb'
+  Enabled: false
 
+# Offense count: 11
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
-  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'
+  Enabled: false
 
+# Offense count: 2
 Style/DoubleNegation:
-  Exclude:
-    - 'app/models/foreman_tasks/lock.rb'
-    - 'app/models/foreman_tasks/recurring_logic.rb'
-
-# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts.
-Style/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'
+  Enabled: false
 
+# 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:
-  Exclude:
-    - 'spec/**/*'
-    - 'app/models/foreman_tasks/task/status_explicator.rb'
+  Enabled: false
 
+# 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:
-  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'
+  Enabled: false

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

@@ -9,7 +9,7 @@ module ForemanTasks
         api_base_url '/foreman_tasks/api'
       end
 
-      before_action :find_resource, :only => %w[show cancel destroy]
+      before_action :find_resource, :only => %w[show cancel]
 
       api :GET, '/recurring_logics', N_('List recurring logics')
       def index

data/app/models/foreman_tasks/lock.rb

@@ -12,14 +12,13 @@ module ForemanTasks
     class LockConflict < StandardError
       attr_reader :required_lock, :conflicting_locks
       def initialize(required_lock, conflicting_locks)
-        header = _('Required lock is already taken by other running tasks.')
-        header << "\n"
-        header << _('Please inspect their state, fix their errors and resume them.')
-        header << "\n\n"
-        header << _('Required lock: %s') % required_lock.name
-        header << "\n"
-        header << _('Conflicts with tasks:')
-        header << "\n"
+        header = <<-HEADER.gsub(/^\s+\| ?/, '')
+        | #{_('Required lock is already taken by other running tasks.')}
+        | #{_('Please inspect their state, fix their errors and resume them.')}
+        |
+        | #{_('Required lock: %s') % required_lock.name}
+        | #{_('Conflicts with tasks:')}
+        HEADER
         url_helpers       = Rails.application.routes.url_helpers
         conflicting_tasks = conflicting_locks
                             .map(&:task)

data/deploy/foreman-tasks.sysconfig

@@ -1,6 +1,5 @@
 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,6 +33,4 @@ 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/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '0.10.8'.freeze
+  VERSION = '0.10.9'.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 = FactoryBot.create(:recurring_logic)
+        @recurring_logic = FactoryGirl.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 = FactoryBot.create(:dynflow_task, :user_create_task)
+          task = FactoryGirl.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 @@
-FactoryBot.define do
+FactoryGirl.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 @@
-FactoryBot.define do
+FactoryGirl.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 @@
-FactoryBot.define do
+FactoryGirl.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'
 
-FactoryBot.definition_file_paths = ["#{ForemanTasks::Engine.root}/test/factories"]
-FactoryBot.find_definitions
+FactoryGirl.definition_file_paths = ["#{ForemanTasks::Engine.root}/test/factories"]
+FactoryGirl.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 = FactoryBot.build(:dynflow_task, :user_create_task)
+        @task = FactoryGirl.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 = FactoryBot.build(:dynflow_task, :product_create_task)
+        @task = FactoryGirl.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 = FactoryBot.create(:user)
+        user = FactoryGirl.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 = [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|
+      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|
                            task.started_at = task.ended_at = Time.zone.now
                            task.save
                          end,
-                         FactoryBot.create(:dynflow_task, :product_create_task)]
+                         FactoryGirl.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 = [FactoryBot.create(:dynflow_task, :user_create_task),
-                         FactoryBot.create(:dynflow_task, :user_create_task) do |task|
+      tasks_to_delete = [FactoryGirl.create(:dynflow_task, :user_create_task),
+                         FactoryGirl.create(:dynflow_task, :user_create_task) do |task|
                            task.started_at = task.ended_at = Time.zone.now
                            task.save
                          end]
 
-      tasks_to_keep   = [FactoryBot.create(:dynflow_task, :product_create_task)]
+      tasks_to_keep   = [FactoryGirl.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 = [FactoryBot.create(:dynflow_task, :user_create_task),
-                         FactoryBot.create(:dynflow_task, :product_create_task)]
+      tasks_to_delete = [FactoryGirl.create(:dynflow_task, :user_create_task),
+                         FactoryGirl.create(:dynflow_task, :product_create_task)]
 
-      tasks_to_keep   = [FactoryBot.create(:dynflow_task, :user_create_task) do |task|
+      tasks_to_keep   = [FactoryGirl.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 = [FactoryBot.create(:dynflow_task, :user_create_task),
-                         FactoryBot.create(:dynflow_task, :product_create_task)]
+      tasks_to_delete = [FactoryGirl.create(:dynflow_task, :user_create_task),
+                         FactoryGirl.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)     { FactoryBot.create(:dynflow_task, :set_owner => user) }
-    let(:foreign_task) { FactoryBot.create(:dynflow_task) }
+    let(:own_task)     { FactoryGirl.create(:dynflow_task, :set_owner => user) }
+    let(:foreign_task) { FactoryGirl.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) { FactoryBot.create(:user, :admin) }
+      let(:user) { FactoryGirl.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 = FactoryBot.create(:user_user_role)
-        FactoryBot.create(:filter,
-                          :role => user_role.role, :permissions => [edit_foreman_tasks_permission])
+        user_role = FactoryGirl.create(:user_user_role)
+        FactoryGirl.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 = FactoryBot.create(:user_user_role)
-        FactoryBot.create(:filter,
-                          :search => 'owner.id = current_user',
-                          :role => user_role.role, :permissions => [edit_foreman_tasks_permission])
+        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.owner
       end
 
@@ -64,7 +64,7 @@ module ForemanTasks
     end
 
     describe 'user without edit_foreman_tasks permissions' do
-      let(:user) { FactoryBot.create(:user) }
+      let(:user) { FactoryGirl.create(:user) }
       it 'can not see any tasks' do
         refute dynflow_console_authorized?
         refute dynflow_console_authorized?(own_task)

data/test/unit/lock_test.rb

@@ -0,0 +1,22 @@
+require 'ostruct'
+require 'foreman_tasks_test_helper'
+
+module ForemanTasks
+  class LockTest < ::ActiveSupport::TestCase
+    describe ::ForemanTasks::Lock::LockConflict do
+      class FakeLockConflict < ForemanTasks::Lock::LockConflict
+        def _(val)
+          val.freeze
+        end
+      end
+
+      it 'does not modify frozen strings' do
+        required_lock = OpenStruct.new(:name => 'my_lock')
+        # Before #21770 the next line would raise
+        #   RuntimeError: can't modify frozen String
+        conflict = FakeLockConflict.new(required_lock, [])
+        assert conflict._('this should be frozen').frozen?
+      end
+    end
+  end
+end

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 = FactoryBot.create_list(:smart_proxy, count)
+      proxies = FactoryGirl.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 => FactoryBot.create_list(:smart_proxy, count) })
+                           { :global => FactoryGirl.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 = FactoryBot.build(:smart_proxy)
-      global_proxy = FactoryBot.build(:smart_proxy)
+      fallback_proxy = FactoryGirl.build(:smart_proxy)
+      global_proxy = FactoryGirl.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 = FactoryBot.build(:triggering, :recurring, :end_time_limited)
+      triggering = FactoryGirl.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) { FactoryBot.build(:recurring_logic) }
+      let(:logic) { FactoryGirl.build(:recurring_logic) }
 
       it 'is valid by default' do
         logic.must_be :valid?

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 = FactoryBot.create(:user)
-      @user_two = FactoryBot.create(:user)
+      @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)
+      @task_one = FactoryGirl.create(:some_task, :set_owner => @user_one)
+      FactoryGirl.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  = FactoryBot.create(:user_user_role)
+      user_role  = FactoryGirl.create(:user_user_role)
       user       = user_role.owner
       role       = user_role.role
-      permission = FactoryBot.build(:permission)
+      permission = FactoryGirl.build(:permission)
       permission.resource_type = 'ForemanTasks::Task'
       permission.save!
-      FactoryBot.create(:filter, :role => role, :permissions => [permission])
+      FactoryGirl.create(:filter, :role => role, :permissions => [permission])
 
       User.current = user
-      task = FactoryBot.create(:dynflow_task)
+      task = FactoryGirl.create(:dynflow_task)
 
       auth = Authorizer.new(user)
       assert auth.can?(permission.name.to_sym, task)
@@ -42,8 +42,8 @@ class TasksTest < ActiveSupport::TestCase
   end
 
   describe 'consistency check' do
-    let(:consistent_task) { FactoryBot.create(:dynflow_task, :sync_with_dynflow => true) }
-    let(:inconsistent_task) { FactoryBot.create(:dynflow_task, :inconsistent_dynflow_task) }
+    let(:consistent_task) { FactoryGirl.create(:dynflow_task, :sync_with_dynflow => true) }
+    let(:inconsistent_task) { FactoryGirl.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
@@ -60,7 +60,7 @@ class TasksTest < ActiveSupport::TestCase
 
   describe 'task without valid execution plan' do
     let(:task) do
-      FactoryBot.create(:dynflow_task).tap do |task|
+      FactoryGirl.create(:dynflow_task).tap do |task|
         task.external_id = 'missing-task'
       end
     end
@@ -86,7 +86,7 @@ class TasksTest < ActiveSupport::TestCase
         :pending   => 0
       }
     end
-    let(:task) { FactoryBot.create(:dynflow_task) }
+    let(:task) { FactoryGirl.create(:dynflow_task) }
 
     describe 'without sub tasks' do
       it 'calculates the progress report correctly' do
@@ -95,8 +95,8 @@ class TasksTest < ActiveSupport::TestCase
     end
 
     describe 'with sub tasks' do
-      let(:failed) { FactoryBot.create(:dynflow_task).tap { |t| t.result = :error } }
-      let(:success) { FactoryBot.create(:dynflow_task).tap { |t| t.result = :success } }
+      let(:failed) { FactoryGirl.create(:dynflow_task).tap { |t| t.result = :error } }
+      let(:success) { FactoryGirl.create(:dynflow_task).tap { |t| t.result = :success } }
       before { task.sub_tasks = [success, failed] }
 
       it 'calculate the progress report correctly' do
@@ -121,8 +121,8 @@ class TasksTest < ActiveSupport::TestCase
   end
 
   describe 'recurring task' do
-    let(:logic) { FactoryBot.build(:recurring_logic) }
-    let(:task) { FactoryBot.create(:some_task) }
+    let(:logic) { FactoryGirl.build(:recurring_logic) }
+    let(:task) { FactoryGirl.create(:some_task) }
 
     it 'can indicate it is recurring' do
       refute task.recurring?
@@ -133,7 +133,7 @@ class TasksTest < ActiveSupport::TestCase
   end
 
   describe 'delayed task' do
-    let(:task) { FactoryBot.create(:some_task) }
+    let(:task) { FactoryGirl.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
-      FactoryBot.build(:triggering).must_be :valid?
+      FactoryGirl.build(:triggering).must_be :valid?
     end
 
     it 'is validates future execution' do
-      triggering = FactoryBot.build(:triggering, :future)
+      triggering = FactoryGirl.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 = FactoryBot.build(:triggering, :recurring)
+      triggering = FactoryGirl.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 = FactoryBot.build(:triggering)
+    triggering = FactoryGirl.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.8
+  version: 0.10.9
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-16 00:00:00.000000000 Z
+date: 2018-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core
@@ -80,20 +80,6 @@ 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
@@ -246,6 +232,7 @@ files:
 - test/unit/cleaner_test.rb
 - test/unit/config/environment.rb
 - test/unit/dynflow_console_authorizer_test.rb
+- test/unit/lock_test.rb
 - test/unit/otp_manager_test.rb
 - test/unit/proxy_selector_test.rb
 - test/unit/recurring_logic_test.rb
@@ -292,6 +279,7 @@ test_files:
 - test/unit/cleaner_test.rb
 - test/unit/config/environment.rb
 - test/unit/dynflow_console_authorizer_test.rb
+- test/unit/lock_test.rb
 - test/unit/otp_manager_test.rb
 - test/unit/proxy_selector_test.rb
 - test/unit/recurring_logic_test.rb