airbrake-ruby 5.2.0-java → 5.2.1-java

data/spec/async_sender_spec.rb

@@ -13,18 +13,20 @@ RSpec.describe Airbrake::AsyncSender do
   end
 
   describe "#send" do
+    subject(:async_sender) { described_class.new }
+
     context "when sender has the capacity to send" do
       it "sends notices to Airbrake" do
-        2.times { subject.send(notice, Airbrake::Promise.new) }
-        subject.close
+        2.times { async_sender.send(notice, Airbrake::Promise.new) }
+        async_sender.close
 
         expect(a_request(:post, endpoint)).to have_been_made.twice
       end
 
       it "returns a resolved promise" do
         promise = Airbrake::Promise.new
-        subject.send(notice, promise)
-        subject.close
+        async_sender.send(notice, promise)
+        async_sender.close
 
         expect(promise).to be_resolved
       end
@@ -40,8 +42,8 @@ RSpec.describe Airbrake::AsyncSender do
       end
 
       it "doesn't send the exceeded notices to Airbrake" do
-        15.times { subject.send(notice, Airbrake::Promise.new) }
-        subject.close
+        15.times { async_sender.send(notice, Airbrake::Promise.new) }
+        async_sender.close
 
         expect(a_request(:post, endpoint)).not_to have_been_made
       end
@@ -49,9 +51,9 @@ RSpec.describe Airbrake::AsyncSender do
       it "returns a rejected promise" do
         promise = nil
         15.times do
-          promise = subject.send(notice, Airbrake::Promise.new)
+          promise = async_sender.send(notice, Airbrake::Promise.new)
         end
