Passes result_format when automate workspace is not expected.

Dynamic dialog expects a workspace object.
ManageIQ · Oct 17, 2019 · bb0aabd · bb0aabd
1 parent 04efa94
commit bb0aabd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/app/models/custom_button.rb b/app/models/custom_button.rb
@@ -94,7 +94,7 @@ def applies_to=(other)
   end
 
   def invoke(target, source = nil)
-    args = resource_action.automate_queue_hash(target, {}, User.current_user)
+    args = resource_action.automate_queue_hash(target, {"result_format" => 'ignore'}, User.current_user)
 
     publish_event(source, target, args)
     MiqQueue.put(queue_opts(target, args))
@@ -142,7 +142,7 @@ def invoke_async(target, source = nil)
       :userid => User.current_user
     }
 
-    args = resource_action.automate_queue_hash(target, {}, User.current_user)
+    args = resource_action.automate_queue_hash(target, {"result_format" => 'ignore'}, User.current_user)
 
     publish_event(source, target, args)
     MiqTask.generic_action_with_callback(task_opts, queue_opts(target, args))

diff --git a/app/models/resource_action.rb b/app/models/resource_action.rb
@@ -30,7 +30,6 @@ def automate_queue_hash(target, override_attrs, user, open_url_task_id = nil)
     end
 
     attrs = (ae_attributes || {}).merge(override_attrs || {})
-    attrs["result_format"] = 'ignore'
 
     {
       :namespace        => ae_namespace,

diff --git a/spec/models/resource_action_spec.rb b/spec/models/resource_action_spec.rb
@@ -4,7 +4,7 @@
     let(:zone_name) { "default" }
     let(:ra) { FactoryBot.create(:resource_action) }
     let(:miq_server) { FactoryBot.create(:miq_server) }
-    let(:ae_attributes) { { "result_format" => "ignore"} }
+    let(:ae_attributes) { {} }
     let(:q_args) do
       {
         :namespace        => nil,
@@ -109,13 +109,17 @@
   end
 
   context "#automate_queue_hash" do
-    let(:button) { FactoryBot.create(:custom_button, :applies_to_class => "Vm") }
+    let(:button) { FactoryBot.create(:custom_button, :applies_to_class => "Vm", :options => {:open_url => true}) }
     let(:ra)     { FactoryBot.create(:resource_action, :resource => button) }
     let(:user)   { FactoryBot.create(:user_with_group) }
     let(:target) { FactoryBot.create(:vm_vmware) }
 
-    it "adds result_format" do
-      expect(ra.automate_queue_hash(target, {}, user)).to include(:attrs => {"result_format"=>"ignore"})
+    it "passes result_format" do
+      expect(ra.automate_queue_hash(target, {"result_format"=>"ignore"}, user)).to include(:attrs => {"result_format"=>"ignore"})
+    end
+
+    it "does not pass result_format by default" do
+      expect(ra.automate_queue_hash(target, {}, user)).not_to include(:attrs => {"result_format"=>"ignore"})
     end
   end
 end