exception_handling 2.2.1 → 2.3.0.pre.1

data/test/unit/exception_handling_test.rb

@@ -1,4 +1,6 @@
-require File.expand_path('../../test_helper',  __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('../test_helper',  __dir__)
 require_test_helper 'controller_helpers'
 require_test_helper 'exception_helpers'
 
@@ -18,26 +20,26 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
     # don't let these out!
   end
 
-  def custom_data_callback_returns_nil_message_exception(data)
+  def custom_data_callback_returns_nil_message_exception(_data)
     raise_exception_with_nil_message
   end
 
-  def log_error_callback(data, ex, treat_like_warning, honeybadger_status)
+  def log_error_callback(_data, _ex, _treat_like_warning, _honeybadger_status)
     @fail_count += 1
   end
 
-  def log_error_callback_config(data, ex, treat_like_warning, honeybadger_status)
+  def log_error_callback_config(data, _ex, treat_like_warning, honeybadger_status)
     @callback_data = data
     @treat_like_warning = treat_like_warning
     @fail_count += 1
     @honeybadger_status = honeybadger_status
   end
 
-  def log_error_callback_with_failure(data, ex)
+  def log_error_callback_with_failure(_data, _ex)
     raise "this should be rescued"
   end
 
-  def log_error_callback_returns_nil_message_exception(data, ex)
+  def log_error_callback_returns_nil_message_exception(_data, _ex)
     raise_exception_with_nil_message
   end
 
@@ -56,7 +58,7 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
       attr_accessor :callback_block
       attr_accessor :errback_block
 
-      def resolve(hostname)
+      def resolve(_hostname)
         self
       end
 
@@ -101,31 +103,18 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
   class SmtpClientErrbackStub < SmtpClientStub
   end
 
-  context "with honeybadger notify stubbed" do
+  context "with warn and honeybadger notify stubbed" do
     setup do
+      stub(ExceptionHandling).warn(anything)
       stub(Honeybadger).notify(anything)
     end
 
     context "#log_error" do
-      setup do
-        ExceptionHandling.mailer_send_enabled = true
-      end
-
-      should "take in additional key word args as logging context and pass them to the logger" do
+      should "take in additional keyword args as logging context and pass them to the logger" do
         ExceptionHandling.log_error('This is an Error', 'This is the prefix context', service_name: 'exception_handling')
         assert_match(/This is an Error/, logged_excluding_reload_filter.last[:message])
         assert_not_empty logged_excluding_reload_filter.last[:context]
-        assert_equal logged_excluding_reload_filter.last[:context], { service_name: 'exception_handling' }
-      end
-
-      should "log the info and not raise another exception when sending email fails" do
-        9.times { ExceptionHandling.log_error('SomeError', 'Error Context') }
-        mock(ExceptionHandling::Mailer).exception_notification(anything, anything, anything) { raise 'An Error' }
-        mock(ExceptionHandling.logger) do |logger|
-          logger.info(/ExceptionHandling.log_error_email rescued exception while logging StandardError: SomeError/, anything)
-        end
-        stub($stderr).puts
-        ExceptionHandling.log_error('SomeError', 'Error Context')
+        assert_equal logged_excluding_reload_filter.last[:context], service_name: 'exception_handling'
       end
     end
 
@@ -141,7 +130,7 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
         ExceptionHandling.log_warning('This is a Warning', service_name: 'exception_handling')
         assert_match(/This is a Warning/, logged_excluding_reload_filter.last[:message])
         assert_not_empty logged_excluding_reload_filter.last[:context]
-        assert_equal logged_excluding_reload_filter.last[:context], { service_name: 'exception_handling' }
+        assert_equal logged_excluding_reload_filter.last[:context], service_name: 'exception_handling'
       end
     end
 
@@ -150,7 +139,7 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
         ExceptionHandling.log_warning('This is an Info', service_name: 'exception_handling')
         assert_match(/This is an Info/, logged_excluding_reload_filter.last[:message])
         assert_not_empty logged_excluding_reload_filter.last[:context]
-        assert_equal logged_excluding_reload_filter.last[:context], { service_name: 'exception_handling' }
+        assert_equal logged_excluding_reload_filter.last[:context], service_name: 'exception_handling'
       end
     end
 
@@ -159,48 +148,60 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
         ExceptionHandling.log_warning('This is a Debug', service_name: 'exception_handling')
         assert_match(/This is a Debug/, logged_excluding_reload_filter.last[:message])
         assert_not_empty logged_excluding_reload_filter.last[:context]
-        assert_equal logged_excluding_reload_filter.last[:context], { service_name: 'exception_handling' }
+        assert_equal logged_excluding_reload_filter.last[:context], service_name: 'exception_handling'
       end
     end
 
-    context "configuration" do
+    context "configuration with custom_data_hook or post_log_error_hook" do
+      teardown do
+        ExceptionHandling.custom_data_hook = nil
+        ExceptionHandling.post_log_error_hook = nil
+      end
+
       should "support a custom_data_hook" do
+        capture_notifications
+
         ExceptionHandling.custom_data_hook = method(:append_organization_info_config)
-        ExceptionHandling.ensure_safe("mooo") { raise "Some BS" }
-        assert_match(/Invoca Engineering Dept./, ActionMailer::Base.deliveries[-1].body.to_s)
-        ExceptionHandling.custom_data_hook = nil
+        ExceptionHandling.ensure_safe("context") { raise "Some Exception" }
+
+        assert_match(/Invoca Engineering Dept./, sent_notifications.last.enhanced_data['user_details'].to_s)
       end
 
-      should "support a log_error hook, and pass exception data, treat like warning, and logged_to_honeybadger to it" do
-        begin
-          @fail_count = 0
-          @honeybadger_status = nil
-          ExceptionHandling.post_log_error_hook = method(:log_error_callback_config)
-          mock(Honeybadger).notify.with_any_args { '06220c5a-b471-41e5-baeb-de247da45a56' }
-          ExceptionHandling.ensure_safe("mooo") { raise "Some BS" }
-          assert_equal 1, @fail_count
-          assert_equal false, @treat_like_warning
-          assert_equal :success, @honeybadger_status
-        ensure
-          ExceptionHandling.post_log_error_hook = nil
-        end
+      should "support a log_error hook, and pass exception_data, treat_like_warning, and logged_to_honeybadger to it" do
+        @fail_count = 0
+        @honeybadger_status = nil
+        ExceptionHandling.post_log_error_hook = method(:log_error_callback_config)
+
+        notify_args = []
+        mock(Honeybadger).notify.with_any_args { |info| notify_args << info; '06220c5a-b471-41e5-baeb-de247da45a56' }
+        ExceptionHandling.ensure_safe("context") { raise "Some Exception" }
+        assert_equal 1, @fail_count
+        assert_equal false, @treat_like_warning
+        assert_equal :success, @honeybadger_status
 
         assert_equal "this is used by a test", @callback_data["notes"]
-        assert_match(/this is used by a test/, ActionMailer::Base.deliveries[-1].body.to_s)
+        assert_equal 1, notify_args.size, notify_args.inspect
+        assert_match(/this is used by a test/, notify_args.last[:context].to_s)
       end
 
-      should "plumb treat like warning and logged_to_honeybadger to log error hook" do
-        begin
-          @fail_count = 0
-          @honeybadger_status = nil
-          ExceptionHandling.post_log_error_hook = method(:log_error_callback_config)
-          ExceptionHandling.log_error(StandardError.new("Some BS"), "mooo", treat_like_warning: true)
-          assert_equal 1, @fail_count
-          assert_equal true, @treat_like_warning
-          assert_equal :skipped, @honeybadger_status
-        ensure
-          ExceptionHandling.post_log_error_hook = nil
-        end
+      should "plumb treat_like_warning and logged_to_honeybadger to log error hook" do
+        @fail_count = 0
+        @honeybadger_status = nil
+        ExceptionHandling.post_log_error_hook = method(:log_error_callback_config)
+        ExceptionHandling.log_error(StandardError.new("Some Exception"), "mooo", treat_like_warning: true)
+        assert_equal 1, @fail_count
+        assert_equal true, @treat_like_warning
+        assert_equal :skipped, @honeybadger_status
+      end
+
+      should "include logging context in the exception data" do
+        ExceptionHandling.post_log_error_hook = method(:log_error_callback_config)
+        ExceptionHandling.log_error(StandardError.new("Some Exception"), "mooo", nil, treat_like_warning: true, log_context_test: "contextual_logging")
+
+        expected_log_context = {
+          "log_context_test" => "contextual_logging"
+        }
+        assert_equal expected_log_context, @callback_data[:log_context]
       end
 
       should "support rescue exceptions from a log_error hook" do
@@ -209,9 +210,8 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
         stub(ExceptionHandling.logger).info.with_any_args do |message, _|
           log_info_messages << message
         end
-        assert_nothing_raised { ExceptionHandling.ensure_safe("mooo") { raise "Some BS" } }
+        assert_nothing_raised { ExceptionHandling.ensure_safe("mooo") { raise "Some Exception" } }
         assert log_info_messages.find { |message| message =~ /Unable to execute custom log_error callback/ }
-        ExceptionHandling.post_log_error_hook = nil
       end
 
       should "handle nil message exceptions resulting from the log_error hook" do
@@ -220,9 +220,8 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
         stub(ExceptionHandling.logger).info.with_any_args do |message, _|
           log_info_messages << message
         end
-        assert_nothing_raised { ExceptionHandling.ensure_safe("mooo") { raise "Some BS" } }
+        assert_nothing_raised { ExceptionHandling.ensure_safe("mooo") { raise "Some Exception" } }
         assert log_info_messages.find { |message| message =~ /Unable to execute custom log_error callback/ }
-        ExceptionHandling.post_log_error_hook = nil
       end
 
       should "handle nil message exceptions resulting from the custom data hook" do
@@ -231,20 +230,13 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
         stub(ExceptionHandling.logger).info.with_any_args do |message, _|
           log_info_messages << message
         end
-        assert_nothing_raised { ExceptionHandling.ensure_safe("mooo") { raise "Some BS" } }
+        assert_nothing_raised { ExceptionHandling.ensure_safe("mooo") { raise "Some Exception" } }
         assert log_info_messages.find { |message| message =~ /Unable to execute custom custom_data_hook callback/ }
-        ExceptionHandling.custom_data_hook = nil
       end
     end
 
     context "Exception Handling" do
-      setup do
-        ActionMailer::Base.deliveries.clear
-        ExceptionHandling.send(:clear_exception_summary)
-      end
-
       context "default_metric_name" do
-
         context "when metric_name is present in exception_data" do
           should "include metric_name in resulting metric name" do
             exception = StandardError.new('this is an exception')
@@ -311,7 +303,7 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
       context "ExceptionHandling.ensure_safe" do
         should "log an exception with call stack if an exception is raised." do
           mock(ExceptionHandling.logger).fatal(/\(blah\):\n.*exception_handling_test\.rb/, anything)
-          ExceptionHandling.ensure_safe { raise ArgumentError.new("blah") }
+          ExceptionHandling.ensure_safe { raise ArgumentError, "blah" }
         end
 
         should "log an exception with call stack if an ActionView template exception is raised." do
@@ -332,13 +324,13 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
 
         should "return nil if an exception is raised during an assignment" do
           mock(ExceptionHandling.logger).fatal(/\(blah\):\n.*exception_handling_test\.rb/, anything)
-          b = ExceptionHandling.ensure_safe { raise ArgumentError.new("blah") }
+          b = ExceptionHandling.ensure_safe { raise ArgumentError, "blah" }
           assert_nil b
         end
 
         should "allow a message to be appended to the error when logged." do
           mock(ExceptionHandling.logger).fatal(/mooo \(blah\):\n.*exception_handling_test\.rb/, anything)
-          b = ExceptionHandling.ensure_safe("mooo") { raise ArgumentError.new("blah") }
+          b = ExceptionHandling.ensure_safe("mooo") { raise ArgumentError, "blah" }
           assert_nil b
         end
 
@@ -347,7 +339,7 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
 
           mock(ExceptionHandling.logger).fatal(/mooo \(blah\):\n.*exception_handling_test\.rb/, anything)
 
-          b = ExceptionHandling.ensure_safe("mooo") { raise StandardError.new("blah") }
+          b = ExceptionHandling.ensure_safe("mooo") { raise StandardError, "blah" }
           assert_nil b
         end
       end
@@ -355,7 +347,7 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
       context "ExceptionHandling.ensure_completely_safe" do
         should "log an exception if an exception is raised." do
           mock(ExceptionHandling.logger).fatal(/\(blah\):\n.*exception_handling_test\.rb/, anything)
-          ExceptionHandling.ensure_completely_safe { raise ArgumentError.new("blah") }
+          ExceptionHandling.ensure_completely_safe { raise ArgumentError, "blah" }
         end
 
         should "should not log an exception if an exception is not raised." do
@@ -371,26 +363,26 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
 
         should "return nil if an exception is raised during an assignment" do
           mock(ExceptionHandling.logger).fatal(/\(blah\):\n.*exception_handling_test\.rb/, anything) { nil }
-          b = ExceptionHandling.ensure_completely_safe { raise ArgumentError.new("blah") }
+          b = ExceptionHandling.ensure_completely_safe { raise ArgumentError, "blah" }
           assert_nil b
         end
 
         should "allow a message to be appended to the error when logged." do
           mock(ExceptionHandling.logger).fatal(/mooo \(blah\):\n.*exception_handling_test\.rb/, anything)
-          b = ExceptionHandling.ensure_completely_safe("mooo") { raise ArgumentError.new("blah") }
+          b = ExceptionHandling.ensure_completely_safe("mooo") { raise ArgumentError, "blah" }
           assert_nil b
         end
 
         should "rescue any instance or child of Exception" do
           mock(ExceptionHandling.logger).fatal(/\(blah\):\n.*exception_handling_test\.rb/, anything)
-          ExceptionHandling::ensure_completely_safe { raise Exception.new("blah") }
+          ExceptionHandling.ensure_completely_safe { raise Exception, "blah" }
         end
 
         should "not rescue the special exceptions that Ruby uses" do
           [SystemExit, SystemStackError, NoMemoryError, SecurityError].each do |exception|
             assert_raise exception do
               ExceptionHandling.ensure_completely_safe do
-                raise exception.new
+                raise exception
               end
             end
           end
@@ -398,11 +390,17 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
       end
 
       context "ExceptionHandling.ensure_escalation" do
+        setup do
+          capture_notifications
+          ActionMailer::Base.deliveries.clear
+        end
+
         should "log the exception as usual and send the proper email" do
-          assert_equal 0, ActionMailer::Base.deliveries.count
           mock(ExceptionHandling.logger).fatal(/\(blah\):\n.*exception_handling_test\.rb/, anything)
-          ExceptionHandling.ensure_escalation( "Favorite Feature") { raise ArgumentError.new("blah") }
-          assert_equal 2, ActionMailer::Base.deliveries.count
+          ExceptionHandling.ensure_escalation("Favorite Feature") { raise ArgumentError, "blah" }
+          assert_equal 1, ActionMailer::Base.deliveries.count
+          assert_equal 1, sent_notifications.size, sent_notifications.inspect
+
           email = ActionMailer::Base.deliveries.last
           assert_equal "#{ExceptionHandling.email_environment} Escalation: Favorite Feature", email.subject
           assert_match 'ArgumentError: blah', email.body.to_s
@@ -410,23 +408,42 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
         end
 
         should "should not escalate if an exception is not raised." do
-          assert_equal 0, ActionMailer::Base.deliveries.count
           dont_allow(ExceptionHandling.logger).fatal
           ExceptionHandling.ensure_escalation('Ignored') { ; }
           assert_equal 0, ActionMailer::Base.deliveries.count
         end
 
-        should "log if the escalation email can not be sent" do
+        should "log if the escalation email cannot be sent" do
           any_instance_of(Mail::Message) do |message|
-            mock(message).deliver
             mock(message).deliver { raise RuntimeError.new, "Delivery Error" }
           end
-          mock(ExceptionHandling.logger) do |logger|
-            logger.fatal(/first_test_exception/, anything)
-            logger.fatal(/safe_email_deliver .*Delivery Error/, anything)
+          log_fatals = []
+          stub(ExceptionHandling.logger) do |logger|
+            logger.fatal.with_any_args { |*args| log_fatals << args }
           end
-          ExceptionHandling.ensure_escalation("Not Used") { raise ArgumentError.new("first_test_exception") }
-          assert_equal 0, ActionMailer::Base.deliveries.count
+
+          ExceptionHandling.ensure_escalation("ensure context") { raise ArgumentError, "first_test_exception" }
+
+          assert_match /ArgumentError.*first_test_exception/, log_fatals[0].first
+          assert_match /safe_email_deliver.*Delivery Error/, log_fatals[1].first
+
+          assert_equal 2, log_fatals.size, log_fatals.inspect
+
+          assert_equal 1, sent_notifications.size, sent_notifications.inspect # still sent to honeybadger
+        end
+
+        should "allow the caller to specify custom recipients" do
+          custom_recipients = ['something@invoca.com']
+          mock(ExceptionHandling.logger).fatal(/\(blah\):\n.*exception_handling_test\.rb/, anything)
+          ExceptionHandling.ensure_escalation("Favorite Feature", custom_recipients) { raise ArgumentError, "blah" }
+          assert_equal 1, ActionMailer::Base.deliveries.count
+          assert_equal 1, sent_notifications.size, sent_notifications.inspect
+
+          email = ActionMailer::Base.deliveries.last
+          assert_equal "#{ExceptionHandling.email_environment} Escalation: Favorite Feature", email.subject
+          assert_match 'ArgumentError: blah', email.body.to_s
+          assert_match ExceptionHandling.last_exception_timestamp.to_s, email.body.to_s
+          assert_equal custom_recipients, email.to
         end
       end
 
@@ -434,7 +451,7 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
         should "log the exception as usual and fire a sensu event" do
           mock(ExceptionHandling::Sensu).generate_event("Favorite Feature", "test context\nblah")
           mock(ExceptionHandling.logger).fatal(/\(blah\):\n.*exception_handling_test\.rb/, anything)
-          ExceptionHandling.ensure_alert('Favorite Feature', 'test context') { raise ArgumentError.new("blah") }
+          ExceptionHandling.ensure_alert('Favorite Feature', 'test context') { raise ArgumentError, "blah" }
         end
 
         should "should not send sensu event if an exception is not raised." do
@@ -449,7 +466,7 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
             logger.fatal(/first_test_exception/, anything)
             logger.fatal(/Failed to send/, anything)
           end
-          ExceptionHandling.ensure_alert("Not Used", 'test context') { raise ArgumentError.new("first_test_exception") }
+          ExceptionHandling.ensure_alert("Not Used", 'test context') { raise ArgumentError, "first_test_exception" }
         end
 
         should "log if the exception message is nil" do
@@ -465,141 +482,53 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
           recipients = ["prodsupport@example.com"]
 
           mock(ExceptionHandling).production_support_recipients { recipients }.times(2)
-          mock(ExceptionHandling).escalate_custom(subject, exception, ExceptionHandling.last_exception_timestamp, recipients)
+          mock(ExceptionHandling).escalate(subject, exception, ExceptionHandling.last_exception_timestamp, recipients)
           ExceptionHandling.escalate_to_production_support(exception, subject)
         end
       end
 
       context "exception timestamp" do
         setup do
-          Time.now_override = Time.parse( '1986-5-21 4:17 am UTC' )
+          Time.now_override = Time.parse('1986-5-21 4:17 am UTC')
         end
 
         should "include the timestamp when the exception is logged" do
-          mock(ExceptionHandling.logger).fatal(/\(Error:517033020\) ArgumentError mooo \(blah\):\n.*exception_handling_test\.rb/, anything)
-          b = ExceptionHandling.ensure_safe("mooo") { raise ArgumentError.new("blah") }
-          assert_nil b
-
-          assert_equal 517033020, ExceptionHandling.last_exception_timestamp
+          capture_notifications
 
-          assert_emails 1
-          assert_match(/517033020/, ActionMailer::Base.deliveries[-1].body.to_s)
-        end
-      end
-
-      should "send just one copy of exceptions that don't repeat" do
-        ExceptionHandling.log_error(exception_1)
-        ExceptionHandling.log_error(exception_2)
-        assert_emails 2
-        assert_match(/Exception 1/, ActionMailer::Base.deliveries[-2].subject)
-        assert_match(/Exception 2/, ActionMailer::Base.deliveries[-1].subject)
-      end
+          mock(ExceptionHandling.logger).fatal(/\(Error:517033020\) ArgumentError context \(blah\):\n.*exception_handling_test\.rb/, anything)
+          b = ExceptionHandling.ensure_safe("context") { raise ArgumentError, "blah" }
+          assert_nil b
 
-      should "not send emails if exception is a warning" do
-        ExceptionHandling.log_error(ExceptionHandling::Warning.new("Don't send email"))
-        assert_emails 0
-      end
+          assert_equal 517_033_020, ExceptionHandling.last_exception_timestamp
 
-      should "not send emails when log_warning is called" do
-        ExceptionHandling.log_warning("Don't send email")
-        assert_emails 0
-      end
+          assert_equal 1, sent_notifications.size, sent_notifications.inspect
 
-      should "log the error if the exception message is nil" do
-        ExceptionHandling.log_error(exception_with_nil_message)
-        assert_emails(1)
-        assert_match(/RuntimeError/, ActionMailer::Base.deliveries.last.subject)
-      end
-
-      should "log the error if the exception message is nil and the exception context is a hash" do
-        ExceptionHandling.log_error(exception_with_nil_message, "SERVER_NAME" => "exceptional.com")
-        assert_emails(1)
-        assert_match(/RuntimeError/, ActionMailer::Base.deliveries.last.subject)
-      end
-
-      should "only send 5 of a repeated error, but call post hook for every exception" do
-        @fail_count = 0
-        ExceptionHandling.post_log_error_hook = method(:log_error_callback)
-        assert_emails 5 do
-          10.times do
-            ExceptionHandling.log_error(exception_1)
-          end
+          assert_equal 517_033_020, sent_notifications.last.enhanced_data['timestamp']
         end
-        assert_equal 10, @fail_count
       end
 
-      should "only send 5 of a repeated error but don't send summary if 6th is different" do
-        assert_emails 5 do
-          5.times do
-            ExceptionHandling.log_error(exception_1)
-          end
-        end
-        assert_emails 1 do
-          ExceptionHandling.log_error(exception_2)
-        end
-      end
-
-      should "send the summary when the error is encountered an hour after the first occurrence" do
-        assert_emails 5 do # 5 exceptions, 4 summarized
-          9.times do |t|
-            ExceptionHandling.log_error(exception_1)
-          end
-        end
-        Time.now_override = 2.hours.from_now
-        assert_emails 1 do # 1 summary (4 + 1 = 5) after 2 hours
-          ExceptionHandling.log_error(exception_1)
-        end
-        assert_match(/\[5 SUMMARIZED\]/, ActionMailer::Base.deliveries.last.subject)
-        assert_match(/This exception occurred 5 times since/, ActionMailer::Base.deliveries.last.body.to_s)
-
-        assert_emails 0 do # still summarizing...
-          7.times do
-            ExceptionHandling.log_error(exception_1)
-          end
-        end
+      should "log the error if the exception message is nil" do
+        capture_notifications
 
-        Time.now_override = 3.hours.from_now
+        ExceptionHandling.log_error(exception_with_nil_message)
 
-        assert_emails 1 + 2 do # 1 summary and 2 new
-          2.times do
-            ExceptionHandling.log_error(exception_2)
-          end
-        end
-        assert_match(/\[7 SUMMARIZED\]/, ActionMailer::Base.deliveries[-3].subject)
-        assert_match(/This exception occurred 7 times since/, ActionMailer::Base.deliveries[-3].body.to_s)
+        assert_equal 1, sent_notifications.size, sent_notifications.inspect
+        assert_equal 'RuntimeError: ', sent_notifications.last.enhanced_data['error_string']
       end
 
-      should "send the summary if a summary is available, but not sent when another exception comes up" do
-        assert_emails 5 do # 5 to start summarizing
-          6.times do
-            ExceptionHandling.log_error(exception_1)
-          end
-        end
-
-        assert_emails 1 + 1 do # 1 summary of previous, 1 from new exception
-          ExceptionHandling.log_error(exception_2)
-        end
-
-        assert_match(/\[1 SUMMARIZED\]/, ActionMailer::Base.deliveries[-2].subject)
-        assert_match(/This exception occurred 1 times since/, ActionMailer::Base.deliveries[-2].body.to_s)
+      should "log the error if the exception message is nil and the exception context is a hash" do
+        capture_notifications
 
-        assert_emails 5 do # 5 to start summarizing
-          10.times do
-            ExceptionHandling.log_error(exception_1)
-          end
-        end
+        ExceptionHandling.log_error(exception_with_nil_message, "SERVER_NAME" => "exceptional.com")
 
-        assert_emails 0 do # still summarizing
-          11.times do
-            ExceptionHandling.log_error(exception_1)
-          end
-        end
+        assert_equal 1, sent_notifications.size, sent_notifications.inspect
+        assert_equal 'RuntimeError: ', sent_notifications.last.enhanced_data['error_string']
       end
 
       context "Honeybadger integration" do
         context "with Honeybadger not defined" do
           setup do
-            stub(ExceptionHandling).honeybadger? { false }
+            stub(ExceptionHandling).honeybadger_defined? { false }
           end
 
           should "not invoke send_exception_to_honeybadger when log_error is executed" do
@@ -649,16 +578,17 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
           should "send error details and relevant context data to Honeybadger" do
             Time.now_override = Time.now
             env = { server: "fe98" }
-            parameters = { advertiser_id: 435 }
+            parameters = { advertiser_id: 435, controller: "some_controller" }
             session = { username: "jsmith" }
             request_uri = "host/path"
             controller = create_dummy_controller(env, parameters, session, request_uri)
             stub(ExceptionHandling).server_name { "invoca_fe98" }
 
-            exception = StandardError.new("Some BS")
+            exception = StandardError.new("Some Exception")
             exception.set_backtrace([
-              "test/unit/exception_handling_test.rb:847:in `exception_1'",
-              "test/unit/exception_handling_test.rb:455:in `block (4 levels) in <class:ExceptionHandlingTest>'"])
+                                      "test/unit/exception_handling_test.rb:847:in `exception_1'",
+                                      "test/unit/exception_handling_test.rb:455:in `block (4 levels) in <class:ExceptionHandlingTest>'"
+                                    ])
             exception_context = { "SERVER_NAME" => "exceptional.com" }
 
             honeybadger_data = nil
