Merge pull request #524 from agrare/fix_create_provision_request_user…

…_argument
ManageIQ · Mar 6, 2023 · 239602d · 239602d
2 parents fa30f6b + 074d95a
commit 239602d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/lib/miq_automation_engine/engine/miq_ae_method_service/miq_ae_service_methods.rb b/lib/miq_automation_engine/engine/miq_ae_method_service/miq_ae_service_methods.rb
@@ -155,7 +155,7 @@ def self.create_provision_request(*args)
       # Need to add the username into the array of params
       # TODO: This code should pass a real username, similar to how the web-service
       #      passes the name of the user that logged into the web-service.
-      args << User.lookup_by_userid("admin")
+      args.insert(1, User.lookup_by_userid("admin"))
       MiqAeServiceModelBase.wrap_results(MiqProvisionVirtWorkflow.from_ws(*args))
     end
 

diff --git a/spec/engine/miq_ae_method_service/miq_ae_service_methods_spec.rb b/spec/engine/miq_ae_method_service/miq_ae_service_methods_spec.rb
@@ -437,17 +437,22 @@ def category_create_script_kwargs
              :persist_state_hash => MiqAeEngine::StateVarHash.new,
              :ae_user            => user)
     end
-    let(:user) { double }
-    let(:miq_ae_service) { MiqAeMethodService::MiqAeService.new(workspace) }
+    let(:user)            { double }
+    let(:miq_ae_service)  { MiqAeMethodService::MiqAeService.new(workspace) }
+    let(:version)         { "1.1" }
+    let(:template_fields) { {"name" => "App"} }
+    let(:vm_fields)       { {'vm_name' => 'CRM_APP', 'request_type' => 'template'} }
+    let(:requester)       { {'owner_email' => 'admin@asd.com'} }
+    let(:tags)            { {'crm' => 'true'} }
     before do
       allow(User).to receive(:lookup_by_userid).and_return(user)
     end
 
     it "passes arguments correctly" do
-      expect(MiqProvisionVirtWorkflow).to receive(:from_ws).with('one', 'two', user).and_return(true)
+      expect(MiqProvisionVirtWorkflow).to receive(:from_ws).with(version, user, template_fields, vm_fields, requester, tags, nil, nil, nil).and_return(true)
       expect(MiqAeMethodService::MiqAeServiceModelBase).to receive(:wrap_results).and_return(true)
       allow(workspace).to receive(:disable_rbac)
-      miq_ae_service.execute(:create_provision_request, 'one', 'two')
+      miq_ae_service.execute(:create_provision_request, version, template_fields, vm_fields, requester, tags, nil, nil, nil)
     end
 
     it "passes array arguments correctly" do
@@ -465,7 +470,7 @@ def category_create_script_kwargs
     end
 
     it "passes nil argument correctly" do
-      expect(MiqProvisionVirtWorkflow).to receive(:from_ws).with(user).and_return(true)
+      expect(MiqProvisionVirtWorkflow).to receive(:from_ws).with(nil, user).and_return(true)
       expect(MiqAeMethodService::MiqAeServiceModelBase).to receive(:wrap_results).and_return(true)
       allow(workspace).to receive(:disable_rbac)
       miq_ae_service.execute(:create_provision_request)