airbrake 3.1.12 → 3.1.13

data/test/helper.rb

@@ -1,147 +1,39 @@
-require 'test/unit'
-require 'rubygems'
+$VERBOSE = ENV["VERBOSE"]
 
-$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
-
-require 'thread'
-
-require 'mocha'
-
-require 'abstract_controller'
-require 'action_controller'
-require 'action_dispatch'
-require 'active_support/dependencies'
-require 'active_model'
-require 'active_record'
-require 'active_support/core_ext/kernel/reporting'
-
-require 'nokogiri'
-require 'rack'
-require 'bourne'
-require 'sham_rack'
-require 'json-schema'
-
-require "airbrake"
-
-require "shoulda-matchers"
-require "shoulda-context"
-
-begin require 'redgreen'; rescue LoadError; end
-
-# Show backtraces for deprecated behavior for quicker cleanup.
-ActiveSupport::Deprecation.debug = true
-
-FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures')
-FIXTURES = Pathname.new(FIXTURE_LOAD_PATH)
-
-SharedTestRoutes = ActionDispatch::Routing::RouteSet.new
-
-class RoutedRackApp
-  attr_reader :routes
-
-  def initialize(routes, &blk)
-    @routes = routes
-    @stack = ActionDispatch::MiddlewareStack.new(&blk).build(@routes)
+module Kernel
+  def silence_warnings
+    with_warnings(nil) { yield }
   end
 
-  def call(env)
-    @stack.call(env)
+  def with_warnings(flag)
+    old_verbose, $VERBOSE = $VERBOSE, flag
+    yield
+  ensure
+    $VERBOSE = old_verbose
   end
 end
 
-unless defined?(ActionDispatch::IntegrationTest)
-  class ActionController::IntegrationTest < ActiveSupport::TestCase
-    def self.build_app(routes = nil)
-      RoutedRackApp.new(routes || ActionDispatch::Routing::RouteSet.new) do |middleware|
-        yield(middleware) if block_given?
-      end
-    end
-
-    self.app = build_app
-
-    # Stub Rails dispatcher so it does not get controller references and
-    # simply return the controller#action as Rack::Body.
-    class StubDispatcher < ::ActionDispatch::Routing::RouteSet::Dispatcher
-      protected
-      def controller_reference(controller_param)
-        controller_param
-      end
-
-      def dispatch(controller, action, env)
-        [200, {'Content-Type' => 'text/html'}, ["#{controller}##{action}"]]
-      end
-    end
-
-    def self.stub_controllers
-      old_dispatcher = ActionDispatch::Routing::RouteSet::Dispatcher
-      ActionDispatch::Routing::RouteSet.module_eval { remove_const :Dispatcher }
-      ActionDispatch::Routing::RouteSet.module_eval { const_set :Dispatcher, StubDispatcher }
-      yield ActionDispatch::Routing::RouteSet.new
-    ensure
-      ActionDispatch::Routing::RouteSet.module_eval { remove_const :Dispatcher }
-      ActionDispatch::Routing::RouteSet.module_eval { const_set :Dispatcher, old_dispatcher }
-    end
-
-    def with_routing(&block)
-      temporary_routes = ActionDispatch::Routing::RouteSet.new
-      old_app, self.class.app = self.class.app, self.class.build_app(temporary_routes)
-      old_routes = SharedTestRoutes
-      silence_warnings { Object.const_set(:SharedTestRoutes, temporary_routes) }
-
-      yield temporary_routes
-    ensure
-      self.class.app = old_app
-      silence_warnings { Object.const_set(:SharedTestRoutes, old_routes) }
-    end
-
-    def with_autoload_path(path)
-      path = File.join(File.dirname(__FILE__), "fixtures", path)
-      if ActiveSupport::Dependencies.autoload_paths.include?(path)
-        yield
-      else
-        begin
-          ActiveSupport::Dependencies.autoload_paths << path
-          yield
-        ensure
-          ActiveSupport::Dependencies.autoload_paths.reject! {|p| p == path}
-          ActiveSupport::Dependencies.clear
-        end
-      end
-    end
-  end
-end
-
-class ActionDispatch::IntegrationTest < ActiveSupport::TestCase
-  setup do
-    @routes = SharedTestRoutes
-  end
+silence_warnings do
+  require 'test/unit'
+  require 'rubygems'
+
+  require 'thread'
+
+  require 'mocha/setup'
+  require 'nokogiri'
+  require 'rack'
+  require 'bourne'
+  require 'sham_rack'
+  require 'json-schema'
+  require "shoulda-matchers"
+  require "shoulda-context"
+  begin require 'redgreen'; rescue LoadError; end
 end
 