@@ -673,8 +603,9 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
             end
 
             expected_data = {
-              error_class: :"Test BS",
-              error_message: "Some BS",
+              error_class: :"Test Exception",
+              error_message: "Some Exception",
+              controller: "some_controller",
               exception: exception,
               context: {
                 timestamp: Time.now.to_i,
@@ -685,25 +616,33 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
                 notes: "this is used by a test",
                 user_details: { "username" => "jsmith" },
                 request: {
-                  "params" => { "advertiser_id" => 435 },
+                  "params" => { "advertiser_id" => 435, "controller" => "some_controller" },
                   "rails_root" => "Rails.root not defined. Is this a test environment?",
-                  "url" => "host/path" },
+                  "url" => "host/path"
+                },
                 session: {
                   "key" => nil,
-                  "data" => { "username" => "jsmith" } },
+                  "data" => { "username" => "jsmith" }
+                },
                 environment: {
-                  "SERVER_NAME" => "exceptional.com" },
+                  "SERVER_NAME" => "exceptional.com"
+                },
                 backtrace: [
                   "test/unit/exception_handling_test.rb:847:in `exception_1'",
-                  "test/unit/exception_handling_test.rb:455:in `block (4 levels) in <class:ExceptionHandlingTest>'"],
+                  "test/unit/exception_handling_test.rb:455:in `block (4 levels) in <class:ExceptionHandlingTest>'"
+                ],
                 event_response: "Event successfully received"
               }
             }
             assert_equal_with_diff expected_data, honeybadger_data
           end
 
-          should "not send notification to honeybadger when exception description has the flag turned off and call log error callback with logged_to_honeybadger set to nil" do
-            begin
+          context "with post_log_error_hook set" do
+            teardown do
+              ExceptionHandling.post_log_error_hook = nil
+            end
+
+            should "not send notification to honeybadger when exception description has the flag turned off and call log error callback with logged_to_honeybadger set to nil" do
               @fail_count = 0
               @honeybadger_status = nil
               ExceptionHandling.post_log_error_hook = method(:log_error_callback_config)
@@ -716,55 +655,37 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
               stub(File).mtime { incrementing_mtime }
               mock(YAML).load_file.with_any_args { ActiveSupport::HashWithIndifferentAccess.new(filter_list) }.at_least(1)
 
-              exception = StandardError.new("suppress Honeybadger notification")
-              mock.proxy(ExceptionHandling).send_exception_to_honeybadger.with_any_args.once
+              mock.proxy(ExceptionHandling).send_exception_to_honeybadger_unless_filtered.with_any_args.once
               dont_allow(Honeybadger).notify
-              ExceptionHandling.log_error(exception)
+              ExceptionHandling.log_error(StandardError.new("suppress Honeybadger notification"))
               assert_equal :skipped, @honeybadger_status
-            ensure
-              ExceptionHandling.post_log_error_hook = nil
             end
