bugsnag 5.5.0 → 6.0.0

data/spec/cleaner_spec.rb

@@ -42,6 +42,12 @@ describe Bugsnag::Cleaner do
       expect(subject.clean_object(obj)).to eq("André")
     end
 
+    it "cleans custom objects" do
+      class Macaron; end
+      a = Macaron.new
+      expect(subject.clean_object(a)).to eq('[OBJECT]')
+    end
+
     it "cleans up binary strings properly" do
       if RUBY_VERSION > "1.9"
         obj = "Andr\xc7\xff"

data/spec/configuration_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 describe Bugsnag::Configuration do
   describe "delivery_method" do
     it "should have the default delivery method" do
-      expect(subject.delivery_method).to eq(Bugsnag::Configuration::DEFAULT_DELIVERY_METHOD)
+      expect(subject.delivery_method).to eq(:thread_queue)
     end
 
     it "should have the defined delivery_method" do

data/spec/fixtures/middleware/internal_info_setter.rb

@@ -4,8 +4,8 @@ class InternalInfoSetter
     @bugsnag = bugsnag
   end
 
-  def call(notification)
-    notification.meta_data[:custom][:info] = MESSAGE
-    @bugsnag.call(notification)
+  def call(report)
+    report.meta_data.merge!({custom: {info: MESSAGE}})
+    @bugsnag.call(report)
   end
 end

data/spec/fixtures/middleware/public_info_setter.rb

@@ -4,8 +4,8 @@ class PublicInfoSetter
     @bugsnag = bugsnag
   end
 
-  def call(notification)
-    notification.meta_data[:custom][:info] = MESSAGE
-    @bugsnag.call(notification)
+  def call(report)
+    report.meta_data.merge!({custom: {info: MESSAGE}})
+    @bugsnag.call(report)
   end
 end

data/spec/fixtures/tasks/Rakefile

@@ -1,13 +1,12 @@
-require "bugsnag/rake"
+require "bugsnag/integrations/rake"
 
 namespace :test do
   desc "used by integration_spec to test that Bugsnag::Middleware::Rake runs properly"
   task :crash do
     port = ENV['BUGSNAG_TEST_SERVER_PORT']
     Bugsnag.configure do |config|
-      config.endpoint = "localhost:#{port}"
+      config.endpoint = "http://localhost:#{port}"
       config.api_key = "0" * 32
-      config.use_ssl = false
     end
 
     raise

data/spec/integration_spec.rb

@@ -15,6 +15,7 @@ describe 'Bugsnag' do
     end
     Thread.new{ server.start }
   end
+
   after do
     server.stop
     queue.clear
@@ -39,8 +40,7 @@ describe 'Bugsnag' do
 
   it 'should send notifications over the wire' do
     Bugsnag.configure do |config|
-      config.endpoint = "localhost:#{server.config[:Port]}"
-      config.use_ssl = false
+      config.endpoint = "http://localhost:#{server.config[:Port]}"
     end
     WebMock.allow_net_connect!
 
@@ -49,22 +49,9 @@ describe 'Bugsnag' do
     expect(request['events'][0]['exceptions'][0]['message']).to eq('yo')
   end
 
-  it 'should send deploys over the wire' do
-    Bugsnag.configure do |config|
-      config.endpoint = "localhost:#{server.config[:Port]}"
-      config.use_ssl = false
-    end
-    WebMock.allow_net_connect!
-
-    Bugsnag::Deploy.notify :app_version => '1.1.1'
-
-    expect(request['appVersion']).to eq('1.1.1')
-  end
-
   it 'should work with threadpool delivery' do
     Bugsnag.configure do |config|
-      config.endpoint = "localhost:#{server.config[:Port]}"
-      config.use_ssl = false
+      config.endpoint = "http://localhost:#{server.config[:Port]}"
       config.delivery_method = :thread_queue
     end
     WebMock.allow_net_connect!
@@ -78,8 +65,7 @@ describe 'Bugsnag' do
     is_jruby = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
     unless is_jruby #jruby doesn't support fork, so this test doesn't apply
       Bugsnag.configure do |config|
-        config.endpoint = "localhost:#{server.config[:Port]}"
-        config.use_ssl = false
+        config.endpoint = "http://localhost:#{server.config[:Port]}"
         config.delivery_method = :thread_queue
       end
       WebMock.allow_net_connect!
@@ -117,8 +103,7 @@ describe 'Bugsnag' do
     it 'should use a proxy when configured' do
       Bugsnag.configure do |config|
 
-        config.endpoint = "localhost:#{server.config[:Port]}"
-        config.use_ssl = false
+        config.endpoint = "http://localhost:#{server.config[:Port]}"
 
         config.proxy_host = 'localhost'
         config.proxy_port = proxy.config[:Port]