+$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
 
 
-module ActionController
-  class Base
-    include ActionController::Testing
-  end
-
-  Base.view_paths = FIXTURE_LOAD_PATH
-
-  class TestCase
-    include ActionDispatch::TestProcess
-
-    setup do
-      @routes = SharedTestRoutes
-    end
-  end
-end
-
-# This stub emulates the Railtie including the URL helpers from a Rails application
-module ActionController
-  class Base
-    include SharedTestRoutes.url_helpers
-  end
-end
-
+require "airbrake"
 
 module TestMethods
   def rescue_action e
@@ -287,27 +179,6 @@ module DefinesConstants
   end
 end
 
-# Also stolen from AS 2.3.2
-class Array
-  # Wraps the object in an Array unless it's an Array.  Converts the
-  # object to an Array using #to_ary if it implements that.
-  def self.wrap(object)
-    case object
-    when nil
-      []
-    when self
-      object
-    else
-      if object.respond_to?(:to_ary)
-        object.to_ary
-      else
-        [object]
-      end
-    end
-  end
-
-end
-
 class CollectingSender
   attr_reader :collected
 
@@ -322,12 +193,15 @@ end
 
 class BacktracedException < Exception
   attr_accessor :backtrace
+
   def initialize(opts)
     @backtrace = opts[:backtrace]
   end
+
   def set_backtrace(bt)
     @backtrace = bt
   end
+
   def message
     "Something went wrong. Did you press the red button?"
   end

data/test/integration.rb

@@ -0,0 +1,15 @@
+require File.expand_path '../helper', __FILE__
+
+silence_warnings do
+  require 'abstract_controller'
+  require 'action_controller'
+  require 'action_dispatch'
+  require 'active_support/dependencies'
+  require 'active_support/core_ext/kernel/reporting'
+
+  require "erb"
+  require "action_view"
+end
+
+require File.expand_path "../integration/javascript_notifier_test", __FILE__
+require File.expand_path "../integration/catcher_test", __FILE__

data/test/{catcher_test.rb → integration/catcher_test.rb}

@@ -1,8 +1,119 @@
-require File.expand_path '../helper', __FILE__
-
 require 'airbrake/rails/controller_methods'
 require 'airbrake/rails/middleware'
 