-          end
 
-          should "call log error callback with logged_to_honeybadger set to false if an error occurs while attempting to notify honeybadger" do
-            begin
+            should "call log error callback with logged_to_honeybadger set to false if an error occurs while attempting to notify honeybadger" do
               @fail_count = 0
               @honeybadger_status = nil
               ExceptionHandling.post_log_error_hook = method(:log_error_callback_config)
-              stub($stderr).puts
               mock(Honeybadger).notify.with_any_args { raise "Honeybadger Notification Failure" }
               ExceptionHandling.log_error(exception_1)
               assert_equal :failure, @honeybadger_status
-            ensure
-              ExceptionHandling.post_log_error_hook = nil
             end
-          end
 
-          should "call log error callback with logged_to_honeybadger set to false on unsuccessful honeybadger notification" do
-            begin
+            should "call log error callback with logged_to_honeybadger set to false on unsuccessful honeybadger notification" do
               @fail_count = 0
               @honeybadger_status = nil
               ExceptionHandling.post_log_error_hook = method(:log_error_callback_config)
-              stub($stderr).puts
               mock(Honeybadger).notify.with_any_args { false }
               ExceptionHandling.log_error(exception_1)
               assert_equal :failure, @honeybadger_status
-            ensure
-              ExceptionHandling.post_log_error_hook = nil
             end