data/spec/integrations/sidekiq_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+require 'sidekiq/testing'
+
+class FailingWorker
+  include Sidekiq::Worker
+  def perform(value)
+    puts "Work: #{100/value}"
+  end
+end
+
+describe Bugsnag::Sidekiq do
+  before do
+    Sidekiq::Testing.inline!
+    Sidekiq::Testing.server_middleware do |chain|
+      chain.add Bugsnag::Sidekiq
+    end
+  end
+
+  it "works" do
+    begin
+      FailingWorker.perform_async(-0)
+      fail("shouldn't be here")
+    rescue
+    end
+
+    expect(Bugsnag).to have_sent_notification {|payload|
+      event = get_event_from_payload(payload)
+      expect(event["metaData"]["sidekiq"]["msg"]["class"]).to eq("FailingWorker")
+      expect(event["metaData"]["sidekiq"]["msg"]["args"]).to eq([-0])
+      expect(event["metaData"]["sidekiq"]["msg"]["queue"]).to eq("default")
+      expect(event["severity"]).to eq("error")
+    }
+  end
+end

data/spec/middleware_spec.rb

@@ -28,8 +28,8 @@ describe Bugsnag::MiddlewareStack do
   it "runs before_bugsnag_notify callbacks, adding custom data" do
     callback_run_count = 0
     Bugsnag.before_notify_callbacks << lambda {|notif|
-      notif.add_custom_data(:info, "here")
-      notif.add_custom_data(:data, "also here")
+      notif.add_tab(:custom, {info: "here"})
+      notif.add_tab(:custom, {data: "also here"})
 
       callback_run_count += 1
     }
@@ -67,34 +67,35 @@ describe Bugsnag::MiddlewareStack do
 
   end
 
-  it "allows overrides to override values set by internal middleware" do
+  it "allows block to override values set by internal middleware" do
     Bugsnag.configuration.internal_middleware.use(InternalInfoSetter)
-    Bugsnag.notify(BugsnagTestException.new("It crashed"), {:info => "overridden"})
+    Bugsnag.notify(BugsnagTestException.new("It crashed")) do |report|
+      report.meta_data.merge!({custom: {info: 'overridden'}})
+    end
 
     expect(Bugsnag).to have_sent_notification{ |payload|
       event = get_event_from_payload(payload)
       expect(event["metaData"]["custom"]).not_to be_nil
-      expect(event["metaData"]["custom"]["info"]).not_to eq(InternalInfoSetter::MESSAGE)
       expect(event["metaData"]["custom"]["info"]).to eq("overridden")
     }
   end
 
-  it "doesn't allow overrides to override public middleware" do
+  it "allows block to override public middleware" do
     Bugsnag.configuration.middleware.use(PublicInfoSetter)
 
-    Bugsnag.notify(BugsnagTestException.new("It crashed"), {:info => "overridden"})
+    Bugsnag.notify(BugsnagTestException.new("It crashed")) do |report|
+      report.meta_data.merge!({custom: {info: 'overridden'}})
+    end
 
     expect(Bugsnag).to have_sent_notification{ |payload|
       event = get_event_from_payload(payload)
       expect(event["metaData"]["custom"]).not_to be_nil
-      expect(event["metaData"]["custom"]["info"]).not_to eq("overridden")
-      expect(event["metaData"]["custom"]["info"]).to eq(PublicInfoSetter::MESSAGE)
+      expect(event["metaData"]["custom"]["info"]).to eq("overridden")
     }
   end
 
-  it "does not have have before or after callbacks by default" do
+  it "does not have have before callbacks by default" do
     expect(Bugsnag.before_notify_callbacks.size).to eq(0)
-    expect(Bugsnag.after_notify_callbacks.size).to eq(0)
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
     expect(Bugsnag).to have_sent_notification{ |payload|
       event = get_event_from_payload(payload)
@@ -102,18 +103,6 @@ describe Bugsnag::MiddlewareStack do
     }
   end
 
-  it "runs after_bugsnag_notify callbacks" do
-    callback_run_count = 0
-    Bugsnag.after_notify_callbacks << lambda {|notif|
-      callback_run_count += 1
-    }
-
-    Bugsnag.notify(BugsnagTestException.new("It crashed"))
-
-    expect(callback_run_count).to eq(1)
-    expect(Bugsnag::Notification).to have_sent_notification { }
-  end
-
   it "does not execute disabled bugsnag middleware" do
     callback_run_count = 0
     Bugsnag.configure do |config|
@@ -133,7 +122,7 @@ describe Bugsnag::MiddlewareStack do
       notif.ignore!
     end
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
-    expect(Bugsnag::Notification).not_to have_sent_notification { }
+    expect(Bugsnag).not_to have_sent_notification
   end
 
   it "allows inspection of meta_data before ignoring exception" do
@@ -148,34 +137,118 @@ describe Bugsnag::MiddlewareStack do
     end
 
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
-    expect(Bugsnag::Notification).not_to have_sent_notification
+    expect(Bugsnag).not_to have_sent_notification
 
   end
 
   it "allows meta_data to be modified in a middleware" do
+    MetaDataAdder = Class.new do
+      def initialize(bugsnag)
+        @bugsnag = bugsnag
+      end
+
+      def call(report)
+        report.meta_data = {test: {value: "abcdef123456abcdef123456abcdef123456"}}
+        @bugsnag.call(report)
+      end
+    end
+
     MetaDataMunger = Class.new do
       def initialize(bugsnag)
         @bugsnag = bugsnag
       end
 
-      def call(notification)
-        token = notification.meta_data[:sidekiq][:args].first
-        notification.meta_data[:sidekiq][:args] = ["#{token[0...6]}*****#{token[-4..-1]}"]
-        @bugsnag.call(notification)
+      def call(report)
+        token = report.meta_data[:test][:value]
+        report.meta_data[:test][:value] = "#{token[0...6]}*****#{token[-4..-1]}"
+        @bugsnag.call(report)
       end
     end
 
     Bugsnag.configure do |c|
