foreman-tasks 0.8.6 → 0.9.0

data/test/controllers/api/recurring_logics_controller_test.rb

@@ -1,4 +1,4 @@
-require "foreman_tasks_test_helper"
+require 'foreman_tasks_test_helper'
 
 module ForemanRecurringLogic
   class Api::RecurringLogicControllerTest < ActionController::TestCase
@@ -22,7 +22,7 @@ module ForemanRecurringLogic
 
       describe 'GET /api/recurring_logics/:id' do
         it 'searches for recurring logic' do
-          get(:show, :id => @recurring_logic.id)
+          get :show, :id => @recurring_logic.id
           assert_response :success
           assert_template 'api/recurring_logics/show'
         end
@@ -30,7 +30,7 @@ module ForemanRecurringLogic
 
       describe 'POST /api/recurring_logics/:id/cancel' do
         it 'cancels recurring logic' do
-          post(:cancel, :id => @recurring_logic.id)
+          post :cancel, :id => @recurring_logic.id
           assert_response :success
           @recurring_logic.reload
           assert @recurring_logic.state == 'cancelled'
@@ -39,5 +39,3 @@ module ForemanRecurringLogic
     end
   end
 end
-
-

data/test/controllers/api/tasks_controller_test.rb

@@ -1,4 +1,4 @@
-require "foreman_tasks_test_helper"
+require 'foreman_tasks_test_helper'
 
 module ForemanTasks
   class Api::TasksControllerTest < ActionController::TestCase
@@ -14,7 +14,7 @@ module ForemanTasks
       describe 'GET /api/tasks/show' do
         it 'searches for task' do
           task = FactoryGirl.create(:dynflow_task, :user_create_task)
-          get(:show, :id => task.id)
+          get :show, :id => task.id
           assert_response :success
           assert_template 'api/tasks/show'
         end
@@ -37,18 +37,16 @@ module ForemanTasks
           task.result.must_equal 'pending'
 
           callback = Support::DummyProxyAction.proxy.log[:trigger_task].first[1][:callback]
-          post(:callback, 'callback' => callback, 'data' => {'result' => 'success'})
+          post :callback, 'callback' => callback, 'data' => { 'result' => 'success' }
           triggered.finished.wait(5)
 
           task.reload
           task.state.must_equal 'stopped'
           task.result.must_equal 'success'
-          task.main_action.output['proxy_task_id'].must_equal "123"
-          task.main_action.output['proxy_output'].must_equal({ 'result' => 'success' })
+          task.main_action.output['proxy_task_id'].must_equal '123'
+          task.main_action.output['proxy_output'].must_equal('result' => 'success')
         end
       end
     end
   end
 end
-
-

data/test/factories/task_factory.rb

@@ -14,12 +14,12 @@ FactoryGirl.define do
     end
 
     factory :dynflow_task, :class => ForemanTasks::Task::DynflowTask do
-      label "Support::DummyDynflowAction"
-      type "ForemanTasks::Task::DynflowTask"
-      started_at "2014-10-01 11:15:55"
-      ended_at "2014-10-01 11:15:57"
-      state "stopped"
-      result "success"
+      label 'Support::DummyDynflowAction'
+      type 'ForemanTasks::Task::DynflowTask'
+      started_at '2014-10-01 11:15:55'
+      ended_at '2014-10-01 11:15:57'
+      state 'stopped'
+      result 'success'
       parent_task_id nil
 
       transient do
@@ -37,11 +37,11 @@ FactoryGirl.define do
       end
 
       trait :user_create_task do
-        label "Actions::User::Create"
+        label 'Actions::User::Create'
       end
 
       trait :product_create_task do
-        label "Actions::Katello::Product::Create"
+        label 'Actions::Katello::Product::Create'
       end
 
       trait :inconsistent_dynflow_task do

data/test/factories/triggering_factory.rb

@@ -3,7 +3,7 @@ FactoryGirl.define do
     mode :immediate
 
     trait :future do
-      time = Time.now
+      time = Time.zone.now
       mode :future
       start_at time
       start_at_raw(time.strftime(ForemanTasks::Triggering::TIME_FORMAT))
@@ -18,8 +18,7 @@ FactoryGirl.define do
 
     trait :end_time_limited do
       end_time_limited true
