exception_handling 2.2.1 → 2.3.0.pre.1

data/test/unit/exception_handling/exception_catalog_test.rb

@@ -1,12 +1,14 @@
-require File.expand_path('../../../test_helper',  __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('../../test_helper',  __dir__)
 
 module ExceptionHandling
   class ExceptionCatalogTest < ActiveSupport::TestCase
 
     context "With stubbed yaml content" 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 { filter_list }
 
         # bump modified time up to get the above filter loaded
@@ -16,7 +18,7 @@ module ExceptionHandling
       context "with loaded data" do
         setup do
           stub(File).mtime { incrementing_mtime }
-          @exception_catalog = ExceptionCatalog.new( ExceptionHandling.filter_list_filename )
+          @exception_catalog = ExceptionCatalog.new(ExceptionHandling.filter_list_filename)
           @exception_catalog.send :load_file
         end
 
@@ -25,7 +27,7 @@ module ExceptionHandling
         end
 
         should "find messages in the catalog" do
-          assert !@exception_catalog.find( error: "Scott says unlikely to ever match" )
+          assert !@exception_catalog.find(error: "Scott says unlikely to ever match")
         end
 
         should "find matching data" do
@@ -36,29 +38,28 @@ module ExceptionHandling
       end
 
       should "write errors loading the yaml file directly to the log file" do
-        @exception_catalog = ExceptionCatalog.new( ExceptionHandling.filter_list_filename )
+        @exception_catalog = ExceptionCatalog.new(ExceptionHandling.filter_list_filename)
 
         mock(ExceptionHandling).log_error.never
-        mock(ExceptionHandling).write_exception_to_log(anything(), "ExceptionCatalog#refresh_filters: ./config/exception_filters.yml", anything())
-        mock(@exception_catalog).load_file { raise "noooooo"}
+        mock(ExceptionHandling).write_exception_to_log(anything, "ExceptionCatalog#refresh_filters: ./config/exception_filters.yml", anything)
+        mock(@exception_catalog).load_file { raise "noooooo" }
 
         @exception_catalog.find({})
       end
-
     end
 
     context "with live yaml content" do
       setup do
-        @filename = File.expand_path('../../../../config/exception_filters.yml',  __FILE__)
-        @exception_catalog = ExceptionCatalog.new( @filename )
+        @filename = File.expand_path('../../../config/exception_filters.yml',  __dir__)
+        @exception_catalog = ExceptionCatalog.new(@filename)
         assert_nothing_raised "Loading the exception filter should not raise" do
           @exception_catalog.send :load_file
         end
       end
 
       should "load the filter data" do
-        assert !@exception_catalog.find( error: "Scott says unlikely to ever match" )
-        assert !@exception_catalog.find( error: "Scott says unlikely to ever match" )
+        assert !@exception_catalog.find(error: "Scott says unlikely to ever match")
+        assert !@exception_catalog.find(error: "Scott says unlikely to ever match")
       end
     end
 
@@ -69,7 +70,7 @@ module ExceptionHandling
 
       should "not load filter data" do
         mock(ExceptionHandling).write_exception_to_log.with_any_args.never
-        @exception_catalog.find( error: "Scott says unlikely to ever match" )
+        @exception_catalog.find(error: "Scott says unlikely to ever match")
       end
     end
 

data/test/unit/exception_handling/exception_description_test.rb

@@ -1,23 +1,24 @@
-require File.expand_path('../../../test_helper',  __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('../../test_helper',  __dir__)
 
 module ExceptionHandling
   class ExceptionDescriptionTest < ActiveSupport::TestCase
 
     context "Filter" do
-
       should "allow direct matching of strings" do
-        @f = ExceptionDescription.new(:filter1, :error => "my error message" )
-        assert @f.match?( 'error' => "my error message")
+        @f = ExceptionDescription.new(:filter1, error: "my error message")
+        assert @f.match?('error' => "my error message")
       end
 
       should "allow direct matching of strings on with symbol keys" do
-        @f = ExceptionDescription.new(:filter1, :error => "my error message" )
-        assert @f.match?( :error => "my error message")
+        @f = ExceptionDescription.new(:filter1, error: "my error message")
+        assert @f.match?(error: "my error message")
       end
 
       should "allow wildcards to cross line boundries" do
-        @f = ExceptionDescription.new(:filter1, :error => "my error message.*with multiple lines" )
-        assert @f.match?( :error => "my error message\nwith more than one, with multiple lines")
+        @f = ExceptionDescription.new(:filter1, error: "my error message.*with multiple lines")
+        assert @f.match?(error: "my error message\nwith more than one, with multiple lines")
       end
 
       should "complain when no regexps have a value" do
@@ -28,12 +29,6 @@ module ExceptionHandling
         assert_raise(ArgumentError, "Unknown section: not_a_parameter") { ExceptionDescription.new(:filter1, error: "my error message", not_a_parameter: false) }
       end
 
-      should "allow send email to be specified" do
-        assert !ExceptionDescription.new(:filter1, error: "my error message", send_email: false ).send_email
-        assert ExceptionDescription.new(:filter1, error: "my error message", send_email: true ).send_email
-        assert !ExceptionDescription.new(:filter1, error: "my error message" ).send_email
-      end
-
       should "allow send_to_honeybadger to be specified and have it disabled by default" do
         assert !ExceptionDescription.new(:filter1, error: "my error message", send_to_honeybadger: false).send_to_honeybadger
         assert ExceptionDescription.new(:filter1, error: "my error message", send_to_honeybadger: true).send_to_honeybadger
@@ -41,37 +36,35 @@ module ExceptionHandling
       end
 
       should "allow send_metric to be configured" do
-        assert !ExceptionDescription.new(:filter1, error: "my error message", send_metric: false ).send_metric
-        assert ExceptionDescription.new(:filter1, error: "my error message", send_email: true ).send_metric
-        assert ExceptionDescription.new(:filter1, error: "my error message" ).send_metric
+        assert !ExceptionDescription.new(:filter1, error: "my error message", send_metric: false).send_metric
+        assert ExceptionDescription.new(:filter1, error: "my error message").send_metric
       end
 
       should "provide metric name" do
-        assert_equal "filter1", ExceptionDescription.new(:filter1, error: "my error message" ).metric_name
-        assert_equal "some_other_metric_name", ExceptionDescription.new(:filter1, error: "my error message", metric_name: :some_other_metric_name ).metric_name
+        assert_equal "filter1", ExceptionDescription.new(:filter1, error: "my error message").metric_name
+        assert_equal "some_other_metric_name", ExceptionDescription.new(:filter1, error: "my error message", metric_name: :some_other_metric_name).metric_name
       end
 
       should "replace spaces in metric name" do
-        @f = ExceptionDescription.new(:"filter has spaces", :error => "my error message" )
+        @f = ExceptionDescription.new(:"filter has spaces", error: "my error message")
         assert_equal "filter_has_spaces", @f.metric_name
       end
 
       should "allow notes to be recorded" do
-        assert_nil ExceptionDescription.new(:filter1, error: "my error message" ).notes
-        assert_equal "a long string", ExceptionDescription.new(:filter1, error: "my error message", notes: "a long string" ).notes
+        assert_nil ExceptionDescription.new(:filter1, error: "my error message").notes
+        assert_equal "a long string", ExceptionDescription.new(:filter1, error: "my error message", notes: "a long string").notes
       end
 
       should "not consider config options in the filter set" do
-        assert ExceptionDescription.new(:filter1, error: "my error message", send_email: false ).match?( :error => "my error message")
-        assert ExceptionDescription.new(:filter1, error: "my error message", send_metric: false ).match?( :error => "my error message")
-        assert ExceptionDescription.new(:filter1, error: "my error message", metric_name: "false" ).match?( :error => "my error message")
-        assert ExceptionDescription.new(:filter1, error: "my error message", notes: "hey" ).match?( :error => "my error message")
+        assert ExceptionDescription.new(:filter1, error: "my error message", send_metric: false).match?(error: "my error message")
+        assert ExceptionDescription.new(:filter1, error: "my error message", metric_name: "false").match?(error: "my error message")
+        assert ExceptionDescription.new(:filter1, error: "my error message", notes: "hey").match?(error: "my error message")
       end
 
       should "provide exception details" do
-        exception_description = ExceptionDescription.new(:filter1, error: "my error message", notes: "hey" )
+        exception_description = ExceptionDescription.new(:filter1, error: "my error message", notes: "hey")
 
-        expected = {"send_metric" => true, "metric_name" => "filter1", "notes" => "hey"}
+        expected = { "send_metric" => true, "metric_name" => "filter1", "notes" => "hey" }
 
         assert_equal expected, exception_description.exception_data
       end
@@ -80,12 +73,10 @@ module ExceptionHandling
         mobi = "ExceptionHandling::Warning: LoginAttempt::IPAddressLocked: failed login for 'mcc@mobistreak.com'"
         credit = "ExceptionHandling::Warning: LoginAttempt::IPAddressLocked: failed login for 'damon@thecreditpros.com'"
 
-        exception_description = ExceptionDescription.new(:filter1, error: "ExceptionHandling::Warning: LoginAttempt::IPAddressLocked: failed login for '(mcc\@mobistreak|damon\@thecreditpros).com'" )
+        exception_description = ExceptionDescription.new(:filter1, error: "ExceptionHandling::Warning: LoginAttempt::IPAddressLocked: failed login for '(mcc\@mobistreak|damon\@thecreditpros).com'")
         assert exception_description.match?(error: mobi), "does not match mobi"
         assert exception_description.match?(error: credit), "does not match credit"
       end
-
     end
-
   end
 end

data/test/unit/exception_handling/exception_info_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'
 
@@ -228,10 +230,12 @@ module ExceptionHandling
           "session" => {
             "key" => "session_key",
             "data" => { "username" => "jsmith", "id" => "session_key" },
-            "to_s" => "data:\n  id: session_key\n  username: jsmith\nkey: session_key\n" },
+            "to_s" => "data:\n  id: session_key\n  username: jsmith\nkey: session_key\n"
+          },
           "environment" => {
             "SERVER_NAME" => "exceptional.com",
-            "to_s" => "SERVER_NAME: exceptional.com\n" },
+            "to_s" => "SERVER_NAME: exceptional.com\n"
+          },
           "request" => {
             "params" => { "advertiser_id" => 435, "controller" => "dummy", "action" => "fail" },
             "rails_root" => "Rails.root not defined. Is this a test environment?",
@@ -249,11 +253,11 @@ module ExceptionHandling
         @controller.request.parameters[:user] = { "password" => "also super secret", "password_confirmation" => "also super secret" }
         exception_info = ExceptionInfo.new(@exception, @exception_context, @timestamp, @controller)
         expected_params = {
-          "password"      => "[FILTERED]",
+          "password" => "[FILTERED]",
           "advertiser_id" => 435, "controller" => "dummy",
-          "action"        => "fail",
-          "user"          => {
-            "password"              => "[FILTERED]",
+          "action" => "fail",
+          "user" => {
+            "password" => "[FILTERED]",
             "password_confirmation" => "[FILTERED]"
           }
         }
@@ -296,7 +300,7 @@ module ExceptionHandling
       end
 
       should "log info if the custom data hook results in a nil message exception" do
-        ExceptionHandling.custom_data_hook = lambda do |data|
+        ExceptionHandling.custom_data_hook = ->(_data) do
           raise_exception_with_nil_message
         end
         log_info_messages = []
@@ -345,9 +349,40 @@ module ExceptionHandling
       end
     end
 
+    context "controller_name" do
+      setup do
+        @exception = StandardError.new('something went wrong')
+        @timestamp = Time.now
+        @exception_context = {
+          'rack.session' => {
+            user_id: 23,
+            user_name: 'John'
+          },
+          'SERVER_NAME' => 'exceptional.com'
+        }
+      end
+
+      should "return controller_name when controller is present" do
+        env         = { server:     'fe98' }
+        parameters  = { controller: 'some_controller' }
+        session     = { username:   'smith' }
+        request_uri = "host/path"
+        controller  = create_dummy_controller(env, parameters, session, request_uri)
+        exception_info = ExceptionInfo.new(@exception, @exception_context, @timestamp, controller)
+
+        assert_equal 'some_controller', exception_info.controller_name
+      end
+
+      should "return an empty string when controller is not present" do
+        exception_info = ExceptionInfo.new(@exception, @exception_context, @timestamp)
+
+        assert_equal '', exception_info.controller_name
+      end
+    end
+
     context "send_to_honeybadger?" do
       should "be enabled when Honeybadger is defined and exception is not in the filter list" do
-        stub(ExceptionHandling).honeybadger? { true }
+        stub(ExceptionHandling).honeybadger_defined? { true }
         exception = StandardError.new("something went wrong")
         exception_info = ExceptionInfo.new(exception, {}, Time.now)
         assert_nil exception_info.exception_description
@@ -355,7 +390,7 @@ module ExceptionHandling
       end
 
       should "be enabled when Honeybadger is defined and exception is on the filter list with the flag turned on" do
-        stub(ExceptionHandling).honeybadger? { true }
+        stub(ExceptionHandling).honeybadger_defined? { true }
         exception = StandardError.new("No route matches")
         exception_info = ExceptionInfo.new(exception, {}, Time.now)
         assert_not_nil exception_info.exception_description
@@ -364,7 +399,7 @@ module ExceptionHandling
       end
 
       should "be disabled when Honeybadger is defined and exception is on the filter list with the flag turned off" do
-        stub(ExceptionHandling).honeybadger? { true }
+        stub(ExceptionHandling).honeybadger_defined? { true }
         exception = StandardError.new("No route matches")
         exception_info = ExceptionInfo.new(exception, {}, Time.now)
         assert_not_nil exception_info.exception_description
@@ -373,7 +408,7 @@ module ExceptionHandling
       end
 
       should "be disabled when Honeybadger is not defined" do
-        stub(ExceptionHandling).honeybadger? { false }
+        stub(ExceptionHandling).honeybadger_defined? { false }
         exception = StandardError.new("something went wrong")
         exception_info = ExceptionInfo.new(exception, {}, Time.now)
         assert_nil exception_info.exception_description
@@ -390,10 +425,11 @@ module ExceptionHandling
         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" }
         data_callback = ->(data) do
           data[:scm_revision] = "5b24eac37aaa91f5784901e9aabcead36fd9df82"
@@ -415,46 +451,49 @@ module ExceptionHandling
           request: {
             "params" => { "advertiser_id" => 435 },
             "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, exception_info.honeybadger_context_data
       end
 
-      [ ['Hash',   { 'cookie' => 'cookie_context' } ],
-        ['String', 'Entering Error State'           ],
-        ['Array',  ['Error1', 'Error2']             ]].each do |klass, value|
-
-          should "extract context from exception_context when it is a #{klass}" do
-            exception = StandardError.new("Exception")
-            exception_context = value
-            exception_info = ExceptionInfo.new(exception, exception_context, Time.now)
+      [['Hash',   { 'cookie' => 'cookie_context' }],
+       ['String', 'Entering Error State'],
+       ['Array',  ['Error1', 'Error2']]].each do |klass, value|
+        should "extract context from exception_context when it is a #{klass}" do
+          exception = StandardError.new("Exception")
+          exception_context = value
+          exception_info = ExceptionInfo.new(exception, exception_context, Time.now)
 
-            assert_equal klass, value.class.name
-            assert_equal value, exception_info.honeybadger_context_data[:exception_context]
-          end
+          assert_equal klass, value.class.name
+          assert_equal value, exception_info.honeybadger_context_data[:exception_context]
+        end
       end
 
       should "filter out sensitive data from exception context such as [password, password_confirmation, oauth_token]" do
         sensitive_data = {
-          "password"              => "super_secret",
+          "password" => "super_secret",
           "password_confirmation" => "super_secret_confirmation",
-          "oauth_token"           => "super_secret_oauth_token"
+          "oauth_token" => "super_secret_oauth_token"
         }
 
         exception         = StandardError.new("boom")
         exception_context = {
           "SERVER_NAME" => "exceptional.com",
-          "one_layer"   => sensitive_data,
-          "two_layers"  => {
+          "one_layer" => sensitive_data,
+          "two_layers" => {
             "sensitive_data" => sensitive_data
           },
           "rack.request.form_vars" => "username=investor%40invoca.com&password=my_special_password&commit=Log+In",
@@ -468,8 +507,8 @@ module ExceptionHandling
         expected_sensitive_data = ["password", "password_confirmation", "oauth_token"].build_hash { |key| [key, "[FILTERED]"] }
         expected_exception_context = {
           "SERVER_NAME" => "exceptional.com",
-          "one_layer"   => expected_sensitive_data,
-          "two_layers"  => {
+          "one_layer" => expected_sensitive_data,
+          "two_layers" => {
             "sensitive_data" => expected_sensitive_data
           },
           "rack.request.form_vars" => "username=investor%40invoca.com&password=[FILTERED]&commit=Log+In",
@@ -491,7 +530,7 @@ module ExceptionHandling
     end
 
     def prepare_data(data)
-      data.each do |key, section|
+      data.each do |_key, section|
         if section.is_a?(Hash)
           section.delete(:to_s)
         end

data/test/unit/exception_handling/honeybadger_callbacks_test.rb

@@ -1,4 +1,6 @@
-require File.expand_path('../../../test_helper',  __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('../../test_helper',  __dir__)
 
 module ExceptionHandling
   class HoneybadgerCallbacksTest < ActiveSupport::TestCase
@@ -34,6 +36,24 @@ module ExceptionHandling
       end
     end
 
+    class TestRaiseOnInspect < TestPoroWithAttribute
+      def inspect
+        raise "some error"
+      end
+    end
+
+    class TestRaiseOnInspectWithId < TestRaiseOnInspect
+      def id
+        123
+      end
+    end
+
+    class TestRaiseOnInspectWithToPk < TestRaiseOnInspect
+      def to_pk
+        "SomeRecord-123"
+      end
+    end
+
     context "register_callbacks" do
       should "store the callbacks in the honeybadger object" do
         HoneybadgerCallbacks.register_callbacks
@@ -46,37 +66,54 @@ module ExceptionHandling
       should "not inspect String, Hash, Array, Set, Numeric, TrueClass, FalseClass, NilClass" do
         [
           ['test', String],
-          [{a: 1}, Hash],
-          [[1,2], Array],
-          [Set.new([1,2]), Set],
+          [{ a: 1 }, Hash],
+          [[1, 2], Array],
+          [Set.new([1, 2]), Set],
           [4.5, Numeric],
           [true, TrueClass],
           [false, FalseClass],
           [nil, NilClass]
         ].each do |object, expected_class|
-          result = HoneybadgerCallbacks.local_variable_filter(:variable_name, object, [])
+          result = HoneybadgerCallbacks.send(:local_variable_filter, :variable_name, object, [])
           assert result.is_a?(expected_class), "Expected #{expected_class.name} but got #{result.class.name}"
         end
       end
 
       should "inspect other classes" do
-        result = HoneybadgerCallbacks.local_variable_filter(:variable_name, TestPoroWithAttribute.new, ['password'])
+        result = HoneybadgerCallbacks.send(:local_variable_filter, :variable_name, TestPoroWithAttribute.new, ['password'])
         assert_match(/#<ExceptionHandling::HoneybadgerCallbacksTest::TestPoroWithAttribute:.* @test_attribute="test">/, result)
       end
 
+      context "when inspect raises exceptions" do
+        should "handle exceptions for objects" do
+          result = HoneybadgerCallbacks.send(:local_variable_filter, :variable_name, TestRaiseOnInspect.new, ['password'])
+          assert_equal "#<ExceptionHandling::HoneybadgerCallbacksTest::TestRaiseOnInspect [error 'RuntimeError: some error' while calling #inspect]>", result
+        end
+
+        should "handle exceptions for objects responding to id" do
+          result = HoneybadgerCallbacks.send(:local_variable_filter, :variable_name, TestRaiseOnInspectWithId.new, ['password'])
+          assert_equal "#<ExceptionHandling::HoneybadgerCallbacksTest::TestRaiseOnInspectWithId @id=123 [error 'RuntimeError: some error' while calling #inspect]>", result
+        end
+
+        should "handle exceptions for objects responding to to_pik" do
+          result = HoneybadgerCallbacks.send(:local_variable_filter, :variable_name, TestRaiseOnInspectWithToPk.new, ['password'])
+          assert_equal "#<ExceptionHandling::HoneybadgerCallbacksTest::TestRaiseOnInspectWithToPk @pk=SomeRecord-123 [error 'RuntimeError: some error' while calling #inspect]>", result
+        end
+      end
+
       context "not inspect objects that contain filter keys" do
         should "use to_pk if available, even if id is available" do
-          result = HoneybadgerCallbacks.local_variable_filter(:variable_name, TestPoroWithFilteredAttributePkAndId.new, ['password'])
+          result = HoneybadgerCallbacks.send(:local_variable_filter, :variable_name, TestPoroWithFilteredAttributePkAndId.new, ['password'])
           assert_match(/#<ExceptionHandling::HoneybadgerCallbacksTest::TestPoroWithFilteredAttributePkAndId @pk=TestPoroWithFilteredAttributePkAndId_1, \[FILTERED\]>/, result)
         end
 
         should "use id if to_pk is not available" do
-          result = HoneybadgerCallbacks.local_variable_filter(:variable_name, TestPoroWithFilteredAttributeAndId.new, ['password'])
+          result = HoneybadgerCallbacks.send(:local_variable_filter, :variable_name, TestPoroWithFilteredAttributeAndId.new, ['password'])
           assert_match(/#<ExceptionHandling::HoneybadgerCallbacksTest::TestPoroWithFilteredAttributeAndId @id=1, \[FILTERED\]>/, result)
         end
 
         should "print the object name if no id or to_pk" do
-          result = HoneybadgerCallbacks.local_variable_filter(:variable_name, TestPoroWithFilteredAttribute.new, ['password'])
+          result = HoneybadgerCallbacks.send(:local_variable_filter, :variable_name, TestPoroWithFilteredAttribute.new, ['password'])
           assert_match(/#<ExceptionHandling::HoneybadgerCallbacksTest::TestPoroWithFilteredAttribute \[FILTERED\]>/, result)
         end
       end

data/test/unit/exception_handling/log_error_stub_test.rb

@@ -1,4 +1,6 @@
-require File.expand_path('../../../test_helper',  __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('../../test_helper',  __dir__)
 
 module ExceptionHandling
   class LogErrorStubTest < ActiveSupport::TestCase
@@ -18,7 +20,7 @@ module ExceptionHandling
         begin
           ExceptionHandling.log_error("Something happened")
           flunk
-        rescue Exception => ex #LogErrorStub::UnexpectedExceptionLogged => ex
+        rescue Exception => ex # LogErrorStub::UnexpectedExceptionLogged => ex
           assert ex.to_s.starts_with?("StandardError: Something happened"), ex.to_s
         end
 
@@ -28,8 +30,8 @@ module ExceptionHandling
         rescue => ex
           begin
             ExceptionHandling.log_error(ex)
-          rescue LogErrorStub::UnexpectedExceptionLogged => ex_inner
-            assert ex_inner.to_s.starts_with?("RaisedError: This should raise"), ex_inner.to_s
+          rescue LogErrorStub::UnexpectedExceptionLogged => ex
+            assert ex.to_s.starts_with?("RaisedError: This should raise"), ex.to_s
           end
         end
       end

data/test/unit/exception_handling/mailer_test.rb

@@ -1,4 +1,6 @@
-require File.expand_path('../../../test_helper',  __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('../../test_helper',  __dir__)
 
 module ExceptionHandling
   class MailerTest < ActionMailer::TestCase
@@ -18,14 +20,6 @@ module ExceptionHandling
         ExceptionHandling.escalation_recipients = ['test_escalation@invoca.com']
       end
 
-      should "deliver" do
-        #ActionMailer::Base.delivery_method = :smtp
-        result = ExceptionHandling::Mailer.exception_notification({ :error => "Test Error."}).deliver_now
-        assert_match(/Test Error./, result.body.to_s)
-        assert_equal_with_diff ['test_exception@invoca.com'], result.to
-        assert_emails 1
-      end
-
       context "log_parser_exception_notification" do
         should "send with string" do
           result = ExceptionHandling::Mailer.log_parser_exception_notification("This is my fake error", "My Fake Subj").deliver_now
@@ -46,7 +40,7 @@ module ExceptionHandling
           ExceptionHandling.email_environment = 'Staging Full'
           ExceptionHandling.server_name = 'test-fe3'
 
-          ExceptionHandling::Mailer.escalation_notification("Your Favorite <b>Feature<b> Failed", :error_string => "It failed because of an error\n <i>More Info<i>", :timestamp => 1234567 ).deliver_now
+          ExceptionHandling::Mailer.escalation_notification("Your Favorite <b>Feature<b> Failed", error_string: "It failed because of an error\n <i>More Info<i>", timestamp: 1234567).deliver_now
 
           assert_emails 1
           result = ActionMailer::Base.deliveries.last
@@ -56,18 +50,18 @@ module ExceptionHandling
           assert_equal "Staging Full Escalation: Your Favorite <b>Feature<b> Failed", result.subject
           assert_select "title", "Exception Escalation"
           assert_select "html" do
-            assert_select "body br", { :count => 4 }, result.body.to_s # plus 1 for the multiline summary
+            assert_select "body br", { count: 4 }, result.body.to_s # plus 1 for the multiline summary
             assert_select "body h3", "Your Favorite <b>Feature<b> Failed", result.body.to_s
             assert_select "body", /1234567/
             assert_select "body", /It failed because of an error/
             assert_select "body", /\n <i>More Info<i>/
             assert_select "body", /test-fe3/
-            #assert_select "body", /#{Web::Application::GIT_REVISION}/
+            # assert_select "body", /#{Web::Application::GIT_REVISION}/
           end
         end
 
         should "use defaults for missing fields" do
-          result = ExceptionHandling::Mailer.escalation_notification("Your Favorite Feature Failed", :error_string => "It failed because of an error\n More Info")
+          result = ExceptionHandling::Mailer.escalation_notification("Your Favorite Feature Failed", error_string: "It failed because of an error\n More Info")
           @body_html = Nokogiri::HTML(result.body.to_s)
 
           assert_equal_with_diff ['test_escalation@invoca.com'], result.to
@@ -93,7 +87,7 @@ module ExceptionHandling
             ExceptionHandling.production_support_recipients = recipients
             ExceptionHandling.last_exception_timestamp = Time.now.to_i
 
-            mock(ExceptionHandling).escalate_custom(subject, exception, Time.now.to_i, recipients)
+            mock(ExceptionHandling).escalate(subject, exception, Time.now.to_i, recipients)
             ExceptionHandling.escalate_to_production_support(exception, subject)
           end
         end

data/test/unit/exception_handling/methods_test.rb

@@ -1,9 +1,12 @@
-require File.expand_path('../../../test_helper',  __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('../../test_helper',  __dir__)
 
 require "exception_handling/testing"
 
 module ExceptionHandling
   class MethodsTest < ActiveSupport::TestCase
+    include ExceptionHelpers
 
     def dont_stub_log_error
       true
@@ -25,13 +28,13 @@ module ExceptionHandling
       end
 
       should "use the current_controller when available" do
-        mock(Honeybadger).notify(anything)
+        capture_notifications
+
         mock(ExceptionHandling.logger).fatal(/blah/, anything)
         @controller.simulate_around_filter do
-          ExceptionHandling.log_error( ArgumentError.new("blah") )
-          mail = ActionMailer::Base.deliveries.last
-          assert_match( @controller.request.request_uri, mail.body.to_s )
-        # assert_match( Username.first.username.to_s, mail.body.to_s ) if defined?(Username)
+          ExceptionHandling.log_error(ArgumentError.new("blah"))
+          assert_equal 1, sent_notifications.size, sent_notifications.inspect
+          assert_match(@controller.request.request_uri, sent_notifications.last.enhanced_data['request'].to_s)
         end
       end