+      c.middleware.use MetaDataAdder
       c.middleware.use MetaDataMunger
     end
 
-    notification = Bugsnag.notify(BugsnagTestException.new("It crashed"), {
-      :sidekiq => {
-        :args => ["abcdef123456abcdef123456abcdef123456"]
-      }
-    })
+    Bugsnag.notify(BugsnagTestException.new("It crashed"))
+
+    expect(Bugsnag).to have_sent_notification{ |payload|
+      event = get_event_from_payload(payload)
+      expect(event["metaData"]['test']['value']).to eq("abcdef*****3456")
+    }
+  end
 
-    expect(notification.meta_data[:sidekiq][:args]).to eq(["abcdef*****3456"])
+  if ruby_version_greater_equal?("2.3.0")
+    context "with a ruby version >= 2.3.0" do
+      it "attaches did you mean metadata when necessary" do
+        begin
+          "Test".prepnd "T"
+        rescue Exception => e
+          Bugsnag.notify(e)
+        end
+
+        expect(Bugsnag).to have_sent_notification{ |payload|
+          event = get_event_from_payload(payload)
+          expect(event["metaData"]["error"]).to_not be_nil
+          expect(event["metaData"]["error"]).to eq({"suggestion" => "prepend"})
+        }
+      end
+    end
+  end
+
+  context "with a ruby version < 2.3.0" do
+    if !ruby_version_greater_equal?("2.3.0")
+      it "doesn't attach did you mean metadata" do
+        begin
+          "Test".prepnd "T"
+        rescue Exception => e
+          Bugsnag.notify(e)
+        end
+
+        expect(Bugsnag).to have_sent_notification{ |payload|
+          event = get_event_from_payload(payload)
+          expect(event["metaData"]["error"]).to be_nil
+        }
+      end
+    end
   end
 
+  it "doesn't allow handledState properties to be changed in middleware" do
+    HandledStateChanger = Class.new do
+      def initialize(bugsnag)
+        @bugsnag = bugsnag
+      end
+
+      def call(report)
+        report.severity_reason = {
+          :test => "test"
+        }
+        @bugsnag.call(report)
+      end
+    end
+
+    Bugsnag.configure do |c|
+      c.middleware.use HandledStateChanger
+    end
+
+    Bugsnag.notify(BugsnagTestException.new("It crashed"), true) do |report|
+      report.severity_reason = {
+        :type => "middleware_handler",
+        :attributes => {
+          :name => "middleware_test"
+        }
+      }
+    end
+
+    expect(Bugsnag).to have_sent_notification{ |payload|
+      event = get_event_from_payload(payload)
+      expect(event["unhandled"]).to be true
+      expect(event["severityReason"]).to eq({
+        "type" => "middleware_handler",
+        "attributes" => {
+          "name" => "middleware_test"
+        }
+      })
+    }
+  end
 end

data/spec/rack_spec.rb

@@ -54,7 +54,7 @@ describe Bugsnag::Rack do
 
       rack_stack.call(rack_env) rescue nil
 
-      expect(Bugsnag::Notification).not_to have_sent_notification
+      expect(Bugsnag).not_to have_sent_notification
     end
   end
 

data/spec/{notification_spec.rb → report_spec.rb}

@@ -27,7 +27,7 @@ class JRubyException
   end
 end
 
-describe Bugsnag::Notification do
+describe Bugsnag::Report do
   it "should contain an api_key if one is set" do
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
 
@@ -53,7 +53,9 @@ describe Bugsnag::Notification do
   end
 
   it "lets you override the api_key" do