-      end_time(Time.now + 60)
+      end_time(Time.zone.now + 60)
     end
   end
-
 end

data/test/helpers/foreman_tasks/tasks_helper_test.rb

@@ -1,13 +1,13 @@
-require "foreman_tasks_test_helper"
+require 'foreman_tasks_test_helper'
 
 module ForemanTasks
   class TasksHelperTest < ActionView::TestCase
     describe 'when formatting simple input' do
       before do
         @task = FactoryGirl.build(:dynflow_task, :user_create_task)
-        humanized = { :humanized_name => "Create", :humanized_input => [[:user, {:text => "user 'Anonymous Admin'", :link => nil}]] }
+        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"})
+        @task.stubs(:input).returns('user' => { 'id' => 1, 'name' => 'Anonymous Admin' }, 'locale' => 'en')
       end
 
       it 'formats the task input properly' do
@@ -16,21 +16,21 @@ module ForemanTasks
       end
 
       it 'displays the dash if task is nil' do
-	format_task_input(nil, true).must_equal('-')
+        format_task_input(nil, true).must_equal('-')
       end
     end
 
     describe 'when formatting input' do
       before do
         @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" }]]}
+        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)
-        input = {"product"=>{"id"=>3, "name"=>"product-2", "label"=>"product-2", "cp_id"=>nil},
-                 "provider"=>{"id"=>3, "name"=>"Anonymous"},
-                 "organization"=>{"id"=>3, "name"=>"test-0", "label"=>"test-0"},
-                 "cp_id"=>"1412251033866",
-                 "locale"=>"en"}
+        input = { 'product' => { 'id' => 3, 'name' => 'product-2', 'label' => 'product-2', 'cp_id' => nil },
+                  'provider' => { 'id' => 3, 'name' => 'Anonymous' },
+                  'organization' => { 'id' => 3, 'name' => 'test-0', 'label' => 'test-0' },
+                  'cp_id' => '1412251033866',
+                  'locale' => 'en' }
         @task.stubs(:input).returns(input)
       end
 

data/test/support/dummy_proxy_action.rb

@@ -1,6 +1,5 @@
 module Support
   class DummyProxyAction < Actions::ProxyAction
-
     class DummyProxy
       attr_reader :log, :task_triggered
 
@@ -12,7 +11,7 @@ module Support
       def trigger_task(*args)
         @log[:trigger_task] << args
         @task_triggered.success(true)
-        {"task_id" => "123"}
+        { 'task_id' => '123' }
       end
 
       def cancel_task(*args)
@@ -40,8 +39,8 @@ module Support
       ForemanTasks::Task::DynflowTask.new.tap { |task| task.id = '123' }
     end
 
-    def self.proxy
-      @proxy
+    class << self
+      attr_reader :proxy
     end
 
     def self.reset

data/test/unit/actions/action_with_sub_plans_test.rb

@@ -1,7 +1,7 @@
-require "foreman_tasks_test_helper"
+require 'foreman_tasks_test_helper'
 
 module ForemanTasks
-  class ActionWithSubPlansTest <  ActiveSupport::TestCase
+  class ActionWithSubPlansTest < ActiveSupport::TestCase
     self.use_transactional_fixtures = false
 
     before do
@@ -30,8 +30,8 @@ module ForemanTasks
         action_subject(user)
         plan_self(user_id: user.id)
       end
-      def run
-      end
+
+      def run; end
     end
 
     describe Actions::ActionWithSubPlans do
@@ -43,7 +43,7 @@ module ForemanTasks
         ForemanTasks::Task.where(:external_id => triggered.id).first
       end
 
-      specify "the sub-plan stores the information about its parent" do
+      specify 'the sub-plan stores the information about its parent' do
         task.sub_tasks.size.must_equal 1
         task.sub_tasks.first.label.must_equal ChildAction.name
       end
@@ -53,6 +53,5 @@ module ForemanTasks
         assert(child_task.locks.any? { |lock| lock.name == 'write' }, "it's locks don't conflict with parent's")
       end
     end
-
   end
 end

data/test/unit/actions/proxy_action_test.rb

