airbrake-ruby 3.2.6 → 4.0.0

data/spec/deploy_notifier_spec.rb

@@ -1,9 +1,5 @@
 RSpec.describe Airbrake::DeployNotifier do
-  let(:user_params) { { project_id: 1, project_key: 'banana' } }
-  let(:params) { {} }
-  let(:config) { Airbrake::Config.new(user_params.merge(params)) }
-
-  subject { described_class.new(config) }
+  before { Airbrake::Config.instance = Airbrake::Config.new(project_id: 1) }
 
   describe "#notify" do
     it "returns a promise" do
@@ -13,7 +9,7 @@ RSpec.describe Airbrake::DeployNotifier do
     end
 
     context "when environment is configured" do
-      let(:params) { { environment: 'fooenv' } }
+      before { Airbrake::Config.instance.merge(environment: 'fooenv') }
 
       it "prefers the passed environment to the config env" do
         expect_any_instance_of(Airbrake::SyncSender).to receive(:send).with(
@@ -26,7 +22,7 @@ RSpec.describe Airbrake::DeployNotifier do
     end
 
     context "when environment is not configured" do
-      let(:params) { { environment: 'fooenv' } }
+      before { Airbrake::Config.instance.merge(environment: 'fooenv') }
 
       it "sets the environment from the config" do
         expect_any_instance_of(Airbrake::SyncSender).to receive(:send).with(

data/spec/filter_chain_spec.rb

@@ -1,7 +1,5 @@
 RSpec.describe Airbrake::FilterChain do
-  let(:notice) do
-    Airbrake::Notice.new(Airbrake::Config.new, AirbrakeTestError.new)
-  end
+  let(:notice) { Airbrake::Notice.new(AirbrakeTestError.new) }
 
   describe "#refine" do
     let(:filter) do

data/spec/filters/context_filter_spec.rb

@@ -1,7 +1,5 @@
 RSpec.describe Airbrake::Filters::ContextFilter do
-  let(:notice) do
-    Airbrake::Notice.new(Airbrake::Config.new, AirbrakeTestError.new)
-  end
+  let(:notice) { Airbrake::Notice.new(AirbrakeTestError.new) }
 
   context "when the current context is empty" do
     it "doesn't merge anything with params" do

data/spec/filters/dependency_filter_spec.rb

@@ -1,7 +1,5 @@
 RSpec.describe Airbrake::Filters::DependencyFilter do
-  let(:notice) do
-    Airbrake::Notice.new(Airbrake::Config.new, AirbrakeTestError.new)
-  end
+  let(:notice) { Airbrake::Notice.new(AirbrakeTestError.new) }
 
   describe "#call" do
     it "attaches loaded dependencies to context/versions/dependencies" do

data/spec/filters/exception_attributes_filter_spec.rb

@@ -1,9 +1,6 @@
 RSpec.describe Airbrake::Filters::ExceptionAttributesFilter do
   describe "#call" do
-    let(:out) { StringIO.new }
-    let(:notice) { Airbrake::Notice.new(Airbrake::Config.new, ex) }
-
-    subject { described_class.new(Logger.new(out)) }
+    let(:notice) { Airbrake::Notice.new(ex) }
 
     context "when #to_airbrake returns a non-Hash object" do
       let(:ex) do
@@ -18,11 +15,6 @@ RSpec.describe Airbrake::Filters::ExceptionAttributesFilter do
         expect { subject.call(notice) }.not_to raise_error
         expect(notice[:params]).to be_empty
       end
-
-      it "logs the error" do
-        expect { subject.call(notice) }.not_to raise_error
-        expect(out.string).to match(/wanted Hash, got Object/)
-      end
     end
 
     context "when #to_airbrake errors out" do
@@ -38,11 +30,6 @@ RSpec.describe Airbrake::Filters::ExceptionAttributesFilter do
         expect { subject.call(notice) }.not_to raise_error
         expect(notice[:params]).to be_empty
       end
-
-      it "logs the error" do
-        expect { subject.call(notice) }.not_to raise_error
-        expect(out.string).to match(/#to_airbrake failed.+ZeroDivisionError/)
-      end
     end
 
     context "when #to_airbrake returns a hash" do

data/spec/filters/gem_root_filter_spec.rb

@@ -1,8 +1,5 @@
 RSpec.describe Airbrake::Filters::GemRootFilter do
-  let(:notice) do
-    Airbrake::Notice.new(Airbrake::Config.new, AirbrakeTestError.new)
-  end
-
+  let(:notice) { Airbrake::Notice.new(AirbrakeTestError.new) }
   let(:root1) { '/my/gem/root' }
   let(:root2) { '/my/other/gem/root' }
 

data/spec/filters/git_last_checkout_filter_spec.rb

@@ -1,9 +1,7 @@
 RSpec.describe Airbrake::Filters::GitLastCheckoutFilter do
-  subject { described_class.new(Logger.new(STDOUT), '.') }
+  subject { described_class.new('.') }
 
-  let(:notice) do
-    Airbrake::Notice.new(Airbrake::Config.new, AirbrakeTestError.new)
-  end
+  let(:notice) { Airbrake::Notice.new(AirbrakeTestError.new) }
 
   context "when context/lastCheckout is defined" do
     it "doesn't attach anything to context/lastCheckout" do
@@ -14,7 +12,7 @@ RSpec.describe Airbrake::Filters::GitLastCheckoutFilter do
   end
 
   context "when .git directory doesn't exist" do
-    subject { described_class.new(Logger.new(STDOUT), 'root/dir') }
+    subject { described_class.new('root/dir') }
 
     it "doesn't attach anything to context/lastCheckout" do
       subject.call(notice)

data/spec/filters/git_revision_filter_spec.rb

@@ -1,9 +1,7 @@
 RSpec.describe Airbrake::Filters::GitRevisionFilter do
   subject { described_class.new('root/dir') }
 
-  let(:notice) do
-    Airbrake::Notice.new(Airbrake::Config.new, AirbrakeTestError.new)
-  end
+  let(:notice) { Airbrake::Notice.new(AirbrakeTestError.new) }
 
   context "when context/revision is defined" do
     it "doesn't attach anything to context/revision" do

data/spec/filters/keys_blacklist_spec.rb

@@ -1,9 +1,7 @@
 RSpec.describe Airbrake::Filters::KeysBlacklist do
-  subject { described_class.new(Logger.new('/dev/null'), patterns) }
+  subject { described_class.new(patterns) }
 
-  let(:notice) do
-    Airbrake::Notice.new(Airbrake::Config.new, AirbrakeTestError.new)
-  end
+  let(:notice) { Airbrake::Notice.new(AirbrakeTestError.new) }
 
   shared_examples 'pattern matching' do |patts, params|
     let(:patterns) { patts }
@@ -92,14 +90,11 @@ RSpec.describe Airbrake::Filters::KeysBlacklist do
       )
 
       it "logs an error" do
-        out = StringIO.new
-        logger = Logger.new(out)
-        keys_blacklist = described_class.new(logger, patterns)
-        keys_blacklist.call(notice)
-
-        expect(out.string).to(
-          match(/ERROR.+KeysBlacklist is invalid.+patterns: \[#<Object:.+>\]/)
+        expect(Airbrake::Loggable.instance).to receive(:error).with(
+          /KeysBlacklist is invalid.+patterns: \[#<Object:.+>\]/
         )
+        keys_blacklist = described_class.new(patterns)
+        keys_blacklist.call(notice)
       end
     end
 
@@ -108,14 +103,11 @@ RSpec.describe Airbrake::Filters::KeysBlacklist do
 
       context "and when the filter is called once" do
         it "logs an error" do
-          out = StringIO.new
-          logger = Logger.new(out)
-          keys_blacklist = described_class.new(logger, patterns)
-          keys_blacklist.call(notice)
-
-          expect(out.string).to(
-            match(/ERROR.+KeysBlacklist is invalid.+patterns: \[#<Proc:.+>\]/)
+          expect(Airbrake::Loggable.instance).to receive(:error).with(
+            /KeysBlacklist is invalid.+patterns: \[#<Proc:.+>\]/
           )
+          keys_blacklist = described_class.new(patterns)
+          keys_blacklist.call(notice)
         end
       end
 
@@ -140,14 +132,11 @@ RSpec.describe Airbrake::Filters::KeysBlacklist do
     )
 
     it "logs an error" do
-      out = StringIO.new
-      logger = Logger.new(out)
-      keys_blacklist = described_class.new(logger, patterns)
-      keys_blacklist.call(notice)
-
-      expect(out.string).to(
-        match(/ERROR.+KeysBlacklist is invalid.+patterns: \[#<Object:.+>\]/)
+      expect(Airbrake::Loggable.instance).to receive(:error).with(
+        /KeysBlacklist is invalid.+patterns: \[#<Object:.+>\]/
       )
+      keys_blacklist = described_class.new(patterns)
+      keys_blacklist.call(notice)
     end
   end
 

data/spec/filters/keys_whitelist_spec.rb

@@ -1,9 +1,7 @@
 RSpec.describe Airbrake::Filters::KeysWhitelist do
-  subject { described_class.new(Logger.new('/dev/null'), patterns) }
+  subject { described_class.new(patterns) }
 
-  let(:notice) do
-    Airbrake::Notice.new(Airbrake::Config.new, AirbrakeTestError.new)
-  end
+  let(:notice) { Airbrake::Notice.new(AirbrakeTestError.new) }
 
   shared_examples 'pattern matching' do |patts, params|
     let(:patterns) { patts }
@@ -71,14 +69,11 @@ RSpec.describe Airbrake::Filters::KeysWhitelist do
       )
 
       it "logs an error" do
-        out = StringIO.new
-        logger = Logger.new(out)
-        keys_whitelist = described_class.new(logger, patterns)
-        keys_whitelist.call(notice)
-
-        expect(out.string).to(
-          match(/ERROR.+KeysWhitelist is invalid.+patterns: \[#<Object:.+>\]/)
+        expect(Airbrake::Loggable.instance).to receive(:error).with(
+          /KeysWhitelist is invalid.+patterns: \[#<Object:.+>\]/
         )
+        keys_whitelist = described_class.new(patterns)
+        keys_whitelist.call(notice)
       end
     end
 
@@ -87,14 +82,11 @@ RSpec.describe Airbrake::Filters::KeysWhitelist do
 
       context "and when the filter is called once" do
         it "logs an error" do
-          out = StringIO.new
-          logger = Logger.new(out)
-          keys_whitelist = described_class.new(logger, patterns)
-          keys_whitelist.call(notice)
-
-          expect(out.string).to(
-            match(/ERROR.+KeysWhitelist is invalid.+patterns: \[#<Proc:.+>\]/)
+          expect(Airbrake::Loggable.instance).to receive(:error).with(
+            /KeysWhitelist is invalid.+patterns: \[#<Proc:.+>\]/
           )
+          keys_whitelist = described_class.new(patterns)
+          keys_whitelist.call(notice)
         end
 
         include_examples(
@@ -120,14 +112,11 @@ RSpec.describe Airbrake::Filters::KeysWhitelist do
     )
 
     it "logs an error" do
-      out = StringIO.new
-      logger = Logger.new(out)
-      keys_whitelist = described_class.new(logger, patterns)
-      keys_whitelist.call(notice)
-
-      expect(out.string).to(
-        match(/ERROR.+KeysWhitelist is invalid.+patterns: \[#<Object:.+>\]/)
+      expect(Airbrake::Loggable.instance).to receive(:error).with(
+        /KeysWhitelist is invalid.+patterns: \[#<Object:.+>\]/
       )
+      keys_whitelist = described_class.new(patterns)
+      keys_whitelist.call(notice)
     end
   end
 

data/spec/filters/root_directory_filter_spec.rb

@@ -2,10 +2,7 @@ RSpec.describe Airbrake::Filters::RootDirectoryFilter do
   subject { described_class.new(root_directory) }
 
   let(:root_directory) { '/var/www/project' }
-
-  let(:notice) do
-    Airbrake::Notice.new(Airbrake::Config.new, AirbrakeTestError.new)
-  end
+  let(:notice) { Airbrake::Notice.new(AirbrakeTestError.new) }
 
   it "replaces root directory in the backtrace with a label" do
     # rubocop:disable Metrics/LineLength

data/spec/filters/system_exit_filter_spec.rb

@@ -1,13 +1,13 @@
 RSpec.describe Airbrake::Filters::SystemExitFilter do
   it "marks SystemExit exceptions as ignored" do
-    notice = Airbrake::Notice.new(Airbrake::Config.new, SystemExit.new)
+    notice = Airbrake::Notice.new(SystemExit.new)
     expect { subject.call(notice) }.to(
       change { notice.ignored? }.from(false).to(true)
     )
   end
 
   it "doesn't mark non SystemExit exceptions as ignored" do
-    notice = Airbrake::Notice.new(Airbrake::Config.new, AirbrakeTestError.new)
+    notice = Airbrake::Notice.new(AirbrakeTestError.new)
     expect(notice).not_to be_ignored
     expect { subject.call(notice) }.not_to(change { notice.ignored? })
   end

data/spec/filters/thread_filter_spec.rb

@@ -1,7 +1,5 @@
 RSpec.describe Airbrake::Filters::ThreadFilter do
-  let(:notice) do
-    Airbrake::Notice.new(Airbrake::Config.new, AirbrakeTestError.new)
-  end
+  let(:notice) { Airbrake::Notice.new(AirbrakeTestError.new) }
 
   def new_thread
     Thread.new do

data/spec/nested_exception_spec.rb

@@ -1,6 +1,4 @@
 RSpec.describe Airbrake::NestedException do
-  let(:config) { Airbrake::Config.new }
-
   describe "#as_json" do
     context "given exceptions with backtraces" do
       it "unwinds nested exceptions" do
@@ -11,7 +9,7 @@ RSpec.describe Airbrake::NestedException do
             Ruby21Error.raise_error('bingo')
           end
         rescue Ruby21Error => ex
-          nested_exception = described_class.new(config, ex)
+          nested_exception = described_class.new(ex)
           exceptions = nested_exception.as_json
 
           expect(exceptions.size).to eq(2)
@@ -38,7 +36,7 @@ RSpec.describe Airbrake::NestedException do
             end
           end
         rescue Ruby21Error => ex
-          nested_exception = described_class.new(config, ex)
+          nested_exception = described_class.new(ex)
           exceptions = nested_exception.as_json
 
           expect(exceptions.size).to eq(3)
@@ -62,7 +60,7 @@ RSpec.describe Airbrake::NestedException do
           end
         rescue Ruby21Error => ex1
           ex1.set_backtrace([])
-          nested_exception = described_class.new(config, ex1)
+          nested_exception = described_class.new(ex1)
           exceptions = nested_exception.as_json
 
           expect(exceptions.size).to eq(2)

data/spec/notice_notifier_spec.rb

@@ -1,18 +1,14 @@
 # rubocop:disable Layout/DotPosition
 RSpec.describe Airbrake::NoticeNotifier do
-  let(:user_params) do
-    {
+  before do
+    Airbrake::Config.instance = Airbrake::Config.new(
       project_id: 1,
       project_key: 'abc',
       logger: Logger.new('/dev/null'),
       performance_stats: true
-    }
+    )
   end
 
-  let(:params) { {} }
-  let(:config) { Airbrake::Config.new(user_params.merge(params)) }
-  subject { described_class.new(config) }
-
   describe "#new" do
     describe "default filter addition" do
       before { allow_any_instance_of(Airbrake::FilterChain).to receive(:add_filter) }
@@ -30,12 +26,12 @@ RSpec.describe Airbrake::NoticeNotifier do
       end
 
       context "when user config has some whitelist keys" do
-        let(:params) { { whitelist_keys: %w[foo] } }
+        before { Airbrake::Config.instance.merge(whitelist_keys: %w[foo]) }
 
         it "appends the whitelist filter" do
           expect_any_instance_of(Airbrake::FilterChain).to receive(:add_filter)
             .with(instance_of(Airbrake::Filters::KeysWhitelist))
-          described_class.new(config)
+          subject
         end
       end
 
@@ -43,17 +39,17 @@ RSpec.describe Airbrake::NoticeNotifier do
         it "doesn't append the whitelist filter" do
           expect_any_instance_of(Airbrake::FilterChain).not_to receive(:add_filter)
             .with(instance_of(Airbrake::Filters::KeysWhitelist))
-          described_class.new(config)
+          subject
         end
       end
 
       context "when user config has some blacklist keys" do
-        let(:params) { { blacklist_keys: %w[bar] } }
+        before { Airbrake::Config.instance.merge(blacklist_keys: %w[bar]) }
 
         it "appends the blacklist filter" do
           expect_any_instance_of(Airbrake::FilterChain).to receive(:add_filter)
             .with(instance_of(Airbrake::Filters::KeysBlacklist))
-          described_class.new(config)
+          subject
         end
       end
 
@@ -61,17 +57,17 @@ RSpec.describe Airbrake::NoticeNotifier do
         it "doesn't append the blacklist filter" do
           expect_any_instance_of(Airbrake::FilterChain).not_to receive(:add_filter)
             .with(instance_of(Airbrake::Filters::KeysBlacklist))
-          described_class.new(config)
+          subject
         end
       end
 
       context "when user config specifies a root directory" do
-        let(:params) { { root_directory: '/foo' } }
+        before { Airbrake::Config.instance.merge(root_directory: '/foo') }
 
         it "appends the root directory filter" do
           expect_any_instance_of(Airbrake::FilterChain).to receive(:add_filter)
             .with(instance_of(Airbrake::Filters::RootDirectoryFilter))
-          described_class.new(config)
+          subject
         end
       end
 
@@ -81,7 +77,7 @@ RSpec.describe Airbrake::NoticeNotifier do
             .and_return(nil)
           expect_any_instance_of(Airbrake::FilterChain).not_to receive(:add_filter)
             .with(instance_of(Airbrake::Filters::RootDirectoryFilter))
-          described_class.new(config)
+          subject
         end
       end
     end
@@ -90,8 +86,6 @@ RSpec.describe Airbrake::NoticeNotifier do
   describe "#notify" do
     let(:endpoint) { 'https://api.airbrake.io/api/v3/projects/1/notices' }
 
-    subject { described_class.new(Airbrake::Config.new(user_params)) }
-
     let(:body) do
       {
         'id' => '00054414-b147-6ffa-85d6-1524d83362a6',
@@ -161,7 +155,12 @@ RSpec.describe Airbrake::NoticeNotifier do
     end
 
     context "when the provided environment is ignored" do
-      let(:user_params) { { environment: 'test', ignore_environments: %w[test] } }
+      before do
+        Airbrake::Config.instance.merge(
+          environment: 'test',
+          ignore_environments: %w[test]
+        )
+      end
 
       it "doesn't send an notice" do
         expect_any_instance_of(Airbrake::AsyncSender).not_to receive(:send)
@@ -241,7 +240,11 @@ RSpec.describe Airbrake::NoticeNotifier do
     end
 
     context "when the provided environment is ignored" do
-      let(:params) { { environment: 'test', ignore_environments: %w[test] } }
+      before do
+        Airbrake::Config.instance.merge(
+          environment: 'test', ignore_environments: %w[test]
+        )
+      end
 
       it "doesn't send an notice" do
         expect_any_instance_of(Airbrake::SyncSender).not_to receive(:send)