-          end
 
-          should "call log error callback with logged_to_honeybadger set to true on successful honeybadger notification" do
-            begin
+            should "call log error callback with logged_to_honeybadger set to true on successful honeybadger notification" do
               @fail_count = 0
               @honeybadger_status = nil
               ExceptionHandling.post_log_error_hook = method(:log_error_callback_config)
-              stub($stderr).puts
               mock(Honeybadger).notify.with_any_args { '06220c5a-b471-41e5-baeb-de247da45a56' }
               ExceptionHandling.log_error(exception_1)
               assert_equal :success, @honeybadger_status
-            ensure
-              ExceptionHandling.post_log_error_hook = nil
             end
           end
         end
@@ -777,20 +698,27 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
       end
 
       should "allow sections to have data with just a to_s method" do
-        ExceptionHandling.log_error("This is my RingSwitch example.  Log, don't email!") do |data|
-          data.merge!(:event_response => EventResponse.new)
+        capture_notifications
+
+        ExceptionHandling.log_error("This is my RingSwitch example.") do |data|
+          data.merge!(event_response: EventResponse.new)
         end
-        assert_emails 1
-        assert_match(/message from to_s!/, ActionMailer::Base.deliveries.last.body.to_s)
+
+        assert_equal 1, sent_notifications.size, sent_notifications.inspect
+        assert_match(/message from to_s!/, sent_notifications.last.enhanced_data['event_response'].to_s)
       end
     end
 