+unless defined?(ActionDispatch::IntegrationTest) # Rails 3.0
+  # what follows is a dirty hack which makes
+  # AD::IntegrationTest possible in Rails 3.0
+  ActiveSupport::Deprecation.debug = true
+
+  FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures')
+  FIXTURES = Pathname.new(FIXTURE_LOAD_PATH)
+
+  SharedTestRoutes = ActionDispatch::Routing::RouteSet.new
+
+  class RoutedRackApp
+    attr_reader :routes
+
+    def initialize(routes, &blk)
+      @routes = routes
+      @stack = ActionDispatch::MiddlewareStack.new(&blk).build(@routes)
+    end
+
+    def call(env)
+      @stack.call(env)
+    end
+  end
+
+  class ActionController::IntegrationTest < ActiveSupport::TestCase
+    def self.build_app(routes = nil)
+      RoutedRackApp.new(routes || ActionDispatch::Routing::RouteSet.new) do |middleware|
+        yield(middleware) if block_given?
+      end
+    end
+
+    self.app = build_app
+
+    # Stub Rails dispatcher so it does not get controller references and
+    # simply return the controller#action as Rack::Body.
+    class StubDispatcher < ::ActionDispatch::Routing::RouteSet::Dispatcher
+      protected
+      def controller_reference(controller_param)
+        controller_param
+      end
+
+      def dispatch(controller, action, env)
+        [200, {'Content-Type' => 'text/html'}, ["#{controller}##{action}"]]
+      end
+    end
+
+    def self.stub_controllers
+      old_dispatcher = ActionDispatch::Routing::RouteSet::Dispatcher
+      ActionDispatch::Routing::RouteSet.module_eval { remove_const :Dispatcher }
+      ActionDispatch::Routing::RouteSet.module_eval { const_set :Dispatcher, StubDispatcher }
+      yield ActionDispatch::Routing::RouteSet.new
+    ensure
+      ActionDispatch::Routing::RouteSet.module_eval { remove_const :Dispatcher }
+      ActionDispatch::Routing::RouteSet.module_eval { const_set :Dispatcher, old_dispatcher }
+    end
+
+    def with_routing(&block)
+      temporary_routes = ActionDispatch::Routing::RouteSet.new
+      old_app, self.class.app = self.class.app, self.class.build_app(temporary_routes)
+      old_routes = SharedTestRoutes
+      silence_warnings { Object.const_set(:SharedTestRoutes, temporary_routes) }
+
+      yield temporary_routes
+    ensure
+      self.class.app = old_app
+      silence_warnings { Object.const_set(:SharedTestRoutes, old_routes) }
+    end
+
+    def with_autoload_path(path)
+      path = File.join(File.dirname(__FILE__), "fixtures", path)
+      if ActiveSupport::Dependencies.autoload_paths.include?(path)
+        yield
+      else
+        begin
+          ActiveSupport::Dependencies.autoload_paths << path
+          yield
+        ensure
+          ActiveSupport::Dependencies.autoload_paths.reject! {|p| p == path}
+          ActiveSupport::Dependencies.clear
+        end
+      end
+    end
+  end
+
+  class ActionDispatch::IntegrationTest < ActiveSupport::TestCase
+    setup do
+      @routes = SharedTestRoutes
+    end
+  end
+
+  module ActionController
+    class Base
+      include ActionController::Testing
+    end
+
+    Base.view_paths = FIXTURE_LOAD_PATH
+
+    class TestCase
+      include ActionDispatch::TestProcess
+
+      setup do
+        @routes = SharedTestRoutes
+      end
+    end
+  end
+
+  # This stub emulates the Railtie including the URL helpers from a Rails application
+  module ActionController
+    class Base
+      include SharedTestRoutes.url_helpers
+    end
+  end
+end # end Rails 3.0 hack
+
 module ActionDispatch
   class ShowExceptions
     private
@@ -36,9 +147,9 @@ class ActionControllerCatcherTest < ActionDispatch::IntegrationTest
   def assert_sent_hash(hash, xpath)
     hash.each do |key, value|
       next if key.match(/^airbrake\./) || # We added this key.
-        hash[key].blank?
+        hash[key] !~ /\S/
 
-      element_xpath = "#{xpath}/var[@key = '#{key}']"
+        element_xpath = "#{xpath}/var[@key = '#{key}']"
       if value.respond_to?(:to_hash)
         assert_sent_hash value.to_hash, element_xpath
       else
@@ -144,13 +255,13 @@ class ActionControllerCatcherTest < ActionDispatch::IntegrationTest
   end
 
 
-  def deliver_notices_from_exceptions_raised_in_public_requests
+  def test_deliver_notices_from_exceptions_raised_in_public_requests
     @app = AirbrakeTestController.action(:boom)
     get '/'
     assert_caught_and_sent
   end
 
-  def not_deliver_notices_from_exceptions_in_development_environments
+  def test_not_deliver_notices_from_exceptions_in_development_environments
     Airbrake.configuration.development_environments = ["test"]
     Airbrake.configuration.environment_name = "test"
     @app = AirbrakeTestController.action(:boom)
@@ -158,28 +269,28 @@ class ActionControllerCatcherTest < ActionDispatch::IntegrationTest
     assert_caught_and_not_sent
   end
 
-  def not_deliver_notices_from_actions_that_dont_raise
+  def test_not_deliver_notices_from_actions_that_dont_raise
     @app = AirbrakeTestController.action(:hello)
     get '/'
     assert_caught_and_not_sent
     assert_equal 'hello', response.body
   end
 
