1 files changed, 27 insertions, 2 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 807905c7b5..843ae1a813 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -147,6 +147,31 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
 
   def test_star_paths_are_greedy
     rs.draw do
+      match "/*path", :to => lambda { |env|
+        x = env["action_dispatch.request.path_parameters"][:path]
+        [200, {}, [x]]
+      }, :format => false
+    end
+
+    u = URI('http://example.org/foo/bar.html')
+    assert_equal u.path.sub(/^\//, ''), get(u)
+  end
+
+  def test_star_paths_are_greedy_but_not_too_much
+    rs.draw do
+      match "/*path", :to => lambda { |env|
+        x = JSON.dump env["action_dispatch.request.path_parameters"]
+        [200, {}, [x]]
+      }
+    end
+
+    expected = { "path" => "foo/bar", "format" => "html" }
+    u = URI('http://example.org/foo/bar.html')
+    assert_equal expected, JSON.parse(get(u))
+  end
+
+  def test_optional_star_paths_are_greedy
+    rs.draw do
       match "/(*filters)", :to => lambda { |env|
         x = env["action_dispatch.request.path_parameters"][:filters]
         [200, {}, [x]]
@@ -157,9 +182,9 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
     assert_equal u.path.sub(/^\//, ''), get(u)
   end
 
-  def test_star_paths_are_greedy_but_not_too_much
+  def test_optional_star_paths_are_greedy_but_not_too_much
     rs.draw do
-      match "/(*filters).:format", :to => lambda { |env|
+      match "/(*filters)", :to => lambda { |env|
         x = JSON.dump env["action_dispatch.request.path_parameters"]
         [200, {}, [x]]
       }