+    should "return the error ID (timestamp)" do
+      result = ExceptionHandling.log_error(RuntimeError.new("A runtime error"), "Runtime message")
+      assert_equal ExceptionHandling.last_exception_timestamp, result
+    end
+
     should "rescue exceptions that happen in log_error" do
-      stub(ExceptionHandling).make_exception { raise ArgumentError.new("Bad argument") }
+      stub(ExceptionHandling).make_exception { raise ArgumentError, "Bad argument" }
       mock(ExceptionHandling).write_exception_to_log(satisfy { |ex| ex.to_s['Bad argument'] },
                                                      satisfy { |context| context['ExceptionHandlingError: log_error rescued exception while logging Runtime message'] },
                                                      anything)
-      stub($stderr).puts
       ExceptionHandling.log_error(RuntimeError.new("A runtime error"), "Runtime message")
     end
 
@@ -799,13 +727,13 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
                                                      satisfy { |context| context['Context message'] },
                                                      anything,
                                                      anything)
-      ExceptionHandling.log_error(ArgumentError.new("Bad argument"), "Context message") { |data| raise 'Error!!!' }
+      ExceptionHandling.log_error(ArgumentError.new("Bad argument"), "Context message") { |_data| raise 'Error!!!' }
     end
 
     context "Exception Filtering" do
       setup do
-        filter_list = { :exception1 => { 'error' => "my error message" },
-                        :exception2 => { 'error' => "some other message", :session => "misc data" } }
+        filter_list = { exception1: { 'error' => "my error message" },
+                        exception2: { 'error' => "some other message", :session => "misc data" } }
         stub(YAML).load_file { ActiveSupport::HashWithIndifferentAccess.new(filter_list) }
 
         # bump modified time up to get the above filter loaded
@@ -813,105 +741,119 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
       end
 
       should "handle case where filter list is not found" do
-        stub(YAML).load_file { raise Errno::ENOENT.new("File not found") }
+        stub(YAML).load_file { raise Errno::ENOENT, "File not found" }
+
+        capture_notifications
 
-        ActionMailer::Base.deliveries.clear
-        ExceptionHandling.log_error( "My error message is in list" )
-        assert_emails 1
+        ExceptionHandling.log_error("My error message is in list")
+        assert_equal 1, sent_notifications.size, sent_notifications.inspect
       end
 
       should "log exception and suppress email when exception is on filter list" do
-        ActionMailer::Base.deliveries.clear
-        ExceptionHandling.log_error( "Error message is not in list" )
-        assert_emails 1
+        capture_notifications
 
-        ActionMailer::Base.deliveries.clear
-        ExceptionHandling.log_error( "My error message is in list" )
-        assert_emails 0
+        ExceptionHandling.log_error("Error message is not in list")
+        assert_equal 1, sent_notifications.size, sent_notifications.inspect
+
+        sent_notifications.clear
+        ExceptionHandling.log_error("My error message is in list")
+        assert_equal 0, sent_notifications.size, sent_notifications.inspect
       end
 
       should "allow filtering exception on any text in exception data" do
-        filters = { :exception1 => { :session => "data: my extra session data" } }
+        filters = { exception1: { session: "data: my extra session data" } }
         stub(YAML).load_file { ActiveSupport::HashWithIndifferentAccess.new(filters) }
 
-        ActionMailer::Base.deliveries.clear
-        ExceptionHandling.log_error( "No match here" ) do |data|
+        capture_notifications
+
+        ExceptionHandling.log_error("No match here") do |data|
           data[:session] = {
-              :key         => "@session_id",
-              :data        => "my extra session data"
-            }
+            key: "@session_id",
+            data: "my extra session data"
+          }
         end
-        assert_emails 0
+        assert_equal 0, sent_notifications.size, sent_notifications.inspect
 
-        ActionMailer::Base.deliveries.clear
-        ExceptionHandling.log_error( "No match here" ) do |data|
+        ExceptionHandling.log_error("No match here") do |data|
           data[:session] = {
-              :key         => "@session_id",
-              :data        => "my extra session <no match!> data"
-            }
+            key: "@session_id",
+            data: "my extra session <no match!> data"
+          }
         end
-        assert_emails 1, ActionMailer::Base.deliveries.*.body.*.inspect
+        assert_equal 1, sent_notifications.size, sent_notifications.inspect
       end
 
       should "reload filter list on the next exception if file was modified" do
-        ActionMailer::Base.deliveries.clear
-        ExceptionHandling.log_error( "Error message is not in list" )
-        assert_emails 1
+        capture_notifications
+
+        ExceptionHandling.log_error("Error message is not in list")
+        assert_equal 1, sent_notifications.size, sent_notifications.inspect
 
-        filter_list = { :exception1 => { 'error' => "Error message is not in list" } }
+        filter_list = { exception1: { 'error' => "Error message is not in list" } }
         stub(YAML).load_file { ActiveSupport::HashWithIndifferentAccess.new(filter_list) }
         stub(File).mtime { incrementing_mtime }
 
-        ActionMailer::Base.deliveries.clear
-        ExceptionHandling.log_error( "Error message is not in list" )
-        assert_emails 0, ActionMailer::Base.deliveries.*.body.*.inspect
+        sent_notifications.clear
+        ExceptionHandling.log_error("Error message is not in list")
+        assert_equal 0, sent_notifications.size, sent_notifications.inspect
       end
 
       should "not consider filter if both error message and body do not match" do
+        capture_notifications
+
         # error message matches, but not full text
-        ActionMailer::Base.deliveries.clear
-        ExceptionHandling.log_error( "some other message" )
-        assert_emails 1, ActionMailer::Base.deliveries.*.body.*.inspect
+        ExceptionHandling.log_error("some other message")
+        assert_equal 1, sent_notifications.size, sent_notifications.inspect
 
         # now both match
-        ActionMailer::Base.deliveries.clear
-        ExceptionHandling.log_error( "some other message" ) do |data|
-          data[:session] = {:some_random_key => "misc data"}
+        sent_notifications.clear
+        ExceptionHandling.log_error("some other message") do |data|
+          data[:session] = { some_random_key: "misc data" }
         end