-    Bugsnag.notify(BugsnagTestException.new("It crashed"), :api_key => "9d84383f9be2ca94902e45c756a9979d")
+    Bugsnag.notify(BugsnagTestException.new("It crashed")) do |report|
+      report.api_key = "9d84383f9be2ca94902e45c756a9979d"
+    end
 
     expect(Bugsnag).to have_sent_notification{ |payload|
       expect(payload["apiKey"]).to eq("9d84383f9be2ca94902e45c756a9979d")
@@ -62,7 +64,9 @@ describe Bugsnag::Notification do
 
   it "lets you override the groupingHash" do
 
-    Bugsnag.notify(BugsnagTestException.new("It crashed"), {:grouping_hash => "this is my grouping hash"})
+    Bugsnag.notify(BugsnagTestException.new("It crashed")) do |report|
+      report.grouping_hash = "this is my grouping hash"
+    end
 
     expect(Bugsnag).to have_sent_notification{ |payload|
       event = get_event_from_payload(payload)
@@ -115,7 +119,7 @@ describe Bugsnag::Notification do
 
   it "uses correct unhandled defaults" do
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
-    
+
     expect(Bugsnag).to have_sent_notification{ |payload|
       event = get_event_from_payload(payload)
       expect(event["unhandled"]).to be false
@@ -126,19 +130,6 @@ describe Bugsnag::Notification do
     }
   end
 
-  it "sets correct severityReason if severity is modified" do
-    Bugsnag.notify(BugsnagTestException.new("It crashed"), {:severity => "info"})
-
-    expect(Bugsnag).to have_sent_notification{ |payload|
-      event = get_event_from_payload(payload)
-      expect(event["unhandled"]).to be false
-      expect(event["severity"]).to eq("info")
-      expect(event["severityReason"]).to eq({
-        "type" => "userSpecifiedSeverity"
-      })
-    }
-  end
-
   it "sets correct severityReason if severity is modified in a block" do
     Bugsnag.notify(BugsnagTestException.new("It crashed")) do |notification|
       notification.severity = "info"
@@ -153,28 +144,6 @@ describe Bugsnag::Notification do
     }
   end
 
-  it "sets unhandled and severityReasons through auto_notify" do
-    Bugsnag.auto_notify(BugsnagTestException.new("It crashed"), {
-      :severity_reason => {
-        :type => "unhandledExceptionMiddleware",
-        :attributes => {
-          :framework => "ruby test"
-        }
-      }
-    })
-    expect(Bugsnag).to have_sent_notification{ |payload|
-      event = get_event_from_payload(payload)
-      expect(event["unhandled"]).to be true
-      expect(event["severity"]).to eq("error")
-      expect(event["severityReason"]).to eq({
-        "type" => "unhandledExceptionMiddleware",
-        "attributes" => {
-          "framework" => "ruby test"
-        }
-      })
-    }
-  end
-
   it "sets correct severity and reason for specific error classes" do
     Bugsnag.notify(SignalException.new("TERM"))
     expect(Bugsnag).to have_sent_notification{ |payload|
@@ -193,12 +162,14 @@ describe Bugsnag::Notification do
   # TODO: nested context
 
   it "accepts tabs in overrides and adds them to metaData" do
-    Bugsnag.notify(BugsnagTestException.new("It crashed"), {
-      :some_tab => {
-        :info => "here",
-        :data => "also here"
-      }
-    })
+    Bugsnag.notify(BugsnagTestException.new("It crashed")) do |report|
+      report.meta_data.merge!({
+        some_tab: {
+          info: "here",
+          data: "also here"
+        }
+      })
+    end
 
     expect(Bugsnag).to have_sent_notification{ |payload|
       event = get_event_from_payload(payload)
@@ -209,22 +180,27 @@ describe Bugsnag::Notification do
     }
   end
 
-  it "accepts non-hash overrides and adds them to the custom tab in metaData" do
-    Bugsnag.notify(BugsnagTestException.new("It crashed"), {
-      :info => "here",
-      :data => "also here"
-    })
+  it "accepts meta data from an exception that mixes in Bugsnag::MetaData" do
+    exception = BugsnagTestExceptionWithMetaData.new("It crashed")
+    exception.bugsnag_meta_data = {
+      some_tab: {
+        info: "here",
+        data: "also here"
+      }
+    }
+
+    Bugsnag.notify(exception)
 
     expect(Bugsnag).to have_sent_notification{ |payload|
       event = get_event_from_payload(payload)
-      expect(event["metaData"]["custom"]).to eq(
+      expect(event["metaData"]["some_tab"]).to eq(
         "info" => "here",
         "data" => "also here"
       )
     }
   end
 
-  it "accepts meta data from an exception that mixes in Bugsnag::MetaData" do
+  it "removes tabs" do
     exception = BugsnagTestExceptionWithMetaData.new("It crashed")
     exception.bugsnag_meta_data = {
       :some_tab => {
@@ -233,7 +209,28 @@ describe Bugsnag::Notification do
       }
     }
 
-    Bugsnag.notify(exception)
+    Bugsnag.notify(exception) do |report|
+      report.remove_tab(:some_tab)
+    end
+
+    expect(Bugsnag).to have_sent_notification{ |payload|
+      event = get_event_from_payload(payload)
+      expect(event["metaData"]["some_tab"]).to be_nil
+    }
+  end
+
+  it "ignores removing nil tabs" do
+    exception = BugsnagTestExceptionWithMetaData.new("It crashed")
+    exception.bugsnag_meta_data = {
+      :some_tab => {
+        :info => "here",
+        :data => "also here"
+      }
+    }
+
+    Bugsnag.notify(exception) do |report|
+      report.remove_tab(nil)
+    end
 
     expect(Bugsnag).to have_sent_notification{ |payload|
       event = get_event_from_payload(payload)
@@ -244,6 +241,21 @@ describe Bugsnag::Notification do
     }
   end
 
+  it "Creates a custom tab for metadata which is not a Hash" do
+    exception = Exception.new("It crashed")
+
+    Bugsnag.notify(exception) do |report|
+      report.add_tab(:some_tab, "added")
+    end
+
+    expect(Bugsnag).to have_sent_notification{ |payload|
+      event = get_event_from_payload(payload)
+      expect(event["metaData"]["custom"]).to eq(
+        "some_tab" => "added",
+      )
+    }
+  end
+
   it "accepts meta data from an exception that mixes in Bugsnag::MetaData, but override using the overrides" do
     exception = BugsnagTestExceptionWithMetaData.new("It crashed")
     exception.bugsnag_meta_data = {
@@ -253,7 +265,9 @@ describe Bugsnag::Notification do
       }
     }
 
-    Bugsnag.notify(exception, {:some_tab => {:info => "overridden"}})
+    Bugsnag.notify(exception) do |report|
+      report.add_tab(:some_tab, {:info => "overridden"})
+    end
 
     expect(Bugsnag).to have_sent_notification{ |payload|
       event = get_event_from_payload(payload)
@@ -280,7 +294,9 @@ describe Bugsnag::Notification do
     exception = BugsnagTestExceptionWithMetaData.new("It crashed")
     exception.bugsnag_user_id = "exception_user_id"
 
-    Bugsnag.notify(exception, {:user_id => "override_user_id"})
+    Bugsnag.notify(exception) do |report|
+      report.user.merge!({:id => "override_user_id"})
+    end
 
     expect(Bugsnag).to have_sent_notification{ |payload|
       event = get_event_from_payload(payload)
@@ -317,7 +333,9 @@ describe Bugsnag::Notification do
     exception = BugsnagTestExceptionWithMetaData.new("It crashed")
     exception.bugsnag_context = "exception_context"
 
-    Bugsnag.notify(exception, {:context => "override_context"})
+    Bugsnag.notify(exception) do |report|
+      report.context = "override_context"
+    end
 
     expect(Bugsnag).to have_sent_notification{ |payload|
       event = get_event_from_payload(payload)
@@ -326,14 +344,14 @@ describe Bugsnag::Notification do
   end
 
   it "accepts meta_data in overrides (for backwards compatibility) and merge it into metaData" do
-    Bugsnag.notify(BugsnagTestException.new("It crashed"), {
-      :meta_data => {
-        :some_tab => {
-          :info => "here",
-          :data => "also here"
+    Bugsnag.notify(BugsnagTestException.new("It crashed")) do |report|
+      report.meta_data.merge!({
+        some_tab: {
+          info: "here",
+          data: "also here"
         }
-      }
-    })
+      })
+    end
 
     expect(Bugsnag).to have_sent_notification{ |payload|
       event = get_event_from_payload(payload)
@@ -345,14 +363,14 @@ describe Bugsnag::Notification do
   end
 
   it "truncates large meta_data before sending" do
-    Bugsnag.notify(BugsnagTestException.new("It crashed"), {
-      :meta_data => {
-        :some_tab => {
-          :giant => SecureRandom.hex(500_000/2),
-          :mega => SecureRandom.hex(500_000/2)
+    Bugsnag.notify(BugsnagTestException.new("It crashed")) do |report|
+      report.meta_data.merge!({
+        some_tab: {
+          giant: SecureRandom.hex(500_000/2),
+          mega: SecureRandom.hex(500_000/2)
         }
-      }
-    })
+      })
+    end
 
     expect(Bugsnag).to have_sent_notification{ |payload|
       # Truncated body should be no bigger than
@@ -362,14 +380,14 @@ describe Bugsnag::Notification do
   end
 
   it "truncates large messages before sending" do
-    Bugsnag.notify(BugsnagTestException.new(SecureRandom.hex(500_000)), {
-      :meta_data => {
-        :some_tab => {
-          :giant => SecureRandom.hex(500_000/2),
-          :mega => SecureRandom.hex(500_000/2)
+    Bugsnag.notify(BugsnagTestException.new(SecureRandom.hex(500_000))) do |report|
+      report.meta_data.merge!({
+        some_tab: {
+          giant: SecureRandom.hex(500_000/2),
+          mega: SecureRandom.hex(500_000/2)
         }
-      }
-    })
+      })
+    end
 
     expect(Bugsnag).to have_sent_notification{ |payload|
       # Truncated body should be no bigger than
@@ -393,9 +411,9 @@ describe Bugsnag::Notification do
   end
 
   it "accepts a severity in overrides" do
-    Bugsnag.notify(BugsnagTestException.new("It crashed"), {
-      :severity => "info"
-    })
+    Bugsnag.notify(BugsnagTestException.new("It crashed")) do |report|
+      report.severity = "info"
+    end
 
     expect(Bugsnag).to have_sent_notification{ |payload|
       event = get_event_from_payload(payload)
@@ -413,42 +431,10 @@ describe Bugsnag::Notification do
     }
   end
 
-  it "does not accept a bad severity in overrides" do
-    Bugsnag.notify(BugsnagTestException.new("It crashed"), {
-      :severity => "fatal"
-    })
-
-    expect(Bugsnag).to have_sent_notification{ |payload|
-      event = get_event_from_payload(payload)
-      expect(event["severity"]).to eq("warning")
-    }
-  end
-
-  it "lets you override severity using block syntax" do
-    Bugsnag.notify(BugsnagTestException.new("It crashed")) do |notification|
-      notification.severity = "info"
-    end
-
-    expect(Bugsnag).to have_sent_notification{ |payload|
-      event = get_event_from_payload(payload)
-      expect(event["severity"]).to eq("info")
-    }
-  end
-
-  it "autonotifies errors" do
-    Bugsnag.auto_notify(BugsnagTestException.new("It crashed"))
-
-    expect(Bugsnag).to have_sent_notification{ |payload|
-      event = get_event_from_payload(payload)
-      expect(event["severity"]).to eq("error")
-    }
-  end
-
-
   it "accepts a context in overrides" do
-    Bugsnag.notify(BugsnagTestException.new("It crashed"), {
-      :context => "test_context"
-    })
+    Bugsnag.notify(BugsnagTestException.new("It crashed")) do |report|
+      report.context = 'test_context'
+    end
 
     expect(Bugsnag).to have_sent_notification{ |payload|
       event = get_event_from_payload(payload)
@@ -457,9 +443,9 @@ describe Bugsnag::Notification do
   end
 
   it "accepts a user_id in overrides" do
-    Bugsnag.notify(BugsnagTestException.new("It crashed"), {
-      :user_id => "test_user"
-    })
+    Bugsnag.notify(BugsnagTestException.new("It crashed")) do |report|
+      report.user = {id: 'test_user'}
+    end
 
     expect(Bugsnag).to have_sent_notification{ |payload|
       event = get_event_from_payload(payload)
@@ -467,12 +453,12 @@ describe Bugsnag::Notification do
     }
   end
 
-  it "does not send a notification if auto_notify is false" do
+  it "does not send an automatic notification if auto_notify is false" do
     Bugsnag.configure do |config|
       config.auto_notify = false
     end
 
-    Bugsnag.auto_notify(BugsnagTestException.new("It crashed"))
+    Bugsnag.notify(BugsnagTestException.new("It crashed"), true)
 
     expect(Bugsnag).not_to have_sent_notification
   end
@@ -482,7 +468,7 @@ describe Bugsnag::Notification do
       config.release_stage = "production"
     end
 
-    Bugsnag.auto_notify(BugsnagTestException.new("It crashed"))
+    Bugsnag.notify(BugsnagTestException.new("It crashed"))
 
     expect(Bugsnag).to have_sent_notification{ |payload|
       event = get_event_from_payload(payload)
@@ -516,27 +502,6 @@ describe Bugsnag::Notification do
     expect(WebMock).to have_requested(:post, "https://notify.bugsnag.com")
   end
 
-  it "uses ssl when use_ssl is true" do
-    Bugsnag.configuration.use_ssl = true
-    Bugsnag.notify(BugsnagTestException.new("It crashed"))
-
-    expect(WebMock).to have_requested(:post, "https://notify.bugsnag.com")
-  end
-
-  it "does not use ssl when use_ssl is false" do
-    stub_request(:post, "http://notify.bugsnag.com/")
-    Bugsnag.configuration.use_ssl = false
-    Bugsnag.notify(BugsnagTestException.new("It crashed"))
-
-    expect(WebMock).to have_requested(:post, "http://notify.bugsnag.com")
-  end
-
-  it "uses ssl when use_ssl is unset" do
-    Bugsnag.notify(BugsnagTestException.new("It crashed"))
-
-    expect(WebMock).to have_requested(:post, "https://notify.bugsnag.com")
-  end
-
   it "does not mark the top-most stacktrace line as inProject if out of project" do
     Bugsnag.configuration.project_root = "/Random/location/here"
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
@@ -548,19 +513,6 @@ describe Bugsnag::Notification do
     }
   end
 
-  it "does not mark the top-most stacktrace line as inProject if it matches a vendor path" do
-    Bugsnag.configuration.project_root = File.expand_path('../../', __FILE__)
-    Bugsnag.configuration.vendor_paths = [File.expand_path('../', __FILE__)]
-
-    Bugsnag.notify(BugsnagTestException.new("It crashed"))
-
-    expect(Bugsnag).to have_sent_notification{ |payload|
-      exception = get_exception_from_payload(payload)
-      expect(exception["stacktrace"].size).to be >= 1
-      expect(exception["stacktrace"].first["inProject"]).to be_nil
-    }
-  end
-
   it "marks the top-most stacktrace line as inProject if necessary" do
     Bugsnag.configuration.project_root = File.expand_path File.dirname(__FILE__)
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
@@ -582,9 +534,11 @@ describe Bugsnag::Notification do
     }
   end
 
-  it "filters params from all payload hashes if they are set in default params_filters" do
+  it "filters params from all payload hashes if they are set in default meta_data_filters" do
 
-    Bugsnag.notify(BugsnagTestException.new("It crashed"), {:request => {:params => {:password => "1234", :other_password => "12345", :other_data => "123456"}}})
+    Bugsnag.notify(BugsnagTestException.new("It crashed")) do |report|
+      report.meta_data.merge!({:request => {:params => {:password => "1234", :other_password => "12345", :other_data => "123456"}}})
+    end
 
     expect(Bugsnag).to have_sent_notification{ |payload|
       event = get_event_from_payload(payload)
@@ -597,10 +551,12 @@ describe Bugsnag::Notification do
     }
   end
 
-  it "filters params from all payload hashes if they are added to params_filters" do
+  it "filters params from all payload hashes if they are added to meta_data_filters" do
 
-    Bugsnag.configuration.params_filters << "other_data"
-    Bugsnag.notify(BugsnagTestException.new("It crashed"), {:request => {:params => {:password => "1234", :other_password => "123456", :other_data => "123456"}}})
+    Bugsnag.configuration.meta_data_filters << "other_data"
+    Bugsnag.notify(BugsnagTestException.new("It crashed")) do |report|
+      report.meta_data.merge!({:request => {:params => {:password => "1234", :other_password => "123456", :other_data => "123456"}}})
+    end
 
     expect(Bugsnag).to have_sent_notification{ |payload|
       event = get_event_from_payload(payload)
@@ -613,10 +569,12 @@ describe Bugsnag::Notification do
     }
   end
 
-  it "filters params from all payload hashes if they are added to params_filters as regex" do
+  it "filters params from all payload hashes if they are added to meta_data_filters as regex" do
 
-    Bugsnag.configuration.params_filters << /other_data/
-    Bugsnag.notify(BugsnagTestException.new("It crashed"), {:request => {:params => {:password => "1234", :other_password => "123456", :other_data => "123456"}}})
+    Bugsnag.configuration.meta_data_filters << /other_data/
+    Bugsnag.notify(BugsnagTestException.new("It crashed")) do |report|
+      report.meta_data.merge!({:request => {:params => {:password => "1234", :other_password => "123456", :other_data => "123456"}}})
+    end
 
     expect(Bugsnag).to have_sent_notification{ |payload|
       event = get_event_from_payload(payload)
@@ -629,10 +587,12 @@ describe Bugsnag::Notification do
     }
   end
 
-  it "filters params from all payload hashes if they are added to params_filters as partial regex" do
+  it "filters params from all payload hashes if they are added to meta_data_filters as partial regex" do
 
-    Bugsnag.configuration.params_filters << /r_data/
-    Bugsnag.notify(BugsnagTestException.new("It crashed"), {:request => {:params => {:password => "1234", :other_password => "123456", :other_data => "123456"}}})
+    Bugsnag.configuration.meta_data_filters << /r_data/
+    Bugsnag.notify(BugsnagTestException.new("It crashed")) do |report|
+      report.meta_data.merge!({:request => {:params => {:password => "1234", :other_password => "123456", :other_data => "123456"}}})
+    end
 
     expect(Bugsnag).to have_sent_notification{ |payload|
       event = get_event_from_payload(payload)
@@ -646,7 +606,9 @@ describe Bugsnag::Notification do
   end
 
   it "does not filter params from payload hashes if their values are nil" do
-    Bugsnag.notify(BugsnagTestException.new("It crashed"), {:request => {:params => {:nil_param => nil}}})
+    Bugsnag.notify(BugsnagTestException.new("It crashed")) do |report|
+      report.meta_data.merge!({:request => {:params => {:nil_param => nil}}})
+    end
 
     expect(Bugsnag).to have_sent_notification{ |payload|
       event = get_event_from_payload(payload)
@@ -657,49 +619,46 @@ describe Bugsnag::Notification do
     }
   end
 
-  it "does not notify if the non-default exception class is added to the ignore_classes" do
-    Bugsnag.configuration.ignore_classes << "BugsnagTestException"
-
-    Bugsnag.notify_or_ignore(BugsnagTestException.new("It crashed"))
+  it "does not notify if report ignored" do
+    Bugsnag.notify(BugsnagTestException.new("It crashed")) do |report|
+      report.ignore!
+    end
 
     expect(Bugsnag).not_to have_sent_notification
   end
 
-  it "does not notify if exception's ancestor is an ignored class" do
-    Bugsnag.configuration.ignore_classes << "BugsnagTestException"
-
-    Bugsnag.notify_or_ignore(BugsnagSubclassTestException.new("It crashed"))
+  it "does not notify if the exception class is in the default ignore_classes list" do
+    Bugsnag.configuration.ignore_classes << ActiveRecord::RecordNotFound
+    Bugsnag.notify(ActiveRecord::RecordNotFound.new("It crashed"))
 
     expect(Bugsnag).not_to have_sent_notification
   end
 
-  it "does not notify if any caused exception is an ignored class" do
-    Bugsnag.configuration.ignore_classes << "NestedException"
-
-    ex = NestedException.new("Self-referential exception")
-    ex.original_exception = BugsnagTestException.new("It crashed")
+  it "does not notify if the non-default exception class is added to the ignore_classes" do
+    Bugsnag.configuration.ignore_classes << BugsnagTestException
 
-    Bugsnag.notify_or_ignore(ex)
+    Bugsnag.notify(BugsnagTestException.new("It crashed"))
 
     expect(Bugsnag).not_to have_sent_notification
   end
 
-  it "accepts both String and Class instances as an ignored class" do
+  it "does not notify if exception's ancestor is an ignored class" do
     Bugsnag.configuration.ignore_classes << BugsnagTestException
 
-    Bugsnag.notify_or_ignore(BugsnagTestException.new("It crashed"))
+    Bugsnag.notify(BugsnagSubclassTestException.new("It crashed"))
 
     expect(Bugsnag).not_to have_sent_notification
   end
 
-  it "does not notify if the user agent is present and matches a regex in ignore_user_agents" do
-    Bugsnag.configuration.ignore_user_agents << %r{BugsnagUserAgent}
+  it "does not notify if any caused exception is an ignored class" do
+    Bugsnag.configuration.ignore_classes << NestedException
 
-    ((Thread.current["bugsnag_req_data"] ||= {})[:rack_env] ||= {})["HTTP_USER_AGENT"] = "BugsnagUserAgent"
+    ex = NestedException.new("Self-referential exception")
+    ex.original_exception = BugsnagTestException.new("It crashed")
 
-    Bugsnag.notify_or_ignore(BugsnagTestException.new("It crashed"))
+    Bugsnag.notify(ex)
 
-    expect(Bugsnag::Notification).not_to have_sent_notification
+    expect(Bugsnag).not_to have_sent_notification
   end
 
   it "sends the cause of the exception" do
@@ -723,7 +682,7 @@ describe Bugsnag::Notification do
     ex = NestedException.new("Self-referential exception")
     ex.original_exception = ex
 
-    Bugsnag.notify_or_ignore(ex)
+    Bugsnag.notify(ex)
 
     expect(Bugsnag).to have_sent_notification{ |payload|
       event = get_event_from_payload(payload)
@@ -738,7 +697,7 @@ describe Bugsnag::Notification do
       ex = ex.original_exception = NestedException.new("Deep exception #{idx}")
     end
 
-    Bugsnag.notify_or_ignore(first_ex)
+    Bugsnag.notify(first_ex)
     expect(Bugsnag).to have_sent_notification{ |payload|
       event = get_event_from_payload(payload)
       expect(event["exceptions"].size).to eq(5)
@@ -819,34 +778,39 @@ describe Bugsnag::Notification do
     invalid_data = "fl\xc3ff"
     invalid_data.force_encoding('BINARY') if invalid_data.respond_to?(:force_encoding)
 
-    notify_test_exception(:fluff => {:fluff => invalid_data})
+    Bugsnag.notify(BugsnagTestException.new("It crashed")) do |report|
+      report.meta_data.merge!({fluff: {fluff: invalid_data}})
+    end
 
     expect(Bugsnag).to have_sent_notification{ |payload|
+      event = get_event_from_payload(payload)
       if defined?(Encoding::UTF_8)
-        expect(payload.to_json).to match(/fl�ff/)
+        expect(event['metaData']['fluff']['fluff']).to match(/fl�ff/)
       else
-        expect(payload.to_json).to match(/flff/)
+        expect(event['metaData']['fluff']['fluff']).to match(/flff/)
       end
     }
   end
 
-  it "should handle utf8 encoding errors in exceptions_list" do
-    invalid_data = "\"foo\xEBbar\""
-    invalid_data = invalid_data.force_encoding("utf-8") if invalid_data.respond_to?(:force_encoding)
+  if RUBY_VERSION < '2.3.0'
+    it "should handle utf8 encoding errors in exceptions_list" do
+      invalid_data = "\"foo\xEBbar\""
+      invalid_data = invalid_data.force_encoding("utf-8") if invalid_data.respond_to?(:force_encoding)
 
-    begin
-      JSON.parse(invalid_data)
-    rescue
-      Bugsnag.notify $!
-    end
-
-    expect(Bugsnag).to have_sent_notification { |payload|
-      if defined?(Encoding::UTF_8)
-        expect(payload.to_json).to match(/foo�bar/)
-      else
-        expect(payload.to_json).to match(/foobar/)
+      begin
+        JSON.parse(invalid_data)
+      rescue
+        Bugsnag.notify $!
       end
-    }
+
+      expect(Bugsnag).to have_sent_notification { |payload|
+        if defined?(Encoding::UTF_8)
+          expect(payload.to_json).to match(/foo�bar/)
+        else
+          expect(payload.to_json).to match(/foobar/)
+        end
+      }
+    end
   end
 
   it "should handle utf8 encoding errors in notification context" do
@@ -856,7 +820,9 @@ describe Bugsnag::Notification do
     begin
       raise
     rescue
-      Bugsnag.notify($!, { :context => invalid_data })
+      Bugsnag.notify($!) do |report|
+        report.context = invalid_data
+      end
     end
 
     expect(Bugsnag).to have_sent_notification { |payload|
@@ -955,6 +921,57 @@ describe Bugsnag::Notification do
     }
   end
 
+  it 'should use defaults when notify is called' do
+    Bugsnag.notify(BugsnagTestException.new("It crashed"))
+
+    expect(Bugsnag).to have_sent_notification{ |payload|
+      event = payload["events"][0]
+      expect(event["unhandled"]).to be false
+      expect(event["severityReason"]).to eq({"type" => "handledException"})
+    }
+  end
+
+  it 'should attach severity reason through a block when auto_notify is true' do
+    Bugsnag.notify(BugsnagTestException.new("It crashed"), true) do |report|
+      report.severity_reason = {
+        :type => "middleware_handler",
+        :attributes => {
+          :name => "middleware_test"
+        }
+      }
+    end
+
+    expect(Bugsnag).to have_sent_notification{ |payload|
+      event = payload["events"][0]
+      expect(event["severityReason"]).to eq(
+        {
+          "type" => "middleware_handler",
+          "attributes" => {
+            "name" => "middleware_test"
+          }
+        }
+      )
+      expect(event["unhandled"]).to be true
+    }
+  end
+
+  it 'should not attach severity reason from callback when auto_notify is false' do
+    Bugsnag.notify(BugsnagTestException.new("It crashed")) do |report|
+      report.severity_reason = {
+        :type => "middleware_handler",
+        :attributes => {
+          :name => "middleware_test"
+        }
+      }
+    end
+
+    expect(Bugsnag).to have_sent_notification{ |payload|
+      event = payload["events"][0]
+      expect(event["unhandled"]).to be false
+      expect(event["severityReason"]).to eq({"type" => "handledException"})
+    }
+  end
+
   if defined?(JRUBY_VERSION)
 
     it "should work with java.lang.Throwables" do