Changed concatination from .merge to +, changed expected tests from 3…

…4 to 35
existere · Jul 9, 2021 · 276b014 · 276b014
1 parent 15aa4b7
commit 276b014
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/brakeman/checks/check_sql.rb b/lib/brakeman/checks/check_sql.rb
@@ -580,7 +580,7 @@ def check_string_arg exp
   ]
 
   def ignore_methods_in_sql
-    @ignore_methods_in_sql ||= IGNORE_METHODS_IN_SQL.merge(tracker.options[:sql_safe_methods] || [])
+    @ignore_methods_in_sql ||= IGNORE_METHODS_IN_SQL + (tracker.options[:sql_safe_methods] || [])
   end
 
   def safe_value? exp

diff --git a/test/tests/github_output.rb b/test/tests/github_output.rb
@@ -6,7 +6,7 @@ def setup
   end
 
   def test_report_format
-    assert_equal 34, @@report.lines.count
+    assert_equal 35, @@report.lines.count
     @@report.lines.each do |line|
       assert line.start_with?('::'), 'Every line must start with `::`'
       assert_equal 2, line.scan('::').count, 'Every line must have exactly 2 `::`'