-        assert_emails 0, ActionMailer::Base.deliveries.*.body.*.inspect
+        assert_equal 0, sent_notifications.size, sent_notifications.inspect
       end
 
       should "skip environment keys not on whitelist" do
-        ActionMailer::Base.deliveries.clear
-        ExceptionHandling.log_error( "some message" ) do |data|
-          data[:environment] = { :SERVER_PROTOCOL => "HTTP/1.0", :RAILS_SECRETS_YML_CONTENTS => 'password: VERY_SECRET_PASSWORD' }
+        capture_notifications
+
+        ExceptionHandling.log_error("some message") do |data|
+          data[:environment] = { SERVER_PROTOCOL: "HTTP/1.0", RAILS_SECRETS_YML_CONTENTS: 'password: VERY_SECRET_PASSWORD' }
         end
-        assert_emails 1, ActionMailer::Base.deliveries.*.body.*.inspect
-        mail = ActionMailer::Base.deliveries.last
-        assert_nil mail.body.to_s["RAILS_SECRETS_YML_CONTENTS"], mail.body.to_s # this is not on whitelist
-        assert     mail.body.to_s["SERVER_PROTOCOL: HTTP/1.0" ], mail.body.to_s # this is
+        assert_equal 1, sent_notifications.size, sent_notifications.inspect
+
+        mail = sent_notifications.last
+        environment = mail.enhanced_data['environment']
+
+        assert_nil environment["RAILS_SECRETS_YML_CONTENTS"], environment.inspect # this is not on whitelist
+        assert     environment["SERVER_PROTOCOL"], environment.inspect # this is
       end
 
       should "omit environment defaults" do
-        ActionMailer::Base.deliveries.clear
-        ExceptionHandling.log_error( "some message" ) do |data|
-          data[:environment] = {:SERVER_PORT => '80', :SERVER_PROTOCOL => "HTTP/1.0"}
+        capture_notifications
+
+        stub(ExceptionHandling).send_exception_to_honeybadger(anything) { |exception_info| sent_notifications << exception_info }
+
+        ExceptionHandling.log_error("some message") do |data|
+          data[:environment] = { SERVER_PORT: '80', SERVER_PROTOCOL: "HTTP/1.0" }
         end
-        assert_emails 1, ActionMailer::Base.deliveries.*.body.*.inspect
-        mail = ActionMailer::Base.deliveries.last
-        assert_nil mail.body.to_s["SERVER_PORT"              ], mail.body.to_s # this was default
-        assert     mail.body.to_s["SERVER_PROTOCOL: HTTP/1.0"], mail.body.to_s # this was not
+        assert_equal 1, sent_notifications.size, sent_notifications.inspect
+        mail = sent_notifications.last
+        environment = mail.enhanced_data['environment']
+
+        assert_nil environment["SERVER_PORT"], environment.inspect # this was default
+        assert     environment["SERVER_PROTOCOL"], environment # this was not
       end
 
       should "reject the filter file if any contain all empty regexes" do
-        filter_list = { :exception1 => { 'error' => "", :session => "" },
-                        :exception2 => { 'error' => "is not in list", :session => "" } }
+        filter_list = { exception1: { 'error' => "", :session => "" },
+                        exception2: { 'error' => "is not in list", :session => "" } }
         stub(YAML).load_file { ActiveSupport::HashWithIndifferentAccess.new(filter_list) }
         stub(File).mtime { incrementing_mtime }
 
-        ActionMailer::Base.deliveries.clear
-        ExceptionHandling.log_error( "Error message is not in list" )
-        assert_emails 1, ActionMailer::Base.deliveries.*.inspect
+        capture_notifications
+
+        ExceptionHandling.log_error("Error message is not in list")
+        assert_equal 1, sent_notifications.size, sent_notifications.inspect
       end
 
       should "reload filter file if filename changes" do
@@ -921,27 +863,13 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
       end
 
       context "Exception Handling Mailer" do
-        should "create email" do
-          ExceptionHandling.log_error(exception_1) do |data|
-            data[:request] = { :params => {:id => 10993}, :url => "www.ringrevenue.com" }
-            data[:session] = { :key => "DECAFE" }
-          end
-          assert_emails 1, ActionMailer::Base.deliveries.*.inspect
-          assert mail = ActionMailer::Base.deliveries.last
-          assert_equal ['exceptions@example.com'], mail.to
-          assert_equal ['server@example.com'].to_s, mail.from.to_s
-          assert_match(/Exception 1/, mail.to_s)
-          assert_match(/key: DECAFE/, mail.to_s)
-          assert_match(/id: 10993/, mail.to_s)
-        end
-
         EXPECTED_SMTP_HASH =
-            {
-                :host   => '127.0.0.1',
-                :domain => 'localhost.localdomain',
-                :from   => 'server@example.com',
-                :to     => 'exceptions@example.com'
-            }
+          {
+            host: '127.0.0.1',
+            domain: 'localhost.localdomain',
+            from: 'server@example.com',
+            to: 'escalation@example.com'
+          }.freeze
 
         [[true, false], [true, true]].each do |em_flag, synchrony_flag|
           context "eventmachine_safe = #{em_flag} && eventmachine_synchrony = #{synchrony_flag}" do
@@ -961,22 +889,24 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
             end
 
             should "schedule EventMachine STMP when EventMachine defined" do
+              ActionMailer::Base.deliveries.clear
+
               set_test_const('EventMachine::Protocols::SmtpClient', SmtpClientStub)
 
-              ExceptionHandling.log_error(exception_1)
+              ExceptionHandling.ensure_escalation("ensure message") { raise 'Exception to escalate!' }
               assert EventMachineStub.block
               EventMachineStub.block.call
               assert DNSResolvStub.callback_block
               DNSResolvStub.callback_block.call ['127.0.0.1']
-              assert_equal_with_diff EXPECTED_SMTP_HASH, (SmtpClientStub.send_hash & EXPECTED_SMTP_HASH.keys).map_hash { |k,v| v.to_s }, SmtpClientStub.send_hash.inspect
+              assert_equal_with_diff EXPECTED_SMTP_HASH, (SmtpClientStub.send_hash & EXPECTED_SMTP_HASH.keys).map_hash { |_k, v| v.to_s }, SmtpClientStub.send_hash.inspect
               assert_equal((synchrony_flag ? :asend : :send), SmtpClientStub.last_method)