@@ -1,8 +1,7 @@
-require "foreman_tasks_test_helper"
+require 'foreman_tasks_test_helper'
 
 module ForemanTasks
   class ProxyActionTest <  ActiveSupport::TestCase
-
     describe Actions::ProxyAction do
       include ::Dynflow::Testing
 
@@ -23,7 +22,7 @@ module ForemanTasks
                              'connection_options' =>
                                  { 'retry_interval' => 15, 'retry_count' => 4, 'timeout' => 60 },
                              'proxy_url' => 'proxy.example.com',
-                             'proxy_action_name'=>'Proxy::DummyAction',
+                             'proxy_action_name' => 'Proxy::DummyAction',
                              'callback' => { 'task_id' => '123', 'step_id' => @action.run_step_id } }]
           proxy_call.must_equal(expected_call)
         end
@@ -66,14 +65,14 @@ module ForemanTasks
 
       it 'saves the data comming from the proxy to the output and finishes' do
         action = run_action(@action, ::Actions::ProxyAction::CallbackData.new('result' => 'success'))
-        action.output[:proxy_output].must_equal({'result' => 'success'})
+        action.output[:proxy_output].must_equal('result' => 'success')
       end
 
       it 'handles connection errors' do
         action = create_and_plan_action(Support::DummyProxyAction,
                                         Support::DummyProxyAction.proxy,
-                                         'Proxy::DummyAction',
-                                        { :foo => 'bar' })
+                                        'Proxy::DummyAction',
+                                        :foo => 'bar')
         run_stubbed_action = lambda do |lambda_action|
           run_action lambda_action do |block_action|
             block_action.expects(:trigger_proxy_task).raises(Errno::ECONNREFUSED.new('Connection refused'))
@@ -87,8 +86,6 @@ module ForemanTasks
         proc { action = run_stubbed_action.call action }.must_raise(Errno::ECONNREFUSED)
         action.state.must_equal :error
       end
-
     end
-
   end
 end

data/test/unit/cleaner_test.rb

@@ -8,7 +8,7 @@ class TasksTest < ActiveSupport::TestCase
       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.now
+                           task.started_at = task.ended_at = Time.zone.now
                            task.save
                          end,
                          FactoryGirl.create(:dynflow_task, :product_create_task)]
@@ -16,18 +16,18 @@ class TasksTest < ActiveSupport::TestCase
       ForemanTasks::Task.where(id: tasks_to_delete).must_be_empty
       ForemanTasks::Task.where(id: tasks_to_keep).order(:id).map(&:id).must_equal tasks_to_keep.map(&:id).sort
 
-      ForemanTasks.dynflow.world.persistence.
-          find_execution_plans(filters: {'uuid' => tasks_to_delete.map(&:external_id)}).size.must_equal 0
+      ForemanTasks.dynflow.world.persistence
+                  .find_execution_plans(filters: { 'uuid' => tasks_to_delete.map(&:external_id) }).size.must_equal 0
 
-      ForemanTasks.dynflow.world.persistence.
-          find_execution_plans(filters: {'uuid' => tasks_to_keep.map(&:external_id)}).size.must_equal tasks_to_keep.size
+      ForemanTasks.dynflow.world.persistence
+                  .find_execution_plans(filters: { 'uuid' => tasks_to_keep.map(&:external_id) }).size.must_equal tasks_to_keep.size
     end
 
     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|
-                           task.started_at = task.ended_at = Time.now
+                           task.started_at = task.ended_at = Time.zone.now
                            task.save
                          end]
 
@@ -43,7 +43,7 @@ class TasksTest < ActiveSupport::TestCase
                          FactoryGirl.create(:dynflow_task, :product_create_task)]
 
       tasks_to_keep   = [FactoryGirl.create(:dynflow_task, :user_create_task) do |task|
-                           task.started_at = task.ended_at = Time.now
+                           task.started_at = task.ended_at = Time.zone.now
                            task.save
                          end]
       cleaner.delete
@@ -57,18 +57,17 @@ class TasksTest < ActiveSupport::TestCase
       end
     end
 
