1 files changed, 15 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/mapper_test.rb b/actionpack/test/dispatch/mapper_test.rb
index b6c08ffc33..d3465589c1 100644
--- a/actionpack/test/dispatch/mapper_test.rb
+++ b/actionpack/test/dispatch/mapper_test.rb
@@ -5,6 +5,7 @@ module ActionDispatch
     class MapperTest < ActiveSupport::TestCase
       class FakeSet
         attr_reader :routes
+        alias :set :routes
 
         def initialize
           @routes = []
@@ -35,6 +36,13 @@ module ActionDispatch
         Mapper.new FakeSet.new
       end
 
+      def test_mapping_requirements
+        options = { :controller => 'foo', :action => 'bar' }
+        m = Mapper::Mapping.new FakeSet.new, {}, '/store/:name(*rest)', options
+        _, _, requirements, _ = m.to_route
+        assert_equal(/.+?/, requirements[:rest])
+      end
+
       def test_map_slash
         fakeset = FakeSet.new
         mapper = Mapper.new fakeset
@@ -83,6 +91,13 @@ module ActionDispatch
         assert_equal '/*path', fakeset.conditions.first[:path_info]
         assert_nil fakeset.requirements.first[:path]
       end
+
+      def test_map_wildcard_with_format_true
+        fakeset = FakeSet.new
+        mapper = Mapper.new fakeset
+        mapper.match '/*path', :to => 'pages#show', :format => true
+        assert_equal '/*path.:format', fakeset.conditions.first[:path_info]
+      end
     end
   end
 end