@@ -14,7 +14,9 @@ module HoptoadNotifier # Overrides the rescue_action method in ActionController::Base, but does not inhibit # any custom processing that is defined with Rails 2's exception helpers. def rescue_action_in_public_with_hoptoad(exception) - HoptoadNotifier.notify_or_ignore(exception, :request => request) + unless ignore_user_agent? + HoptoadNotifier.notify_or_ignore(exception, :request => request) + end rescue_action_in_public_without_hoptoad(exception) end lib/hoptoad_notifier/catcher.rb @@ -4,18 +4,6 @@ class CatcherTest < Test::Unit::TestCase include DefinesConstants - class CollectingSender - attr_reader :collected - - def initialize - @collected = [] - end - - def send_to_hoptoad(data) - @collected << data - end - end - def setup super reset_config @@ -44,6 +32,13 @@ class CatcherTest < Test::Unit::TestCase local end end + if opts[:user_agent] + if opts[:request].respond_to?(:user_agent=) + opts[:request].user_agent = opts[:user_agent] + else + opts[:request].env["HTTP_USER_AGENT"] = opts[:user_agent] + end + end klass.consider_all_requests_local = opts[:all_local] klass.local = opts[:local] controller = klass.new @@ -132,12 +127,21 @@ class CatcherTest < Test::Unit::TestCase end end - def assert_caught_and_sent - assert !HoptoadNotifier.sender.collected.empty? + should "ignore exceptions when user agent is being ignored by regular expression" do + HoptoadNotifier.configuration.ignore_user_agent_only = [/Ignored/] + process_action(:user_agent => 'ShouldBeIgnored') { raise 'Oh no' } + assert_caught_and_not_sent end - def assert_caught_and_not_sent - assert HoptoadNotifier.sender.collected.empty? + should "ignore exceptions when user agent is being ignored by string" do + HoptoadNotifier.configuration.ignore_user_agent_only = ['IgnoredUserAgent'] + process_action(:user_agent => 'IgnoredUserAgent') { raise 'Oh no' } + assert_caught_and_not_sent end + should "not ignore exceptions when user agent is not being ignored" do + HoptoadNotifier.configuration.ignore_user_agent_only = ['IgnoredUserAgent'] + process_action(:user_agent => 'NonIgnoredAgent') { raise 'Oh no' } + assert_caught_and_sent + end end test/catcher_test.rb @@ -13,19 +13,19 @@ end def should_notify_normally should "send even ignored exceptions if told manually" do - expect_something_sent @controller.expects(:rescue_action_in_public_without_hoptoad).never assert_nothing_raised do request("manual_notify_ignored") end + assert_caught_and_sent end should "ignore default exceptions" do - expect_nothing_sent @controller.expects(:rescue_action_in_public_without_hoptoad) assert_nothing_raised do request("do_raise_ignored") end + assert_caught_and_not_sent end should "send session data to hoptoad when the session has @data" do @@ -61,14 +61,6 @@ class ControllerTest < Test::Unit::TestCase @controller.stubs(:local_request? => false) end - def expect_something_sent - HoptoadNotifier.sender.expects(:send_to_hoptoad).with(anything) - end - - def expect_nothing_sent - HoptoadNotifier.sender.expects(:send_to_hoptoad).never - end - context "when auto-included" do setup do HoptoadNotifier.configure do |config| @@ -87,7 +79,7 @@ class ControllerTest < Test::Unit::TestCase @controller = ::AutoIncludeController.new stub_public_request! - stub_sender! + HoptoadNotifier.sender = CollectingSender.new end context "when included through the configure block" do @@ -187,28 +179,26 @@ class ControllerTest < Test::Unit::TestCase end reset_config stub_public_request! - stub_sender! + HoptoadNotifier.sender = CollectingSender.new end should_notify_normally context "and configured to ignore_by_filter" do setup do - HoptoadNotifier.configure do |config| - config.ignore_by_filter do |exception_data| - if exception_data[:error_class] == "RuntimeError" - true if exception_data[:request][:params]['blah'] == 'skip' - end + HoptoadNotifier.configuration.ignore_by_filter do |exception_data| + if exception_data[:error_class] == "RuntimeError" + true if exception_data[:request][:params]['blah'] == 'skip' end end end should "ignore exceptions based on param data" do - expect_nothing_sent @controller.expects(:rescue_action_in_public_without_hoptoad) assert_nothing_raised do request("do_raise", "get", nil, :blah => 'skip') end + assert_caught_and_not_sent end end @@ -218,27 +208,27 @@ class ControllerTest < Test::Unit::TestCase end should "still ignore default exceptions" do - expect_nothing_sent @controller.expects(:rescue_action_in_public_without_hoptoad) assert_nothing_raised do request("do_raise_ignored") end + assert_caught_and_not_sent end should "ignore specified exceptions" do - expect_nothing_sent @controller.expects(:rescue_action_in_public_without_hoptoad) assert_nothing_raised do request("do_raise_not_ignored") end + assert_caught_and_not_sent end should "not ignore unspecified, non-default exceptions" do - expect_something_sent @controller.expects(:rescue_action_in_public_without_hoptoad) assert_nothing_raised do request("do_raise") end + assert_caught_and_sent end end @@ -248,69 +238,54 @@ class ControllerTest < Test::Unit::TestCase end should "no longer ignore default exceptions" do - expect_something_sent @controller.expects(:rescue_action_in_public_without_hoptoad) assert_nothing_raised do request("do_raise_ignored") end + assert_caught_and_sent end should "ignore specified exceptions" do - expect_nothing_sent @controller.expects(:rescue_action_in_public_without_hoptoad) assert_nothing_raised do request("do_raise_not_ignored") end + assert_caught_and_not_sent end should "not ignore unspecified, non-default exceptions" do - expect_something_sent @controller.expects(:rescue_action_in_public_without_hoptoad) assert_nothing_raised do request("do_raise") end + assert_caught_and_sent end end - context "and configured to ignore certain user agents" do - setup do - HoptoadNotifier.configuration.ignore_user_agent << /Ignored/ - HoptoadNotifier.configuration.ignore_user_agent << 'IgnoredUserAgent' - end - - should "ignore exceptions when user agent is being ignored" do - expect_nothing_sent - @controller.expects(:rescue_action_in_public_without_hoptoad) - assert_nothing_raised do - request("do_raise", :get, 'IgnoredUserAgent') - end - end - - should "ignore exceptions when user agent is being ignored (regexp)" do - HoptoadNotifier.configuration.ignore_user_agent_only = [/Ignored/] - expect_nothing_sent - @controller.expects(:rescue_action_in_public_without_hoptoad) - assert_nothing_raised do - request("do_raise", :get, 'IgnoredUserAgent') - end + should "ignore exceptions when user agent is being ignored by regular expression" do + HoptoadNotifier.configuration.ignore_user_agent_only = [/Ignored/] + @controller.expects(:rescue_action_in_public_without_hoptoad) + assert_nothing_raised do + request("do_raise", :get, 'IgnoredUserAgent') end + assert_caught_and_not_sent + end - should "ignore exceptions when user agent is being ignored (string)" do - HoptoadNotifier.configuration.ignore_user_agent_only = ['IgnoredUserAgent'] - expect_nothing_sent - @controller.expects(:rescue_action_in_public_without_hoptoad) - assert_nothing_raised do - request("do_raise", :get, 'IgnoredUserAgent') - end + should "ignore exceptions when user agent is being ignored by string" do + HoptoadNotifier.configuration.ignore_user_agent_only = ['IgnoredUserAgent'] + @controller.expects(:rescue_action_in_public_without_hoptoad) + assert_nothing_raised do + request("do_raise", :get, 'IgnoredUserAgent') end + assert_caught_and_not_sent + end - should "not ignore exceptions when user agent is not being ignored" do - expect_something_sent - @controller.expects(:rescue_action_in_public_without_hoptoad) - assert_nothing_raised do - request("do_raise") - end + should "not ignore exceptions when user agent is not being ignored" do + @controller.expects(:rescue_action_in_public_without_hoptoad) + assert_nothing_raised do + request("do_raise") end + assert_caught_and_sent end end end test/controller_test.rb @@ -148,6 +148,15 @@ class Test::Unit::TestCase } } end + + def assert_caught_and_sent + assert !HoptoadNotifier.sender.collected.empty? + end + + def assert_caught_and_not_sent + assert HoptoadNotifier.sender.collected.empty? + end + end module DefinesConstants @@ -185,6 +194,19 @@ class Array end end end + +end + +class CollectingSender + attr_reader :collected + + def initialize + @collected = [] + end + + def send_to_hoptoad(data) + @collected << data + end end class FakeLogger test/helper.rb 568a97350432f02d851fa08ce4cbcb88d02dab7e Joe Ferris jferris@metaphor.local http://github.com/thoughtbot/hoptoad_notifier/commit/4532c9fe6fccd547aeee6c1964bd802ff854ba53 4532c9fe6fccd547aeee6c1964bd802ff854ba53 2009-11-05T08:12:09-08:00 2009-07-31T12:28:53-07:00 Restored user agent ignoring 8c87c45e455c65eca2e21090590a2a05d9a2c97e Joe Ferris jferris@metaphor.local