foreman-tasks 0.8.6 → 0.9.0

data/test/unit/task_groups_test.rb

@@ -1,4 +1,4 @@
-require "foreman_tasks_test_helper"
+require 'foreman_tasks_test_helper'
 
 module ForemanTasks
   class TaskGroupsTest < ActiveSupport::TestCase
@@ -15,7 +15,6 @@ module ForemanTasks
     end
 
     class ParentAction < Actions::ActionWithSubPlans
-
       middleware.use ::Actions::Middleware::InheritTaskGroups
 
       def plan(count)
@@ -25,9 +24,9 @@ module ForemanTasks
         task.add_missing_task_groups(task_group)
         plan_self :count => count
       end
-      
+
       def create_sub_plans
-        input[:count].times.map { |i| trigger InheritingChildAction, i + 2 }
+        Array.new(input[:count]) { |i| trigger InheritingChildAction, i + 2 }
       end
     end
 

data/test/unit/task_test.rb

@@ -5,15 +5,15 @@ class TasksTest < ActiveSupport::TestCase
     before { @original_current_user = User.current }
     after  { User.current = @original_current_user }
 
-    test "can search the tasks by current_user" do
+    test 'can search the tasks by current_user' do
       user_one = FactoryGirl.create(:user)
       user_two = FactoryGirl.create(:user)
 
       task_one = FactoryGirl.create(:some_task, :set_owner => user_one)
-      task_two = FactoryGirl.create(:some_task, :set_owner => user_two)
+      FactoryGirl.create(:some_task, :set_owner => user_two)
 
       User.current = user_one
-      assert_equal [task_one], ForemanTasks::Task.search_for("owner.id = current_user")
+      assert_equal [task_one], ForemanTasks::Task.search_for('owner.id = current_user')
     end
   end
 
@@ -30,13 +30,12 @@ class TasksTest < ActiveSupport::TestCase
       User.current = user
       task = FactoryGirl.create(:dynflow_task)
 
-      auth       = Authorizer.new(user)
+      auth = Authorizer.new(user)
       assert auth.can?(permission.name.to_sym, task)
     end
   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) }
 
@@ -52,4 +51,72 @@ class TasksTest < ActiveSupport::TestCase
       inconsistent_task.reload.state.must_equal 'planned'
     end
   end
+
+  describe 'subtask count querying' do
+    let(:result_base) do
+      {
+        :error     => 0,
+        :warning   => 0,
+        :total     => 0,
+        :success   => 0,
+        :cancelled => 0,
+        :pending   => 0
+      }
+    end
+    let(:task) { FactoryGirl.create(:dynflow_task) }
+
+    describe 'without sub tasks' do
+      it 'calculates the progress report correctly' do
+        task.sub_tasks_counts.must_equal result_base
+      end
+    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 } }
+      before { task.sub_tasks = [success, failed] }
+
+      it 'calculate the progress report correctly' do
+        expected_result = result_base.merge(:success => 1, :error => 1, :total => 2)
+        task.sub_tasks_counts.must_equal expected_result
+      end
+
+      it 'calculates the progress report correctly when using batch planning' do
+        result_base = result_base.merge(:success => 1, :error => 1, :total => 25)
+        fake_action = OpenStruct.new(:total_count => 25)
+        task.stubs(:main_action).returns(fake_action)
+
+        task.state = 'stopped'
+        expected_result = result_base.merge(:cancelled => 23)
+        task.sub_tasks_counts.must_equal expected_result
+
+        task.state = 'pending'
+        expected_result = result_base.merge(:pending => 23)
+        task.sub_tasks_counts.must_equal expected_result
+      end
+    end
+  end
+
+  describe 'recurring task' do
+    let(:logic) { FactoryGirl.build(:recurring_logic) }
+    let(:task) { FactoryGirl.create(:some_task) }
+
+    it 'can indicate it is recurring' do
+      refute task.recurring?
+      task.add_missing_task_groups(logic.task_group)
+      assert task.recurring?
+    end
+  end
+
+  describe 'delayed task' do
+    let(:task) { FactoryGirl.create(:some_task) }
+
+    it 'can indicate it is delayed' do
+      refute task.delayed?
+      task.execution_type.must_equal 'Immediate'
+      task.start_at = Time.now.utc + 100
+      assert task.delayed?
+      task.execution_type.must_equal 'Delayed'
+    end
+  end
 end

data/test/unit/triggering_test.rb

@@ -1,7 +1,6 @@
 require 'foreman_tasks_test_helper'
 
 class TriggeringTest < ActiveSupport::TestCase
-
   describe 'validation' do
     it 'is valid when immediate' do
       FactoryGirl.build(:triggering).must_be :valid?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.9.0
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.17
+        version: 0.8.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.17
+        version: 0.8.22
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,8 @@ extra_rdoc_files:
 - LICENSE
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".tx/config"
 - Gemfile
 - LICENSE
@@ -118,7 +120,6 @@ files:
 - app/assets/stylesheets/foreman_tasks/trigger_form.css
 - app/controllers/foreman_tasks/api/recurring_logics_controller.rb
 - app/controllers/foreman_tasks/api/tasks_controller.rb
-- app/controllers/foreman_tasks/concerns/environments_extension.rb
 - app/controllers/foreman_tasks/concerns/hosts_controller_extension.rb
 - app/controllers/foreman_tasks/concerns/parameters/triggering.rb
 - app/controllers/foreman_tasks/recurring_logics_controller.rb
@@ -267,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Foreman plugin for showing tasks information for resoruces and users

data/app/controllers/foreman_tasks/concerns/environments_extension.rb

@@ -1,24 +0,0 @@
-module ForemanTasks
-  module Concerns
-    module EnvironmentsExtension
-      extend ActiveSupport::Concern
-
-      included do
-        alias_method_chain :obsolete_and_new, :dynflow
-      end
-
-      def obsolete_and_new_with_dynflow
-        task = ForemanTasks.async_task(::Actions::Foreman::Puppetclass::Import,
-                                       params)
-
-        notice _("Added import task to queue, it will be run shortly")
-        rescue ::Foreman::Exception => e
-          error _("Failed to add task to queue: %s") % e.to_s
-        ensure
-          redirect_to :controller => controller_path
-        end
-
-    end
-  end
-end
-