-    describe "default behaviour" do
-      it "searches for the actions that have the cleanup_after defined" do
+    describe 'default behaviour' do
+      it 'searches for the actions that have the cleanup_after defined' do
         ForemanTasks::Cleaner.stubs(:cleanup_settings => {})
         ForemanTasks::Cleaner.actions_with_default_cleanup[ActionWithCleanup].must_equal '15d'
       end
 
-      it "searches for the actions that have the cleanup_after defined" do
+      it 'searches for the actions that have the cleanup_after defined' do
         ForemanTasks::Cleaner.stubs(:cleanup_settings =>
-                                     { :actions => [{:name => ActionWithCleanup.name, :after => '5d'}]})
+                                     { :actions => [{ :name => ActionWithCleanup.name, :after => '5d' }] })
         ForemanTasks::Cleaner.actions_with_default_cleanup[ActionWithCleanup].must_equal '5d'
       end
-
     end
   end
 end

data/test/unit/dynflow_console_authorizer_test.rb

@@ -1,7 +1,7 @@
-require "foreman_tasks_test_helper"
+require 'foreman_tasks_test_helper'
 
 module ForemanTasks
-  class DynflowConsoleAuthorizerTest <  ActiveSupport::TestCase
+  class DynflowConsoleAuthorizerTest < ActiveSupport::TestCase
     include Rack::Test::Methods
 
     before do
@@ -18,8 +18,8 @@ module ForemanTasks
     def dynflow_console_authorized?(task = nil)
       dynflow_path = '/'
       dynflow_path += task.external_id.to_s if task
-      dynflow_rack_env = { "rack.session" => { "user" => user.id, "expires_at" => Time.now + 100 },
-                           "PATH_INFO"     => dynflow_path}.with_indifferent_access
+      dynflow_rack_env = { 'rack.session' => { 'user' => user.id, 'expires_at' => Time.zone.now + 100 },
+                           'PATH_INFO' => dynflow_path }.with_indifferent_access
       ForemanTasks::Dynflow::ConsoleAuthorizer.new(dynflow_rack_env).allow?
     end
 

data/test/unit/proxy_selector_test.rb

@@ -1,4 +1,4 @@
-require "foreman_tasks_test_helper"
+require 'foreman_tasks_test_helper'
 
 describe ForemanTasks::ProxySelector do
   let(:proxy_selector) { ForemanTasks::ProxySelector.new }
@@ -10,8 +10,8 @@ describe ForemanTasks::ProxySelector do
   describe '#select_by_jobs_count' do
     it 'load balances' do
       count = 3
-      ProxyAPI::ForemanDynflow::DynflowProxy.any_instance.expects(:tasks_count).raises.
-          then.times(count - 1).returns(0)
+      ProxyAPI::ForemanDynflow::DynflowProxy.any_instance.expects(:tasks_count).raises
+                                            .then.times(count - 1).returns(0)
       proxies = FactoryGirl.create_list(:smart_proxy, count)
 
       available = proxies.reduce([]) do |found, _|

data/test/unit/recurring_logic_test.rb

@@ -1,11 +1,9 @@
 require 'foreman_tasks_test_helper'
 
 class RecurringLogicsTest < ActiveSupport::TestCase
-
   describe 'generating times' do
-
     it 'assembles cronline' do
-      hash = { }
+      hash = {}
       ForemanTasks::RecurringLogic.assemble_cronline(hash).must_equal '* * * * *'
       hash.update :minutes => '*'
       ForemanTasks::RecurringLogic.assemble_cronline(hash).must_equal '* * * * *'
@@ -13,27 +11,31 @@ class RecurringLogicsTest < ActiveSupport::TestCase
       ForemanTasks::RecurringLogic.assemble_cronline(hash).must_equal '* 0,12 * * *'
       hash.update :days => '*/2'
       ForemanTasks::RecurringLogic.assemble_cronline(hash).must_equal '* 0,12 */2 * *'
-      hash.update :months  => '12'
+      hash.update :months => '12'
       ForemanTasks::RecurringLogic.assemble_cronline(hash).must_equal '* 0,12 */2 12 *'
       hash.update :days_of_week => '1,2,3,4,5,6,7'
       ForemanTasks::RecurringLogic.assemble_cronline(hash).must_equal '* 0,12 */2 12 1,2,3,4,5,6,7'
     end
 
     it 'generates correct times' do
-      year, month, day, hour, minute = [2015, 9, 29, 15, 0]
-      reference_time = Time.new(year, month, day, hour, minute)
+      year = 2015
+      month = 9
+      day = 29
+      hour = 15
+      minute = 0
+      reference_time = Time.utc(year, month, day, hour, minute)
       parser = ForemanTasks::RecurringLogic.new_from_cronline('* * * * *')
-      parser.next_occurrence_time(reference_time).must_equal Time.new(year, month, day, hour, minute + 1)
+      parser.next_occurrence_time(reference_time).must_equal Time.utc(year, month, day, hour, minute + 1)
       parser = ForemanTasks::RecurringLogic.new_from_cronline('*/2 * * * *')
-      parser.next_occurrence_time(reference_time).must_equal Time.new(year, month, day, hour, minute + 2)
+      parser.next_occurrence_time(reference_time).must_equal Time.utc(year, month, day, hour, minute + 2)
       parser = ForemanTasks::RecurringLogic.new_from_cronline('*/2 18,19 * * *')
-      parser.next_occurrence_time(reference_time).must_equal Time.new(year, month, day, 18)
+      parser.next_occurrence_time(reference_time).must_equal Time.utc(year, month, day, 18)
       parser = ForemanTasks::RecurringLogic.new_from_cronline('*/2 18,19 10 * *')
-      parser.next_occurrence_time(reference_time).must_equal Time.new(year, month + 1, 10, 18, minute)
+      parser.next_occurrence_time(reference_time).must_equal Time.utc(year, month + 1, 10, 18, minute)
       parser = ForemanTasks::RecurringLogic.new_from_cronline('*/2 18,19 10 11,12 *')
-      parser.next_occurrence_time(reference_time).must_equal Time.new(year, 11, 10, 18, 0)
+      parser.next_occurrence_time(reference_time).must_equal Time.utc(year, 11, 10, 18, 0)
       parser = ForemanTasks::RecurringLogic.new_from_cronline('* * * * 1')
-      parser.next_occurrence_time(reference_time).must_equal Time.new(year, month + 1, 5)
+      parser.next_occurrence_time(reference_time).must_equal Time.utc(year, month + 1, 5)
     end
 
     it 'creates correct cronline hash' do
@@ -60,7 +62,7 @@ class RecurringLogicsTest < ActiveSupport::TestCase
       parser.expects(:iteration).twice.returns(5)
       parser.wont_be :can_continue?
       parser.max_iteration = nil
-      time = Time.new(2015, 9, 29, 15, 0)
+      time = Time.utc(2015, 9, 29, 15, 0)
       parser.end_time = time
       parser.wont_be :can_continue?, time
       parser.end_time = time + 120
@@ -72,11 +74,11 @@ class RecurringLogicsTest < ActiveSupport::TestCase
     it 'generates delay options' do
       parser = ForemanTasks::RecurringLogic.new_from_cronline('* * * * *')
       parser.stubs(:id).returns(1)
-      reference_time = Time.new(2015, 9, 29, 15)
+      reference_time = Time.utc(2015, 9, 29, 15)
       expected_hash = { :start_at => reference_time + 60, :start_before => nil, :recurring_logic_id => parser.id }
       parser.generate_delay_options(reference_time).must_equal expected_hash
       parser.generate_delay_options(reference_time, 'start_before' => reference_time + 3600)
-        .must_equal expected_hash.merge(:start_before => reference_time + 3600)
+            .must_equal expected_hash.merge(:start_before => reference_time + 3600)
     end
 
     it 'can start' do
@@ -100,7 +102,7 @@ class RecurringLogicsTest < ActiveSupport::TestCase
       end
 
       it 'is invalid when end time in past' do
-        logic.end_time = (Time.now - 120)
+        logic.end_time = (Time.zone.now - 120)
         logic.wont_be :valid?
       end
 
@@ -110,7 +112,7 @@ class RecurringLogicsTest < ActiveSupport::TestCase
       end
 
       it 'is valid when in active state' do
-        logic.end_time = (Time.now - 120)
+        logic.end_time = (Time.zone.now - 120)
         logic.wont_be :valid?
         logic.state = 'active'
         logic.must_be :valid?