-  def not_deliver_ignored_exceptions_raised_by_actions
+  def test_not_deliver_ignored_exceptions_raised_by_actions
     @app = AirbrakeTestController.action(:boom)
     ignore(RuntimeError)
     get '/'
     assert_caught_and_not_sent
   end
 
-  def deliver_ignored_exception_raised_manually
+  def test_deliver_ignored_exception_raised_manually
     @app = AirbrakeTestController.action(:manual_airbrake)
     ignore(RuntimeError)
     get '/'
     assert_caught_and_sent
   end
 
-  def not_deliver_manually_sent_notices_in_local_requests
+  def test_not_deliver_manually_sent_notices_in_local_requests
     AirbrakeTestController.local = true
     @app = AirbrakeTestController.action(:manual_airbrake)
     get '/'
@@ -187,62 +298,62 @@ class ActionControllerCatcherTest < ActionDispatch::IntegrationTest
     AirbrakeTestController.local = false
   end
 
-  def not_create_actions_from_airbrake_methods
+  def test_not_create_actions_from_airbrake_methods
     Airbrake::Rails::ControllerMethods.instance_methods.each do |method|
       assert !(AirbrakeTestController.new.action_methods.include?(method))
     end
   end
 
-  def ignore_exceptions_when_user_agent_is_being_ignored_by_regular_expression
+  def test_ignore_exceptions_when_user_agent_is_being_ignored_by_regular_expression
     Airbrake.configuration.ignore_user_agent_only = [/Ignored/]
     @app = AirbrakeTestController.action(:boom)
     get "/", {}, {"HTTP_USER_AGENT" => "ShouldBeIgnored"}
     assert_caught_and_not_sent
   end
 
-  def ignore_exceptions_when_user_agent_is_being_ignored_by_string
+  def test_ignore_exceptions_when_user_agent_is_being_ignored_by_string
     Airbrake.configuration.ignore_user_agent_only = ['IgnoredUserAgent']
     @app = AirbrakeTestController.action(:boom)
     get "/", {}, {"HTTP_USER_AGENT" => "IgnoredUserAgent"}
     assert_caught_and_not_sent
   end
 
-  def not_ignore_exceptions_when_user_agent_is_not_being_ignored
+  def test_not_ignore_exceptions_when_user_agent_is_not_being_ignored
     Airbrake.configuration.ignore_user_agent_only = ['IgnoredUserAgent']
     @app = AirbrakeTestController.action(:boom)
     get "/", {}, {"HTTP_USER_AGENT" => "NonIgnoredAgent"}
     assert_caught_and_sent
   end
 
-  def send_session_data_for_manual_notifications
+  def test_send_session_data_for_manual_notifications
     @app = AirbrakeTestController.action(:manual_airbrake)
     data = { 'one' => 'two' }
     get "/", :session => data
     assert_sent_hash data, "/notice/request/session"
   end
 
-  def send_request_data_for_manual_notification
+  def test_send_request_data_for_manual_notification
     params = { 'controller' => "airbrake_test", 'action' => "index" }
     @app = AirbrakeTestController.action(:manual_airbrake)
     get "/", params
     assert_sent_request_info_for @request
   end
 
-  def send_request_data_for_manual_notification_with_non_standard_port
+  def test_send_request_data_for_manual_notification_with_non_standard_port
     params = { 'controller' => "airbrake_test", 'action' => "index" }
     @app = AirbrakeTestController.action(:manual_airbrake)
     get "/", params, {"SERVER_PORT" => 81}
     assert_sent_request_info_for @request
   end
 
-  def send_request_data_for_automatic_notification
+  def test_send_request_data_for_automatic_notification
     params = { 'controller' => "airbrake_test", 'action' => "index" }
     @app = AirbrakeTestController.action(:boom)
     get "/", params
     assert_sent_request_info_for @request
   end
 
-  def send_request_data_for_automatic_notification_with_non_standard_port
+  def test_send_request_data_for_automatic_notification_with_non_standard_port
     params = { 'controller' => "airbrake_test", 'action' => "index" }
     @app = AirbrakeTestController.action(:boom)
     get "/", params, {"SERVER_PORT" => 81}