aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2006-06-07 16:16:37 +0000
committerJamis Buck <jamis@37signals.com>2006-06-07 16:16:37 +0000
commitae7029ddd1fe11890479df119d0f5996c40c80de (patch)
tree4ca4b96ee306b8c116edff2472938904c1845baf /actionpack/test/controller
parent4e3543b46749a83e4ccf1e9346b4dfe6d1a03233 (diff)
downloadrails-ae7029ddd1fe11890479df119d0f5996c40c80de.tar.gz
rails-ae7029ddd1fe11890479df119d0f5996c40c80de.tar.bz2
rails-ae7029ddd1fe11890479df119d0f5996c40c80de.zip
Do some path normalization to prevent the possible_controllers list from containing invalid entries
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4443 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/routing_test.rb13
1 files changed, 12 insertions, 1 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 970bdc4a1a..44e986e3d5 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -1425,5 +1425,16 @@ class RoutingTest < Test::Unit::TestCase
assert_equal c, ActionController::Routing.possible_controllers
end
end
-
+
+ def test_normalize_unix_paths
+ 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)
+ paths = ActionController::Routing.normalize_paths(load_paths)
+ assert_equal %w(vendor/rails/railties/builtin/rails_info vendor/rails/actionpack/lib app/controllers app/helpers app/models lib .), paths
+ end
+
+ def test_normalize_windows_paths
+ 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)
+ paths = ActionController::Routing.normalize_paths(load_paths)
+ assert_equal %w(vendor\\rails\\railties\\builtin\\rails_info vendor\\rails\\actionpack\\lib app\\controllers app\\helpers app\\models lib .), paths
+ end
end