Extract queue message delivery into helper method

ManageIQ · Dec 19, 2017 · c450468 · c450468
1 parent b9309e7
commit c450468
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/spec/models/ext_management_system_spec.rb b/spec/models/ext_management_system_spec.rb
@@ -424,9 +424,7 @@
       it "returns a task" do
         task_id = ems.destroy_queue
 
-        queue_message = MiqQueue.first
-        status, message, result = queue_message.deliver
-        queue_message.delivered(status, message, result)
+        deliver_queue_message
 
         task = MiqTask.find(task_id)
         expect(task.state).to  eq("Finished")
@@ -439,9 +437,7 @@
 
         expect(MiqQueue.count).to eq(1)
 
-        queue_message = MiqQueue.first
-        status, message, result = queue_message.deliver
-        queue_message.delivered(status, message, result)
+        deliver_queue_message
 
         expect(MiqQueue.count).to eq(1)
         expect(MiqQueue.last.deliver_on).to_not be_nil
@@ -451,17 +447,13 @@
         refresh_worker = FactoryGirl.create(:miq_ems_refresh_worker, :queue_name => ems.queue_name, :status => "started", :miq_server => server)
         ems.destroy_queue
 
-        queue_message = MiqQueue.first
-        status, message, result = queue_message.deliver
-        queue_message.delivered(status, message, result)
+        deliver_queue_message
 
         expect(ExtManagementSystem.count).to eq(1)
 
         refresh_worker.destroy
 
-        queue_message = MiqQueue.first
-        status, message, result = queue_message.deliver
-        queue_message.delivered(status, message, result)
+        deliver_queue_message
 
         expect(ExtManagementSystem.count).to eq(0)
       end
@@ -478,6 +470,11 @@
         expect(MiqQueue.pluck(:instance_id)).to include(ems.id, child_manager.id)
       end
     end
+
+    def deliver_queue_message(queue_message = MiqQueue.first)
+      status, message, result = queue_message.deliver
+      queue_message.delivered(status, message, result)
+    end
   end
 
   context "virtual column :supports_block_storage" do