Merge pull request #17717 from bdunne/fix_class_name

Fix class name for queueing
ManageIQ · Jul 17, 2018 · 450a9a0 · 450a9a0
2 parents 3dc7d6d + 27c1dbd
commit 450a9a0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/app/models/service_template.rb b/app/models/service_template.rb
@@ -399,7 +399,7 @@ def provision_request(user, options = nil, request_options = nil)
 
   def queue_order(user_id, options, request_options)
     MiqQueue.submit_job(
-      :class_name  => name,
+      :class_name  => self.class.name,
       :instance_id => id,
       :method_name => "order",
       :args        => [user_id, options, request_options],

diff --git a/spec/models/service_template_spec.rb b/spec/models/service_template_spec.rb
@@ -844,6 +844,19 @@
       )
     end
 
+    it "#queue_order" do
+      EvmSpecHelper.local_miq_server
+
+      service_template.queue_order(user.id, {}, {})
+
+      expect(MiqQueue.first).to have_attributes(
+        :args        => [user.id, {}, {}],
+        :class_name  => "ServiceTemplate",
+        :instance_id => service_template.id,
+        :method_name => "order",
+      )
+    end
+
     it "successfully scheduled twice" do
       EvmSpecHelper.local_miq_server
       expect(resource_action_workflow).to receive(:validate_dialog).twice.and_return([])