-              assert_match(/Exception 1/, SmtpClientStub.send_hash[:content])
+              assert_match(/Exception to escalate/, SmtpClientStub.send_hash[:content])
               assert_emails 0, ActionMailer::Base.deliveries.*.to_s
             end
 
             should "pass the content as a proper rfc 2822 message" do
               set_test_const('EventMachine::Protocols::SmtpClient', SmtpClientStub)
-              ExceptionHandling.log_error(exception_1)
+              ExceptionHandling.ensure_escalation("ensure message") { raise 'Exception to escalate!' }
               assert EventMachineStub.block
               EventMachineStub.block.call
               assert DNSResolvStub.callback_block
@@ -987,27 +917,26 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
             end
 
             should "log fatal on EventMachine STMP errback" do
-              assert_emails 0, ActionMailer::Base.deliveries.*.to_s
+              ActionMailer::Base.deliveries.clear
+
               set_test_const('EventMachine::Protocols::SmtpClient', SmtpClientErrbackStub)
-              mock(ExceptionHandling.logger).fatal(/Exception 1/, anything)
+              mock(ExceptionHandling.logger).fatal(/Exception to escalate/, anything)
               mock(ExceptionHandling.logger).fatal(/Failed to email by SMTP: "credential mismatch"/)
 
-              ExceptionHandling.log_error(exception_1)
+              ExceptionHandling.ensure_escalation("ensure message") { raise 'Exception to escalate!' }
               assert EventMachineStub.block
               EventMachineStub.block.call
               assert DNSResolvStub.callback_block
               DNSResolvStub.callback_block.call(['127.0.0.1'])
               SmtpClientErrbackStub.block.call("credential mismatch")
-              assert_equal_with_diff EXPECTED_SMTP_HASH, (SmtpClientErrbackStub.send_hash & EXPECTED_SMTP_HASH.keys).map_hash { |k,v| v.to_s }, SmtpClientErrbackStub.send_hash.inspect
-              #assert_emails 0, ActionMailer::Base.deliveries.*.to_s
+              assert_equal_with_diff EXPECTED_SMTP_HASH, (SmtpClientErrbackStub.send_hash & EXPECTED_SMTP_HASH.keys).map_hash { |_k, v| v.to_s }, SmtpClientErrbackStub.send_hash.inspect
             end
 
             should "log fatal on EventMachine dns resolver errback" do
-              assert_emails 0, ActionMailer::Base.deliveries.*.to_s
-              mock(ExceptionHandling.logger).fatal(/Exception 1/, anything)
+              mock(ExceptionHandling.logger).fatal(/Exception to escalate/, anything)
               mock(ExceptionHandling.logger).fatal(/Failed to resolv DNS for localhost: "softlayer sucks"/)
 
-              ExceptionHandling.log_error(exception_1)
+              ExceptionHandling.ensure_escalation("ensure message") { raise 'Exception to escalate!' }
               assert EventMachineStub.block
               EventMachineStub.block.call
               DNSResolvStub.errback_block.call("softlayer sucks")
@@ -1015,45 +944,31 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
           end
         end
       end
-
-      should "truncate email subject" do
-        ActionMailer::Base.deliveries.clear
-        text = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLM".split('').join("123456789")
-        begin
-          raise text
-        rescue => ex
-          ExceptionHandling.log_error( ex )
-        end
-        assert_emails 1, ActionMailer::Base.deliveries.*.inspect
-        mail = ActionMailer::Base.deliveries.last
-        subject = "#{ExceptionHandling.email_environment} exception: RuntimeError: " + text
-        assert_equal subject[0,300], mail.subject
-      end
     end
 
     context "Exception mapping" do
       setup do
         @data = {
-          :environment=>{
+          environment: {
             'HTTP_HOST' => "localhost",
             'HTTP_REFERER' => "http://localhost/action/controller/instance",
           },
-          :session=>{
-            :data=>{
-              :affiliate_id=> defined?(Affiliate) ? Affiliate.first.id : '1',
-              :edit_mode=> true,
-              :advertiser_id=> defined?(Advertiser) ? Advertiser.first.id : '1',
-              :username_id=> defined?(Username) ? Username.first.id : '1',
-              :user_id=> defined?(User) ? User.first.id : '1',
-              :flash=>{},
-              :impersonated_organization_pk=> 'Advertiser_1'
+          session: {
+            data: {
+              affiliate_id: defined?(Affiliate) ? Affiliate.first.id : '1',
+              edit_mode: true,
+              advertiser_id: defined?(Advertiser) ? Advertiser.first.id : '1',
+              username_id: defined?(Username) ? Username.first.id : '1',
+              user_id: defined?(User) ? User.first.id : '1',
+              flash: {},
+              impersonated_organization_pk: 'Advertiser_1'
             }
           },
-          :request=>{},
-          :backtrace=>["[GEM_ROOT]/gems/actionpack-2.1.0/lib/action_controller/filters.rb:580:in `call_filters'", "[GEM_ROOT]/gems/actionpack-2.1.0/lib/action_controller/filters.rb:601:in `run_before_filters'"],
-          :api_key=>"none",
-          :error_class=>"StandardError",
-          :error=>'Some error message'
+          request: {},
+          backtrace: ["[GEM_ROOT]/gems/actionpack-2.1.0/lib/action_controller/filters.rb:580:in `call_filters'", "[GEM_ROOT]/gems/actionpack-2.1.0/lib/action_controller/filters.rb:601:in `run_before_filters'"],
+          api_key: "none",
+          error_class: "StandardError",
+          error: 'Some error message'
         }
       end
 
@@ -1130,7 +1045,7 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
       should "take in additional key word args as logging context and pass them to the logger" do
         ExceptionHandling.log_periodically(:test_context_with_periodic, 30.minutes, "this will be written", service_name: 'exception_handling')
         assert_not_empty logged_excluding_reload_filter.last[:context]
-        assert_equal logged_excluding_reload_filter.last[:context], { service_name: 'exception_handling' }
+        assert_equal logged_excluding_reload_filter.last[:context], service_name: 'exception_handling'
       end
 
       should "log immediately when we are expected to log" do
@@ -1164,7 +1079,7 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
   end
 
   def exception_1
-    @ex1 ||=
+    @exception_1 ||=
       begin
         raise StandardError, "Exception 1"
       rescue => ex
@@ -1173,7 +1088,7 @@ class ExceptionHandlingTest < ActiveSupport::TestCase
   end
 
   def exception_2
-    @ex2 ||=
+    @exception_2 ||=
       begin
         raise StandardError, "Exception 2"
       rescue => ex