0
@@ -4,8 +4,37 @@ describe "When recognizing requests," do
0
 
0
   describe "a route with a Regexp path condition" do
0
     
0
-    it "should allow mixing regular expression paths with string paths when nesting match blocks"
0
+    it "should allow a regex expression" do
0
+      Merb::Router.prepare do |r|
0
+        r.match(%r{^/foos?/(bar|baz)/([a-z0-9]+)}).to(:controller => "foo", :action => "[1]", :id => "[2]")
0
+      end
0
+      
0
+      route_to("/foo/bar/baz").should have_route(:controller => "foo", :action => "bar", :id => "baz")
0
+      route_to("/foos/bar/baz").should have_route(:controller => "foo", :action => "bar", :id => "baz")
0
+      route_to("/bars/foo/baz").should have_nil_route
0
+    end
0
     
0
+    it "should allow mixing regular expression paths with string paths" do
0
+      Merb::Router.prepare do |r|
0
+        r.match(%r{^/(foo|bar)/baz/([a-z0-9]+)}).to(:controller => "[1]", :action => "baz", :id => "[2]")
0
+      end
0
+      
0
+      route_to("/foo/baz/bar").should have_route(:controller => "foo", :action => "baz", :id => "bar")
0
+      route_to("/bar/baz/foo").should have_route(:controller => "bar", :action => "baz", :id => "foo")
0
+      route_to("/for/bar/baz").should have_nil_route
0
+    end
0
+    
0
+    it "should allow mixing regular expression paths with string paths when nesting match blocks" do
0
+      Merb::Router.prepare do |r|
0
+        r.match("/buh/") do |buh|
0
+          buh.match(%r{^(foo|bar)/baz/([a-z0-9]+)}).to(:controller => "[1]", :action => "baz", :id => "[2]")
0
+        end
0
+      end
0
+      
0
+      route_to("/buh/foo/baz/1").should have_route(:controller => "foo", :action => "baz", :id => "1")
0
+      route_to("/buh/bar/baz/buh").should have_route(:controller => "bar", :action => "baz", :id => "buh")
0
+      route_to("/buh/baz/foo/buh").should have_nil_route
0
+    end
0
   end
0
 
0
 end