Improve specs and add test for error handling

Author: stephenbinns

lib/que/active_support/job_middleware.rb

@@ -18,7 +18,7 @@ def self.call(job)
           "que_job.worked",
           started,
           Process.clock_gettime(Process::CLOCK_MONOTONIC),
-          labels.merge(error: !!job.que_error.present?),
+          labels.merge(error: job.que_error.present?),
         )
       end
     end

spec/que/active_support/job_middleware_spec.rb

@@ -6,14 +6,7 @@
   require 'que/active_support/job_middleware'
 
   describe Que::ActiveSupport::JobMiddleware do
-    let(:job) do
-      Que::Job.new(
-        job_class: "Foo",
-        priority: 100,
-        queue: "foo_queue",
-        latency: 100,
-      )
-    end
+    let(:job) { Que::Job.new(**labels) }
 
     let(:labels) do
       {
@@ -24,9 +17,9 @@
       }
     end
 
-    it "records metrics" do
+    it "records metrics when job succeeds" do
       called = false
-      ::ActiveSupport::Notifications.subscribe("que_job.worked") do |message, started, finished, metric_labels|
+      subscriber = ::ActiveSupport::Notifications.subscribe("que_job.worked") do |message, started, finished, metric_labels|
         assert_equal "que_job.worked", message
         assert started != nil
         assert finished != nil
@@ -37,6 +30,24 @@
       Que::ActiveSupport::JobMiddleware.call(job) { }
 
       assert_equal true, called
+
+      ::ActiveSupport::Notifications.unsubscribe(subscriber)
+    end
+
+    it "records metrics when job fails" do
+      called = false
+      subscriber = ::ActiveSupport::Notifications.subscribe("que_job.worked") do |message, started, finished, metric_labels|
+        assert_equal "que_job.worked", message
+        assert started != nil
+        assert finished != nil
+        assert_equal labels.merge(error: true), metric_labels
+        called = true
+      end
+
+      Que::ActiveSupport::JobMiddleware.call(job) { job.que_error = "error" }
+
+      assert_equal true, called
+      ::ActiveSupport::Notifications.unsubscribe(subscriber)
     end
   end
 end

spec/spec_helper.rb

@@ -8,7 +8,7 @@
 # in some spec runs.
 if ENV['USE_RAILS'] == 'true'
   require 'active_record'
-  require 'active_support'
+  require 'active_support/notifications'
   require 'active_job'
 
   ActiveJob::Base.queue_adapter = :que