mirror of https://github.com/rails/rails
in regexps, the dot in a character class is not a metacharacter
This commit is contained in:
parent
c42ea2172e
commit
21ff8849bb
|
@ -37,6 +37,6 @@ class ControllerRuntimeLogSubscriberTest < ActionController::TestCase
|
|||
wait
|
||||
|
||||
assert_equal 2, @logger.logged(:info).size
|
||||
assert_match(/\(Views: [\d\.]+ms | ActiveRecord: [\d\.]+ms\)/, @logger.logged(:info)[1])
|
||||
assert_match(/\(Views: [\d.]+ms | ActiveRecord: [\d.]+ms\)/, @logger.logged(:info)[1])
|
||||
end
|
||||
end
|
||||
|
|
|
@ -93,7 +93,7 @@ class ACLogSubscriberTest < ActionController::TestCase
|
|||
def test_process_action_with_view_runtime
|
||||
get :show
|
||||
wait
|
||||
assert_match(/\(Views: [\d\.]+ms\)/, logs[1])
|
||||
assert_match(/\(Views: [\d.]+ms\)/, logs[1])
|
||||
end
|
||||
|
||||
def test_process_action_with_filter_parameters
|
||||
|
|
|
@ -465,8 +465,8 @@ module ActiveRecord
|
|||
# (2) $12.345.678,12
|
||||
case data
|
||||
when /^-?\D+[\d,]+\.\d{2}$/ # (1)
|
||||
data.gsub!(/[^-\d\.]/, '')
|
||||
when /^-?\D+[\d\.]+,\d{2}$/ # (2)
|
||||
data.gsub!(/[^-\d.]/, '')
|
||||
when /^-?\D+[\d.]+,\d{2}$/ # (2)
|
||||
data.gsub!(/[^-\d,]/, '').sub!(/,/, '.')
|
||||
end
|
||||
end
|
||||
|
|
|
@ -379,7 +379,7 @@ module ActiveRecord
|
|||
return [] if string.blank?
|
||||
# always convert table names to downcase as in Oracle quoted table names are in uppercase
|
||||
# ignore raw_sql_ that is used by Oracle adapter as alias for limit/offset subqueries
|
||||
string.scan(/([a-zA-Z_][\.\w]+).?\./).flatten.map{ |s| s.downcase }.uniq - ['raw_sql_']
|
||||
string.scan(/([a-zA-Z_][.\w]+).?\./).flatten.map{ |s| s.downcase }.uniq - ['raw_sql_']
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
@ -70,7 +70,7 @@ module ActiveSupport
|
|||
end
|
||||
|
||||
def parse_grapheme_break_property(line)
|
||||
if line =~ /^([0-9A-F\.]+)\s*;\s*([\w]+)\s*#/
|
||||
if line =~ /^([0-9A-F.]+)\s*;\s*([\w]+)\s*#/
|
||||
type = $2.downcase.intern
|
||||
@ucd.boundary[type] ||= []
|
||||
if $1.include? '..'
|
||||
|
|
|
@ -22,7 +22,7 @@ module Rails
|
|||
gems_paths = (Gem.path + [Gem.default_dir]).uniq.map!{ |p| Regexp.escape(p) }
|
||||
return if gems_paths.empty?
|
||||
|
||||
gems_regexp = %r{(#{gems_paths.join('|')})/gems/([^/]+)-([\w\.]+)/(.*)}
|
||||
gems_regexp = %r{(#{gems_paths.join('|')})/gems/([^/]+)-([\w.]+)/(.*)}
|
||||
add_filter { |line| line.sub(gems_regexp, '\2 (\3) \4') }
|
||||
end
|
||||
end
|
||||
|
|
|
@ -336,7 +336,7 @@ module Rails
|
|||
base.called_from = begin
|
||||
# Remove the line number from backtraces making sure we don't leave anything behind
|
||||
call_stack = caller.map { |p| p.split(':')[0..-2].join(':') }
|
||||
File.dirname(call_stack.detect { |p| p !~ %r[railties[\w\-\.]*/lib/rails|rack[\w\-\.]*/lib/rack] })
|
||||
File.dirname(call_stack.detect { |p| p !~ %r[railties[\w.-]*/lib/rails|rack[\w.-]*/lib/rack] })
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue