File tree Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -306,8 +306,8 @@ def normalize_paths(paths)
306
306
gsub ( %r{(.)[\\ /]$} , '\1' ) # drop final / or \ if path ends with it
307
307
308
308
# eliminate .. paths where possible
309
- re = %r{\w +[/\\ ]\. \. [/\\ ]}
310
- path . gsub! ( %r{ \w +[/ \\ ] \. \. [/ \\ ]} , "" ) while path . match ( re )
309
+ re = %r{[^/ \\ ] +[/\\ ]\. \. [/\\ ]}
310
+ path . gsub! ( re , "" ) while path . match ( re )
311
311
path
312
312
end
313
313
Original file line number Diff line number Diff line change @@ -2119,15 +2119,15 @@ def test_with_controllers
2119
2119
end
2120
2120
2121
2121
def test_normalize_unix_paths
2122
- load_paths = %w( . config/../app/controllers config/../app//helpers script/../config/../vendor/rails/actionpack/lib vendor/rails/railties/builtin/rails_info app/models lib script/../config/../foo/bar/../../app/models )
2122
+ load_paths = %w( . config/../app/controllers config/../app//helpers script/../config/../vendor/rails/actionpack/lib vendor/rails/railties/builtin/rails_info app/models lib script/../config/../foo/bar/../../app/models .foo/../.bar foo.bar/../config )
2123
2123
paths = ActionController ::Routing . normalize_paths ( load_paths )
2124
- assert_equal %w( vendor/rails/railties/builtin/rails_info vendor/rails/actionpack/lib app/controllers app/helpers app/models lib . ) , paths
2124
+ assert_equal %w( vendor/rails/railties/builtin/rails_info vendor/rails/actionpack/lib app/controllers app/helpers app/models config .bar lib . ) , paths
2125
2125
end
2126
2126
2127
2127
def test_normalize_windows_paths
2128
- load_paths = %w( . config\\..\\app\\controllers config\\..\\app\\\\helpers script\\..\\config\\..\\vendor\\rails\\actionpack\\lib vendor\\rails\\railties\\builtin\\rails_info app\\models lib script\\..\\config\\..\\foo\\bar\\..\\..\\app\\models )
2128
+ load_paths = %w( . config\\..\\app\\controllers config\\..\\app\\\\helpers script\\..\\config\\..\\vendor\\rails\\actionpack\\lib vendor\\rails\\railties\\builtin\\rails_info app\\models lib script\\..\\config\\..\\foo\\bar\\..\\..\\app\\models .foo\\..\\.bar foo.bar\\..\\config )
2129
2129
paths = ActionController ::Routing . normalize_paths ( load_paths )
2130
- assert_equal %w( vendor\\rails\\railties\\builtin\\rails_info vendor\\rails\\actionpack\\lib app\\controllers app\\helpers app\\models lib . ) , paths
2130
+ assert_equal %w( vendor\\rails\\railties\\builtin\\rails_info vendor\\rails\\actionpack\\lib app\\controllers app\\helpers app\\models config .bar lib . ) , paths
2131
2131
end
2132
2132
2133
2133
def test_routing_helper_module
You can’t perform that action at this time.
0 commit comments