foreman-tasks 0.15.2 → 0.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9daa93c0112f4c796a124787624ad95f01e241bcc2f80912560eb548cabc080d
-  data.tar.gz: 0f2577e225a712c6e5041cb9c5006ac5707bf6f36cde9d9525f5118557037249
+  metadata.gz: 6eeb338059e6663ed8fffe8dc6bee396a1eb96bae7a695c2f56eff9ac5e44763
+  data.tar.gz: 7b9d63c8663eeece3479d9c3628dd514d00e5ff00595ee66097cae917342bd29
 SHA512:
-  metadata.gz: 5aafc0509dedd3a27aeadbca202772220916f0e3ac20b35f28a8f25ece3190273b7c845f054d0be09ff1298a9cd244430cadf9294566a1cbfa570054a1a0de99
-  data.tar.gz: 25705ff172efabb0cbba2725c61571f113a017cc85c4a386825d151dac30799d3c7257b38640c7a5ee7f460bcd1baa3a6e2d7b221397c57debba3e62c2949a0f
+  metadata.gz: 8d46d737bcfe6f9aef1ce43c53de352e598653e3de2134d72d913cc63047d1867697c00b0aae5373c31d3664023167f332b277c0eaa352c80e62e03688a51271
+  data.tar.gz: 783a5b165f308ddb6571660598f19d85e5e20323be9a467851569f57ebf15f9bb1b4e35390d2f412510feb1a4c6f91269726800be8e18acf9fdf365785516a1f

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

@@ -39,12 +39,12 @@ module Actions
       end
 
       def restore_current_taxonomies
+        old_taxonomies = [Organization, Location].reduce({}) { |acc, taxonomy| acc.merge(taxonomy => taxonomy.current) }
         Organization.current = Organization.unscoped.find(action.input[:current_organization_id]) if action.input[:current_organization_id].present?
         Location.current = Location.unscoped.find(action.input[:current_location_id]) if action.input[:current_location_id].present?
         yield
       ensure
-        Organization.current = nil
-        Location.current = nil
+        old_taxonomies.each { |taxonomy, value| taxonomy.current = value }
       end
 
       def current_taxonomies?

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

@@ -39,10 +39,11 @@ module Actions
       end
 
       def restore_curent_user
+        old_user = User.current
         User.current = User.unscoped.find(action.input[:current_user_id]) if action.input[:current_user_id].present?
         yield
       ensure
-        User.current = nil
+        User.current = old_user
       end
     end
   end

data/foreman-tasks.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.authors     = ["Ivan Nečas"]
   s.email       = ["inecas@redhat.com"]
   s.homepage    = "https://github.com/theforeman/foreman-tasks"
-  s.summary     = "Foreman plugin for showing tasks information for resoruces and users"
+  s.summary     = "Foreman plugin for showing tasks information for resources and users"
   s.description = <<-DESC
 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

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '0.15.2'.freeze
+  VERSION = '0.15.3'.freeze
 end

data/test/lib/actions/middleware/keep_current_taxonomies_test.rb

@@ -11,6 +11,13 @@ module Actions
         def run; end
       end
 
+      class TestHookAction < Support::DummyDynflowAction
+        middleware.use KeepCurrentTaxonomies
+        execution_plan_hooks.use :null_hook, :on => :planning
+
+        def null_hook; end
+      end
+
       before do
         @org = mock('organization')
         @org.stubs(:id).returns(1)
@@ -62,6 +69,23 @@ module Actions
           @action = run_action(@action)
         end
       end
+
+      describe 'hook' do
+        test 'does not unset taxonomies before planning' do
+          Organization.stubs(:current).returns(@org)
+          Location.stubs(:current).returns(@loc)
+
+          Organization.stubs(:current=)
+          Location.stubs(:current=)
+
+          triggered = ForemanTasks.trigger(TestHookAction)
+          task = ForemanTasks::Task.where(:external_id => triggered.id).first
+          wait_for { task.reload.state == 'stopped' }
+
+          assert_equal(@org.id, task.execution_plan.entry_action.input['current_organization_id'])
+          assert_equal(@loc.id, task.execution_plan.entry_action.input['current_location_id'])
+        end
+      end
     end
   end
 end

data/test/lib/actions/middleware/keep_current_user_test.rb

@@ -11,11 +11,28 @@ module Actions
         def run; end
       end
 
+      class TestHookAction < Support::DummyDynflowAction
+        middleware.use KeepCurrentUser
+        execution_plan_hooks.use :null_hook, :on => :planning
+
+        def null_hook; end
+      end
+
       before do
         @user = mock('user')
         @user.stubs(:id).returns(1)
       end
 
+      describe 'hook' do
+        test 'does not reset current user before planning' do
+          triggered = ForemanTasks.trigger(TestHookAction)
+          task = ForemanTasks::Task.where(:external_id => triggered.id).first
+          wait_for { task.reload.state == 'stopped' }
+
+          assert_equal(User.current.id, task.execution_plan.entry_action.input['current_user_id'])
+        end
+      end
+
       describe 'plan' do
         test 'with current user set' do
           User.expects(:current).twice.returns(@user)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.3
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-30 00:00:00.000000000 Z
+date: 2019-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core
@@ -434,7 +434,7 @@ rubyforge_project:
 rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
-summary: Foreman plugin for showing tasks information for resoruces and users
+summary: Foreman plugin for showing tasks information for resources and users
 test_files:
 - test/controllers/api/recurring_logics_controller_test.rb
 - test/controllers/api/tasks_controller_test.rb