-        subject.close
+        async_sender.close
 
         expect(promise).to be_rejected
         expect(promise.value).to eq(

data/spec/backtrace_spec.rb

@@ -177,10 +177,13 @@ RSpec.describe Airbrake::Backtrace do
       end
 
       it "logs frames that cannot be parsed" do
-        expect(Airbrake::Loggable.instance).to receive(:error).with(
+        allow(Airbrake::Loggable.instance).to receive(:error)
+
+        described_class.parse(ex)
+
+        expect(Airbrake::Loggable.instance).to have_received(:error).with(
           /can't parse 'a b c 1 23 321 .rb'/,
         )
-        described_class.parse(ex)
       end
     end
 
@@ -298,9 +301,9 @@ RSpec.describe Airbrake::Backtrace do
         it "attaches code to those frames files of which match root_directory" do
           ex = RuntimeError.new
           backtrace = [
-            project_root_path('code.rb') + ":94:in `to_json'",
-            fixture_path('notroot.txt' + ":3:in `pineapple'"),
-            project_root_path('vendor/bundle/ignored_file.rb') + ":2:in `ignore_me'",
+            "#{project_root_path('code.rb')}:94:in `to_json'",
+            fixture_path("notroot.txt:3:in `pineapple'"),
+            "#{project_root_path('vendor/bundle/ignored_file.rb')}:2:in `ignore_me'",
           ]
           ex.set_backtrace(backtrace)
           expect(described_class.parse(ex)).to eq(parsed_backtrace)
@@ -335,7 +338,7 @@ RSpec.describe Airbrake::Backtrace do
 
         it "attaches code to those frames files of which match root_directory" do
           ex = RuntimeError.new
-          ex.set_backtrace([project_root_path('code.rb') + ":94:in `to_json'"])
+          ex.set_backtrace(["#{project_root_path('code.rb')}:94:in `to_json'"])
           expect(described_class.parse(ex)).to eq(parsed_backtrace)
         end
       end
@@ -387,9 +390,9 @@ RSpec.describe Airbrake::Backtrace do
         it "attaches code to first N frames" do
           ex = RuntimeError.new
           backtrace = [
-            project_root_path('code.rb') + ":94:in `to_json'",
-            project_root_path('code.rb') + ":95:in `to_json'",
-            project_root_path('code.rb') + ":96:in `to_json'",
+            "#{project_root_path('code.rb')}:94:in `to_json'",
+            "#{project_root_path('code.rb')}:95:in `to_json'",
+            "#{project_root_path('code.rb')}:96:in `to_json'",
           ]
           ex.set_backtrace(backtrace)
           expect(described_class.parse(ex)).to eq(parsed_backtrace)
@@ -417,7 +420,7 @@ RSpec.describe Airbrake::Backtrace do
 
         it "doesn't attach code to frames" do
           ex = RuntimeError.new
-          backtrace = [project_root_path('code.rb') + ":94:in `to_json'"]
+          backtrace = ["#{project_root_path('code.rb')}:94:in `to_json'"]
           ex.set_backtrace(backtrace)
           expect(described_class.parse(ex)).to eq(parsed_backtrace)
         end

data/spec/benchmark_spec.rb

@@ -1,4 +1,6 @@
 RSpec.describe Airbrake::Benchmark do
+  subject(:benchmark) { described_class.new }
+
   describe ".measure" do
     it "returns measured performance time" do
       expect(described_class.measure { '10' * 10 }).to be_kind_of(Numeric)
@@ -6,14 +8,14 @@ RSpec.describe Airbrake::Benchmark do
   end
 
   describe "#stop" do
-    before { subject }
+    before { benchmark }
 
     context "when called one time" do
       its(:stop) { is_expected.to eq(true) }
     end
 
     context "when called twice or more" do
-      before { subject.stop }
+      before { benchmark.stop }
 
       its(:stop) { is_expected.to eq(false) }
     end
@@ -25,7 +27,7 @@ RSpec.describe Airbrake::Benchmark do
     end
 
     context "when #stop was called" do
-      before { subject.stop }
+      before { benchmark.stop }
 
       its(:duration) { is_expected.to be > 0 }
     end

data/spec/code_hunk_spec.rb

@@ -1,4 +1,6 @@
 RSpec.describe Airbrake::CodeHunk do
+  subject(:code_hunk) { described_class.new }
+
   after do
     %w[empty_file.rb code.rb banana.rb short_file.rb long_line.txt].each do |f|
       Airbrake::FileCache[project_root_path(f)] = nil
@@ -27,10 +29,12 @@ RSpec.describe Airbrake::CodeHunk do
     end
 
     context "when a file has less than NLINES lines before start line" do
-      subject { described_class.new.get(project_root_path('code.rb'), 1) }
+      subject(:code_hunk) do
+        described_class.new.get(project_root_path('code.rb'), 1)
+      end
 
       it do
-        is_expected.to(
+        expect(code_hunk).to(
           eq(
             1 => 'module Airbrake',
             2 => '  ##',
@@ -43,10 +47,12 @@ RSpec.describe Airbrake::CodeHunk do
     end
 
     context "when a file has less than NLINES lines after end line" do
-      subject { described_class.new.get(project_root_path('code.rb'), 222) }
+      subject(:code_hunk) do
+        described_class.new.get(project_root_path('code.rb'), 222)
+      end
 
       it do
-        is_expected.to(
+        expect(code_hunk).to(
           eq(
             220 => '  end',
             221 => 'end',
@@ -56,12 +62,12 @@ RSpec.describe Airbrake::CodeHunk do
     end
 
     context "when a file has less than NLINES lines before and after" do
-      subject do
+      subject(:code_hunk) do
         described_class.new.get(project_root_path('short_file.rb'), 2)
       end
 
       it do
-        is_expected.to(
+        expect(code_hunk).to(
           eq(
             1 => 'module Banana',
             2 => '  attr_reader :bingo',
@@ -72,10 +78,12 @@ RSpec.describe Airbrake::CodeHunk do
     end
 
     context "when a file has enough lines before and after" do
-      subject { described_class.new.get(project_root_path('code.rb'), 100) }
+      subject(:code_hunk) do
+        described_class.new.get(project_root_path('code.rb'), 100)
+      end
 
       it do
-        is_expected.to(
+        expect(code_hunk).to(
           eq(
             98 => '          return json if json && json.bytesize <= MAX_NOTICE_SIZE',
             99 => '        end',
@@ -88,27 +96,28 @@ RSpec.describe Airbrake::CodeHunk do
     end
 
     context "when a line exceeds the length limit" do
-      subject do
+      subject(:code_hunk) do
         described_class.new.get(project_root_path('long_line.txt'), 1)
       end
 
       it "strips the line" do
-        expect(subject[1]).to eq('l' + 'o' * 196 + 'ng')
+        expect(code_hunk[1]).to eq("l#{'o' * 196}ng")
       end
     end
 
     context "when an error occurrs while fetching code" do
       before do
-        expect(Airbrake::FileCache).to receive(:[]).and_raise(Errno::EACCES)
+        allow(Airbrake::Loggable.instance).to receive(:error)
+        allow(Airbrake::FileCache).to receive(:[]).and_raise(Errno::EACCES)
       end
 
       it "logs error and returns nil" do
-        expect(Airbrake::Loggable.instance).to receive(:error).with(
-          /can't read code hunk.+Permission denied/,
-        )
-        expect(subject.get(project_root_path('code.rb'), 1)).to(
+        expect(code_hunk.get(project_root_path('code.rb'), 1)).to(
           eq(1 => ''),
         )
+        expect(Airbrake::Loggable.instance).to have_received(:error).with(
+          /can't read code hunk.+Permission denied/,
+        )
       end
     end
   end

data/spec/config/processor_spec.rb

@@ -44,12 +44,17 @@ RSpec.describe Airbrake::Config::Processor do
   end
 
   describe "#process_remote_configuration" do
+    before do
+      allow(Airbrake::RemoteSettings).to receive(:poll)
+    end
+
     context "when the config doesn't define a project_id" do
       let(:config) { Airbrake::Config.new(project_id: nil) }
 
       it "doesn't set remote settings" do
-        expect(Airbrake::RemoteSettings).not_to receive(:poll)
         described_class.new(config).process_remote_configuration
+
+        expect(Airbrake::RemoteSettings).not_to have_received(:poll)
       end
     end
 
@@ -57,8 +62,9 @@ RSpec.describe Airbrake::Config::Processor do
       let(:config) { Airbrake::Config.new(project_id: 123, environment: 'test') }
 
       it "doesn't set remote settings" do
-        expect(Airbrake::RemoteSettings).not_to receive(:poll)
         described_class.new(config).process_remote_configuration
+
+        expect(Airbrake::RemoteSettings).not_to have_received(:poll)
       end
     end
 
@@ -68,8 +74,9 @@ RSpec.describe Airbrake::Config::Processor do
       end
 
       it "sets remote settings" do
-        expect(Airbrake::RemoteSettings).to receive(:poll)
         described_class.new(config).process_remote_configuration
+
+        expect(Airbrake::RemoteSettings).to have_received(:poll)
       end
     end
 
@@ -77,8 +84,9 @@ RSpec.describe Airbrake::Config::Processor do
       let(:config) { Airbrake::Config.new(project_id: 123, remote_config: false) }
 
       it "doesn't set remote settings" do
-        expect(Airbrake::RemoteSettings).not_to receive(:poll)
         described_class.new(config).process_remote_configuration
+
+        expect(Airbrake::RemoteSettings).not_to have_received(:poll)
       end
     end
   end

data/spec/config/validator_spec.rb

@@ -175,9 +175,12 @@ RSpec.describe Airbrake::Config::Validator do
       end
 
       it "warns about 'no effect'" do
-        expect(config.logger).to receive(:warn)
-          .with(/'ignore_environments' has no effect/)
+        allow(config.logger).to receive(:warn)
+
         described_class.check_notify_ability(config)
+
+        expect(config.logger).to have_received(:warn)
+          .with(/'ignore_environments' has no effect/)
       end
     end
 

data/spec/config_spec.rb

@@ -1,4 +1,6 @@
 RSpec.describe Airbrake::Config do
+  subject(:config) { described_class.new }
+
   let(:resolved_promise) { Airbrake::Promise.new.resolve }
   let(:rejected_promise) { Airbrake::Promise.new.reject }
 
@@ -35,18 +37,22 @@ RSpec.describe Airbrake::Config do
   describe "#new" do
     context "when user config is passed" do
       subject { described_class.new(logger: StringIO.new) }
+
       its(:logger) { is_expected.to be_a(StringIO) }
     end
   end
 
   describe "#valid?" do
-    context "when #validate returns a resolved promise" do
-      before { expect(subject).to receive(:validate).and_return(resolved_promise) }
+    context "when the config is valid" do
+      before do
+        config.project_id = 123
+        config.project_key = 'abc'
+      end
+
       it { is_expected.to be_valid }
     end
 
-    context "when #validate returns a rejected promise" do
-      before { expect(subject).to receive(:validate).and_return(rejected_promise) }
+    context "when the config is invalid" do
       it { is_expected.not_to be_valid }
     end
   end
@@ -54,7 +60,7 @@ RSpec.describe Airbrake::Config do
   describe "#ignored_environment?" do
     context "when Validator returns a resolved promise" do
       before do
-        expect(Airbrake::Config::Validator).to receive(:check_notify_ability)
+        allow(Airbrake::Config::Validator).to receive(:check_notify_ability)
           .and_return(resolved_promise)
       end
 
@@ -63,7 +69,7 @@ RSpec.describe Airbrake::Config do
 
     context "when Validator returns a rejected promise" do
       before do
-        expect(Airbrake::Config::Validator).to receive(:check_notify_ability)
+        allow(Airbrake::Config::Validator).to receive(:check_notify_ability)
           .and_return(rejected_promise)
       end
 
@@ -96,19 +102,21 @@ RSpec.describe Airbrake::Config do
   end
 
   describe "#check_configuration" do
-    let(:user_config) { {} }
-
     subject { described_class.new(valid_params.merge(user_config)) }
 
+    let(:user_config) { {} }
+
     its(:check_configuration) { is_expected.to be_an(Airbrake::Promise) }
 
     context "when config is invalid" do
       let(:user_config) { { project_id: nil } }
+
       its(:check_configuration) { is_expected.to be_rejected }
     end
 
     context "when current environment is ignored" do
       let(:user_config) { { environment: 'test', ignore_environments: ['test'] } }
+
       its(:check_configuration) { is_expected.to be_rejected }
     end
 
@@ -120,12 +128,12 @@ RSpec.describe Airbrake::Config do
   describe "#check_performance_options" do
     it "returns a promise" do
       resource = Airbrake::Query.new(method: '', route: '', query: '', timing: 1)
-      expect(subject.check_performance_options(resource))
+      expect(config.check_performance_options(resource))
         .to be_an(Airbrake::Promise)
     end
 
     context "when performance stats are disabled" do
-      before { subject.performance_stats = false }
+      before { config.performance_stats = false }
 
       let(:resource) do
         Airbrake::Request.new(
@@ -134,7 +142,7 @@ RSpec.describe Airbrake::Config do
       end
 
       it "returns a rejected promise" do
-        promise = subject.check_performance_options(resource)
+        promise = config.check_performance_options(resource)
         expect(promise.value).to eq(
           'error' => "The Performance Stats feature is disabled",
         )
@@ -142,14 +150,14 @@ RSpec.describe Airbrake::Config do
     end
 
     context "when query stats are disabled" do
-      before { subject.query_stats = false }
+      before { config.query_stats = false }
 
       let(:resource) do
         Airbrake::Query.new(method: 'GET', route: '/foo', query: '', timing: 1)
       end
 
       it "returns a rejected promise" do
-        promise = subject.check_performance_options(resource)
+        promise = config.check_performance_options(resource)
         expect(promise.value).to eq(
           'error' => "The Query Stats feature is disabled",
         )
@@ -157,14 +165,14 @@ RSpec.describe Airbrake::Config do
     end
 
     context "when job stats are disabled" do
-      before { subject.job_stats = false }
+      before { config.job_stats = false }
 
       let(:resource) do
         Airbrake::Queue.new(queue: 'foo_queue', error_count: 0, timing: 1)
       end
 
       it "returns a rejected promise" do
-        promise = subject.check_performance_options(resource)
+        promise = config.check_performance_options(resource)
         expect(promise.value).to eq(
           'error' => "The Job Stats feature is disabled",
         )
@@ -174,7 +182,7 @@ RSpec.describe Airbrake::Config do
 
   describe "#logger" do
     it "sets logger level to Logger::WARN" do
-      expect(subject.logger.level).to eq(Logger::WARN)
+      expect(config.logger.level).to eq(Logger::WARN)
     end
   end
 end

data/spec/context_spec.rb

@@ -0,0 +1,54 @@
+RSpec.describe Airbrake::Context do
+  subject(:context) { described_class.current }
+
+  before { described_class.current.clear }
+
+  after { described_class.current.clear }
+
+  describe "#merge!" do
+    it "merges the given context with the current one" do
+      context.merge!(apples: 'oranges')
+      expect(context.to_h).to match(apples: 'oranges')
+    end
+  end
+
+  describe "#clear" do
+    it "clears the context" do
+      context.merge!(apples: 'oranges')
+      context.clear
+      expect(context.to_h).to be_empty
+    end
+  end
+
+  describe "#to_h" do
+    it "returns a hash representation of the context" do
+      expect(context.to_h).to be_a(Hash)
+    end
+  end
+
+  describe "#empty?" do
+    context "when the context has data" do
+      it "returns true" do
+        context.merge!(apples: 'oranges')
+        expect(context).not_to be_empty
+      end
+    end
+
+    context "when the context has NO data" do
+      it "returns false" do
+        expect(context).to be_empty
+      end
+    end
+  end
+
+  context "when another thread is spawned" do
+    it "doesn't clash with other threads' contexts" do
+      described_class.current.merge!(apples: 'oranges')
+      th = Thread.new do
+        described_class.current.merge!(foos: 'bars')
+      end
+      th.join
+      expect(described_class.current.to_h).to match(apples: 'oranges')
+    end
+  end
+end