From 84a4ef63a4b890dc29cd62543f52c863fb0f0dd5 Mon Sep 17 00:00:00 2001 From: Prem Sichanugrist Date: Tue, 29 Mar 2011 03:01:46 +0700 Subject: Move mapper_test to the appropriate location It seems like in 89c5b9aee7d7db95cec9e5a934c3761872ab107e Aaron actually put the test in action_dispatch folder. However, there's already a `test/dispatch` directory which I think it's more appropriate. Signed-off-by: Andrew White --- .../test/action_dispatch/routing/mapper_test.rb | 88 ---------------------- 1 file changed, 88 deletions(-) delete mode 100644 actionpack/test/action_dispatch/routing/mapper_test.rb (limited to 'actionpack/test/action_dispatch') diff --git a/actionpack/test/action_dispatch/routing/mapper_test.rb b/actionpack/test/action_dispatch/routing/mapper_test.rb deleted file mode 100644 index f90de735b6..0000000000 --- a/actionpack/test/action_dispatch/routing/mapper_test.rb +++ /dev/null @@ -1,88 +0,0 @@ -require 'abstract_unit' - -module ActionDispatch - module Routing - class MapperTest < ActiveSupport::TestCase - class FakeSet - attr_reader :routes - - def initialize - @routes = [] - end - - def resources_path_names - {} - end - - def request_class - ActionDispatch::Request - end - - def add_route(*args) - routes << args - end - - def conditions - routes.map { |x| x[1] } - end - - def requirements - routes.map { |x| x[2] } - end - end - - def test_initialize - Mapper.new FakeSet.new - end - - def test_map_slash - fakeset = FakeSet.new - mapper = Mapper.new fakeset - mapper.match '/', :to => 'posts#index', :as => :main - assert_equal '/', fakeset.conditions.first[:path_info] - end - - def test_map_more_slashes - fakeset = FakeSet.new - mapper = Mapper.new fakeset - - # FIXME: is this a desired behavior? - mapper.match '/one/two/', :to => 'posts#index', :as => :main - assert_equal '/one/two(.:format)', fakeset.conditions.first[:path_info] - end - - def test_map_wildcard - fakeset = FakeSet.new - mapper = Mapper.new fakeset - mapper.match '/*path', :to => 'pages#show' - assert_equal '/*path(.:format)', fakeset.conditions.first[:path_info] - assert_equal /.+?/, fakeset.requirements.first[:path] - end - - def test_map_wildcard_with_other_element - fakeset = FakeSet.new - mapper = Mapper.new fakeset - mapper.match '/*path/foo/:bar', :to => 'pages#show' - assert_equal '/*path/foo/:bar(.:format)', fakeset.conditions.first[:path_info] - assert_nil fakeset.requirements.first[:path] - end - - def test_map_wildcard_with_multiple_wildcard - fakeset = FakeSet.new - mapper = Mapper.new fakeset - mapper.match '/*foo/*bar', :to => 'pages#show' - assert_equal '/*foo/*bar(.:format)', fakeset.conditions.first[:path_info] - assert_nil fakeset.requirements.first[:foo] - assert_equal /.+?/, fakeset.requirements.first[:bar] - end - - def test_map_wildcard_with_format_false - fakeset = FakeSet.new - mapper = Mapper.new fakeset - mapper.match '/*path', :to => 'pages#show', :format => false - assert_equal '/*path', fakeset.conditions.first[:path_info] - assert_nil fakeset.requirements.first[:path] - end - end - end -end -- cgit v1.2.3