Merge pull request airbnb#18 from gilbox/gil--on_error-args

goatslacker · web-flow · commit e65ff7cec3e2 · 2017-07-28T11:53:52.000-07:00
Pass hash into on_error
diff --git a/lib/hypernova/controller_helpers.rb b/lib/hypernova/controller_helpers.rb
@@ -88,7 +88,7 @@ def hypernova_batch_after
           result = @hypernova_batch.submit!
           on_success(result, hash)
         rescue StandardError => e
-          on_error(e)
+          on_error(e, nil, hash)
           result = @hypernova_batch.submit_fallback!
         end
       else
diff --git a/lib/hypernova/plugin_helper.rb b/lib/hypernova/plugin_helper.rb
@@ -47,8 +47,8 @@ def after_response(current_response, original_response)
     end
   end
 
-  def on_error(error, job = {})
-    Hypernova.plugins.each { |plugin| plugin.on_error(error, job) if plugin.respond_to?(:on_error) }
+  def on_error(error, job = nil, jobs_hash = nil)
+    Hypernova.plugins.each { |plugin| plugin.on_error(error, job, jobs_hash) if plugin.respond_to?(:on_error) }
   end
 
   def on_success(res, jobs_hash)
diff --git a/spec/batch_renderer_spec.rb b/spec/batch_renderer_spec.rb
@@ -1,5 +1,6 @@
 require "spec_helper"
 require "hypernova/batch_renderer"
+require "securerandom"
 
 describe Hypernova::BatchRenderer do
   # Do not override these variables
diff --git a/spec/controller_helpers_spec.rb b/spec/controller_helpers_spec.rb
@@ -109,7 +109,7 @@ def initialize
         allow(test).to receive(:will_send_request).and_raise(error)
         allow(test).to receive(:response).and_return(response)
 
-        expect(test).to receive(:on_error).with(error)
+        expect(test).to receive(:on_error).with(error, nil, hash_including('mordor.js'))
         expect(batch).to receive(:submit_fallback!)
 
         test.hypernova_render_support {}
diff --git a/spec/plugin_helper_spec.rb b/spec/plugin_helper_spec.rb
@@ -31,7 +31,7 @@ def get_view_data(name, data)
   describe "#on_error" do
     it "calls on_error for each plugin" do
       class Plugin
-        def on_error(error, job)
+        def on_error(error, job, jobs_hash)
         end
       end
 
@@ -40,9 +40,10 @@ def on_error(error, job)
 
       error = double("error")
       job = double("job")
+      jobs_hash = double("jobs")
 
-      expect(plugin).to receive(:on_error).with(error, job)
-      TestClass.new.on_error(error, job)
+      expect(plugin).to receive(:on_error).with(error, job, jobs_hash)
+      TestClass.new.on_error(error, job, jobs_hash)
     end
   end
 
diff --git a/spec/request_service_spec.rb b/spec/request_service_spec.rb
@@ -49,8 +49,8 @@
 
         it "calls on_error for each job where the response has an error with a new hash" do
           class Plugin
-            def on_error(error, job)
-              [error.message, job]
+            def on_error(error, job, jobs_hash)
+              [error.message, job, jobs_hash]
             end
           end
 
@@ -61,7 +61,7 @@ def on_error(error, job)
 
           allow(batch_renderer).to receive(:render).with(body)
 
-          expect(plugin).to receive(:on_error).with(error_from_response, jobs[1])
+          expect(plugin).to receive(:on_error).with(error_from_response, jobs[1], nil)
           request_service.render_batch(jobs)
         end
       end
