airbrake-ruby 5.2.0-java → 5.2.1-java

data/spec/filters/keys_allowlist_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe Airbrake::Filters::KeysAllowlist do
-  subject { described_class.new(patterns) }
+  subject(:keys_allowlist_filter) { described_class.new(patterns) }
 
   let(:notice) { Airbrake::Notice.new(AirbrakeTestError.new) }
 
@@ -8,11 +8,15 @@ RSpec.describe Airbrake::Filters::KeysAllowlist do
 
     it "filters out the matching values" do
       notice[:params] = params.first
-      subject.call(notice)
+      keys_allowlist_filter.call(notice)
       expect(notice[:params]).to eq(params.last)
     end
   end
 
+  before do
+    allow(Airbrake::Loggable.instance).to receive(:error)
+  end
+
   context "when a pattern is a Regexp" do
     include_examples(
       'pattern matching',
@@ -69,11 +73,12 @@ RSpec.describe Airbrake::Filters::KeysAllowlist do
       )
 
       it "logs an error" do
-        expect(Airbrake::Loggable.instance).to receive(:error).with(
-          /KeysAllowlist is invalid.+patterns: \[#<Object:.+>\]/,
-        )
         keys_allowlist = described_class.new(patterns)
         keys_allowlist.call(notice)
+
+        expect(Airbrake::Loggable.instance).to have_received(:error).with(
+          /KeysAllowlist is invalid.+patterns: \[#<Object:.+>\]/,
+        )
       end
     end
 
@@ -82,11 +87,12 @@ RSpec.describe Airbrake::Filters::KeysAllowlist do
 
       context "and when the filter is called once" do
         it "logs an error" do
-          expect(Airbrake::Loggable.instance).to receive(:error).with(
-            /KeysAllowlist is invalid.+patterns: \[#<Proc:.+>\]/,
-          )
           keys_allowlist = described_class.new(patterns)
           keys_allowlist.call(notice)
+
+          expect(Airbrake::Loggable.instance).to have_received(:error).with(
+            /KeysAllowlist is invalid.+patterns: \[#<Proc:.+>\]/,
+          )
         end
 
         include_examples(
@@ -112,11 +118,12 @@ RSpec.describe Airbrake::Filters::KeysAllowlist do
     )
 
     it "logs an error" do
-      expect(Airbrake::Loggable.instance).to receive(:error).with(
-        /KeysAllowlist is invalid.+patterns: \[#<Object:.+>\]/,
-      )
       keys_allowlist = described_class.new(patterns)
       keys_allowlist.call(notice)
+
+      expect(Airbrake::Loggable.instance).to have_received(:error).with(
+        /KeysAllowlist is invalid.+patterns: \[#<Object:.+>\]/,
+      )
     end
   end
 
@@ -145,14 +152,16 @@ RSpec.describe Airbrake::Filters::KeysAllowlist do
         notice[:params] = bongo
 
         begin
-          expect { subject.call(notice) }.to raise_error(SystemStackError)
+          expect { keys_allowlist_filter.call(notice) }.to raise_error(SystemStackError)
         rescue RSpec::Expectations::ExpectationNotMetError => ex
           # JRuby might raise two different exceptions, which represent the same
           # thing. One is a Java exception, the other is a Ruby exception.
           # Likely a bug: https://github.com/jruby/jruby/issues/1903
           raise ex unless RUBY_ENGINE == 'jruby'
 
-          expect { subject.call(notice) }.to raise_error(java.lang.StackOverflowError)
+          expect do
+            keys_allowlist_filter.call(notice)
+          end.to raise_error(java.lang.StackOverflowError)
         end
       end
     end
@@ -165,7 +174,7 @@ RSpec.describe Airbrake::Filters::KeysAllowlist do
       context "when it contains query params" do
         it "filters the params" do
           notice[:context][:url] = 'http://localhost:3000/crash?foo=bar&baz=bongo&bish=bash'
-          subject.call(notice)
+          keys_allowlist_filter.call(notice)
           expect(notice[:context][:url]).to(
             eq('http://localhost:3000/crash?foo=[Filtered]&baz=[Filtered]&bish=bash'),
           )
@@ -176,7 +185,7 @@ RSpec.describe Airbrake::Filters::KeysAllowlist do
         it "leaves the URL unfiltered" do
           notice[:context][:url] =
             'http://localhost:3000/cra]]]sh?foo=bar&baz=bongo&bish=bash'
-          subject.call(notice)
+          keys_allowlist_filter.call(notice)
           expect(notice[:context][:url]).to(
             eq('http://localhost:3000/cra]]]sh?foo=bar&baz=bongo&bish=bash'),
           )
@@ -186,7 +195,7 @@ RSpec.describe Airbrake::Filters::KeysAllowlist do
       context "when it is without a query" do
         it "leaves the URL untouched" do
           notice[:context][:url] = 'http://localhost:3000/crash'
-          subject.call(notice)
+          keys_allowlist_filter.call(notice)
           expect(notice[:context][:url]).to(eq('http://localhost:3000/crash'))
         end
       end

data/spec/filters/keys_blocklist_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe Airbrake::Filters::KeysBlocklist do
-  subject { described_class.new(patterns) }
+  subject(:keys_blocklist_filter) { described_class.new(patterns) }
 
   let(:notice) { Airbrake::Notice.new(AirbrakeTestError.new) }
 
@@ -8,11 +8,15 @@ RSpec.describe Airbrake::Filters::KeysBlocklist do
 
     it "filters out the matching values" do
       notice[:params] = params.first
-      subject.call(notice)
+      keys_blocklist_filter.call(notice)
       expect(notice[:params]).to eq(params.last)
     end
   end
 
+  before do
+    allow(Airbrake::Loggable.instance).to receive(:error)
+  end
+
   context "when a pattern is a Regexp" do
     include_examples(
       'pattern matching',
@@ -29,7 +33,7 @@ RSpec.describe Airbrake::Filters::KeysBlocklist do
       # https://github.com/airbrake/airbrake/issues/739
       it "doesn't fail" do
         notice[:params] = { bingo: { {} => 'unfiltered' } }
-        expect { subject.call(notice) }.not_to raise_error
+        expect { keys_blocklist_filter.call(notice) }.not_to raise_error
       end
     end
   end
@@ -90,11 +94,12 @@ RSpec.describe Airbrake::Filters::KeysBlocklist do
       )
 
       it "logs an error" do
-        expect(Airbrake::Loggable.instance).to receive(:error).with(
-          /KeysBlocklist is invalid.+patterns: \[#<Object:.+>\]/,
-        )
         keys_blocklist = described_class.new(patterns)
         keys_blocklist.call(notice)
+
+        expect(Airbrake::Loggable.instance).to have_received(:error).with(
+          /KeysBlocklist is invalid.+patterns: \[#<Object:.+>\]/,
+        )
       end
     end
 
@@ -103,18 +108,19 @@ RSpec.describe Airbrake::Filters::KeysBlocklist do
 
       context "and when the filter is called once" do
         it "logs an error" do
-          expect(Airbrake::Loggable.instance).to receive(:error).with(
-            /KeysBlocklist is invalid.+patterns: \[#<Proc:.+>\]/,
-          )
           keys_blocklist = described_class.new(patterns)
           keys_blocklist.call(notice)
+
+          expect(Airbrake::Loggable.instance).to have_received(:error).with(
+            /KeysBlocklist is invalid.+patterns: \[#<Proc:.+>\]/,
+          )
         end
       end
 
       context "and when the filter is called twice" do
         it "unwinds procs and filters keys" do
           notice[:params] = { bingo: 'bango', bongo: 'bish' }
-          2.times { subject.call(notice) }
+          2.times { keys_blocklist_filter.call(notice) }
           expect(notice[:params]).to eq(bingo: '[Filtered]', bongo: 'bish')
         end
       end
@@ -132,11 +138,12 @@ RSpec.describe Airbrake::Filters::KeysBlocklist do
     )
 
     it "logs an error" do
-      expect(Airbrake::Loggable.instance).to receive(:error).with(
-        /KeysBlocklist is invalid.+patterns: \[#<Object:.+>\]/,
-      )
       keys_blocklist = described_class.new(patterns)
       keys_blocklist.call(notice)
+
+      expect(Airbrake::Loggable.instance).to have_received(:error).with(
+        /KeysBlocklist is invalid.+patterns: \[#<Object:.+>\]/,
+      )
     end
   end
 
@@ -185,7 +192,7 @@ RSpec.describe Airbrake::Filters::KeysBlocklist do
         notice[:context][:url] =
           'http://localhost:3000/crash?foo=bar&baz=bongo&bish=bash&color=%23FFAAFF'
 
-        subject.call(notice)
+        keys_blocklist_filter.call(notice)
         expect(notice[:context][:url]).to(
           eq('http://localhost:3000/crash?foo=bar&baz=bongo&bish=[Filtered]&color=%23FFAAFF'),
         )
@@ -197,7 +204,7 @@ RSpec.describe Airbrake::Filters::KeysBlocklist do
 
       it "filters out the user" do
         notice[:context][:user] = { id: 1337, name: 'Bingo Bango' }
-        subject.call(notice)
+        keys_blocklist_filter.call(notice)
         expect(notice[:context][:user]).to eq('[Filtered]')
       end
     end
@@ -207,7 +214,7 @@ RSpec.describe Airbrake::Filters::KeysBlocklist do
 
       it "filters out individual user fields" do
         notice[:context][:user] = { id: 1337, name: 'Bingo Bango' }
-        subject.call(notice)
+        keys_blocklist_filter.call(notice)
         expect(notice[:context][:user][:name]).to eq('[Filtered]')
       end
     end
@@ -218,7 +225,7 @@ RSpec.describe Airbrake::Filters::KeysBlocklist do
 
     it "filters out the headers" do
       notice[:context][:headers] = { 'HTTP_COOKIE' => 'banana' }
-      subject.call(notice)
+      keys_blocklist_filter.call(notice)
       expect(notice[:context][:headers]).to eq('[Filtered]')
     end
 
@@ -227,7 +234,7 @@ RSpec.describe Airbrake::Filters::KeysBlocklist do
 
       it "filters out individual header fields" do
         notice[:context][:headers] = { 'HTTP_COOKIE' => 'banana' }
-        subject.call(notice)
+        keys_blocklist_filter.call(notice)
         expect(notice[:context][:headers]['HTTP_COOKIE']).to eq('[Filtered]')
       end
     end

data/spec/filters/root_directory_filter_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe Airbrake::Filters::RootDirectoryFilter do
-  subject { described_class.new(root_directory) }
+  subject(:root_directory_filter) { described_class.new(root_directory) }
 
   let(:root_directory) { '/var/www/project' }
   let(:notice) { Airbrake::Notice.new(AirbrakeTestError.new) }
@@ -14,7 +14,7 @@ RSpec.describe Airbrake::Filters::RootDirectoryFilter do
     ]
     # rubocop:enable Layout/LineLength
 
-    subject.call(notice)
+    root_directory_filter.call(notice)
 
     # rubocop:disable Layout/LineLength
     expect(notice[:errors].first[:backtrace]).to(
@@ -32,7 +32,7 @@ RSpec.describe Airbrake::Filters::RootDirectoryFilter do
 
   it "does not filter file when it is nil" do
     expect(notice[:errors].first[:file]).to be_nil
-    expect { subject.call(notice) }.not_to(
+    expect { root_directory_filter.call(notice) }.not_to(
       change { notice[:errors].first[:file] },
     )
   end

data/spec/filters/sql_filter_spec.rb

@@ -20,14 +20,14 @@ RSpec.describe Airbrake::Filters::SqlFilter do
     end
   end
 
-  ALL_DIALECTS = %i[mysql postgres sqlite cassandra oracle].freeze
+  all_dialects = %i[mysql postgres sqlite cassandra oracle].freeze
 
   # rubocop:disable Layout/LineLength
   [
     {
       input: 'SELECT * FROM things;',
       output: 'SELECT * FROM things;',
-      dialects: ALL_DIALECTS,
+      dialects: all_dialects,
     }, {
       input: "SELECT `t001`.`c2` FROM `t001` WHERE `t001`.`c2` = 'value' AND c3=\"othervalue\" LIMIT ?",
       output: "SELECT `t001`.`c2` FROM `t001` WHERE `t001`.`c2` = ? AND c3=? LIMIT ?",
@@ -39,7 +39,7 @@ RSpec.describe Airbrake::Filters::SqlFilter do
     }, {
       input: "SELECT * FROM t WHERE foo='bar/*' AND baz='whatever */qux'",
       output: "SELECT * FROM t WHERE foo=? AND baz=?",
-      dialects: ALL_DIALECTS,
+      dialects: all_dialects,
     }, {
       input: "SELECT \"t001\".\"c2\" FROM \"t001\" WHERE \"t001\".\"c2\" = 'value' AND c3=1234 LIMIT 1",
       output: "SELECT \"t001\".\"c2\" FROM \"t001\" WHERE \"t001\".\"c2\" = ? AND c3=? LIMIT ?",
@@ -51,19 +51,19 @@ RSpec.describe Airbrake::Filters::SqlFilter do
     }, {
       input: "SELECT * FROM t WHERE foo='bar--' AND\n  baz='qux--'",
       output: "SELECT * FROM t WHERE foo=? AND\n  baz=?",
-      dialects: ALL_DIALECTS,
+      dialects: all_dialects,
     }, {
       input: "SELECT * FROM foo WHERE bar='baz' /* Hide Me */",
       output: "SELECT * FROM foo WHERE bar=? ?",
-      dialects: ALL_DIALECTS,
+      dialects: all_dialects,
     }, {
       input: "SELECT * FROM foobar WHERE password='hunter2'\n-- No peeking!",
       output: "SELECT * FROM foobar WHERE password=?\n?",
-      dialects: ALL_DIALECTS,
+      dialects: all_dialects,
     }, {
       input: "SELECT foo, bar FROM baz WHERE password='hunter2' # Secret",
       output: "SELECT foo, bar FROM baz WHERE password=? ?",
-      dialects: ALL_DIALECTS,
+      dialects: all_dialects,
     }, {
       input: "SELECT \"col1\", \"col2\" from \"table\" WHERE \"col3\"=E'foo\\'bar\\\\baz' AND country=e'foo\\'bar\\\\baz'",
       output: "SELECT \"col1\", \"col2\" from \"table\" WHERE \"col3\"=E?",
@@ -79,11 +79,11 @@ RSpec.describe Airbrake::Filters::SqlFilter do
     }, {
       input: "SELECT c11.col1, c22.col2 FROM table c11, table c22 WHERE value='nothing'",
       output: "SELECT c11.col1, c22.col2 FROM table c11, table c22 WHERE value=?",
-      dialects: ALL_DIALECTS,
+      dialects: all_dialects,
     }, {
       input: "INSERT INTO X VALUES(1, 23456, 123.456, 99+100)",
       output: "INSERT INTO X VALUES(?)",
-      dialects: ALL_DIALECTS,
+      dialects: all_dialects,
     }, {
       input: "SELECT * FROM table WHERE name=\"foo\" AND value=\"don't\"",
       output: "SELECT * FROM table WHERE name=? AND value=?",
@@ -91,19 +91,19 @@ RSpec.describe Airbrake::Filters::SqlFilter do
     }, {
       input: "SELECT * FROM table WHERE name='foo' AND value = 'bar'",
       output: "SELECT * FROM table WHERE name=? AND value = ?",
-      dialects: ALL_DIALECTS,
+      dialects: all_dialects,
     }, {
       input: "SELECT * FROM table WHERE col='foo\\''bar'",
       output: "SELECT * FROM table WHERE col=?",
-      dialects: ALL_DIALECTS,
+      dialects: all_dialects,
     }, {
       input: "SELECT * FROM table WHERE col1='foo\"bar' AND col2='what\"ever'",
       output: "SELECT * FROM table WHERE col1=? AND col2=?",
-      dialects: ALL_DIALECTS,
+      dialects: all_dialects,
     }, {
       input: "select * from accounts where accounts.name != 'dude\n newline' order by accounts.name",
       output: "select * from accounts where accounts.name != ? order by accounts.name",
-      dialects: ALL_DIALECTS,
+      dialects: all_dialects,
     }, {
       input: "SELECT * FROM table WHERE col1=\"don't\" AND col2=\"won't\"",
       output: "SELECT * FROM table WHERE col1=? AND col2=?",
@@ -115,7 +115,7 @@ RSpec.describe Airbrake::Filters::SqlFilter do
     }, {
       input: "SELECT * FROM table WHERE name='foo\\' AND color='blue'",
       output: "SELECT * FROM table WHERE name=?",
-      dialects: ALL_DIALECTS,
+      dialects: all_dialects,
     }, {
       input: "SELECT * FROM table WHERE foo=\"this string ends with a backslash\\\\\"",
       output: "SELECT * FROM table WHERE foo=?",
@@ -123,36 +123,36 @@ RSpec.describe Airbrake::Filters::SqlFilter do
     }, {
       input: "SELECT * FROM table WHERE foo='this string ends with a backslash\\\\'",
       output: "SELECT * FROM table WHERE foo=?",
-      dialects: ALL_DIALECTS,
+      dialects: all_dialects,
     }, {
       # TODO: fix this example.
       input: "SELECT * FROM table WHERE name='foo\'' AND color='blue'",
       output: "Error: Airbrake::Query was not filtered",
-      dialects: ALL_DIALECTS,
+      dialects: all_dialects,
     }, {
       input: "INSERT INTO X values('', 'a''b c',0, 1 , 'd''e f''s h')",
       output: "INSERT INTO X values(?)",
-      dialects: ALL_DIALECTS,
+      dialects: all_dialects,
     }, {
       input: "SELECT * FROM t WHERE -- '\n  bar='baz' -- '",
       output: "SELECT * FROM t WHERE ?\n  bar=? ?",
-      dialects: ALL_DIALECTS,
+      dialects: all_dialects,
     }, {
       input: "SELECT * FROM t WHERE /* ' */\n  bar='baz' -- '",
       output: "SELECT * FROM t WHERE ?\n  bar=? ?",
-      dialects: ALL_DIALECTS,
+      dialects: all_dialects,
     }, {
       input: "SELECT * FROM t WHERE -- '\n  /* ' */ c2='xxx' /* ' */\n  c='x\n  xx' -- '",
       output: "SELECT * FROM t WHERE ?\n  ? c2=? ?\n  c=? ?",
-      dialects: ALL_DIALECTS,
+      dialects: all_dialects,
     }, {
       input: "SELECT * FROM t WHERE -- '\n  c='x\n  xx' -- '",
       output: "SELECT * FROM t WHERE ?\n  c=? ?",
-      dialects: ALL_DIALECTS,
+      dialects: all_dialects,
     }, {
       input: "SELECT * FROM foo WHERE col='value1' AND /* don't */ col2='value1' /* won't */",
       output: "SELECT * FROM foo WHERE col=? AND ? col2=? ?",
-      dialects: ALL_DIALECTS,
+      dialects: all_dialects,
     }, {
       input: "SELECT * FROM table WHERE foo='bar' AND baz=\"nothing to see here'",
       output: "Error: Airbrake::Query was not filtered",
@@ -160,7 +160,7 @@ RSpec.describe Airbrake::Filters::SqlFilter do
     }, {
       input: "SELECT * FROM table WHERE foo='bar' AND baz='nothing to see here",
       output: "Error: Airbrake::Query was not filtered",
-      dialects: ALL_DIALECTS,
+      dialects: all_dialects,
     }, {
       input: "SELECT * FROM \"foo\" WHERE \"foo\" = $a$dollar quotes can be $b$nested$b$$a$ and bar = 'baz'",
       output: "SELECT * FROM \"foo\" WHERE \"foo\" = ? and bar = ?",
@@ -172,11 +172,11 @@ RSpec.describe Airbrake::Filters::SqlFilter do
     }, {
       input: "select * from foo where bar = 'some\\tthing' and baz = 10",
       output: "select * from foo where bar = ? and baz = ?",
-      dialects: ALL_DIALECTS,
+      dialects: all_dialects,
     }, {
       input: "select * from users where user = 'user1\\' password = 'hunter 2' -- ->don't count this quote",
       output: "select * from users where user = ?",
-      dialects: ALL_DIALECTS,
+      dialects: all_dialects,
     }, {
       input: "select * from foo where bar=q'[baz's]' and x=5",
       output: "select * from foo where bar=? and x=?",
@@ -204,7 +204,7 @@ RSpec.describe Airbrake::Filters::SqlFilter do
     }, {
       input: "select * from foo where bar=1.234e-5 and x=5",
       output: "select * from foo where bar=? and x=?",
-      dialects: ALL_DIALECTS,
+      dialects: all_dialects,
     }, {
       input: "select * from foo where bar=01234567-89ab-cdef-0123-456789abcdef and x=5",
       output: "select * from foo where bar=? and x=?",

data/spec/filters/system_exit_filter_spec.rb

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