X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Froutes.t;h=52296eceea43ff87ad9eabb02c0dd7096a17b834;hb=6135b6b4c098a3a5862f2b690cda638d38d6b162;hp=15d03687936b6c95e4f13a49585c4d7cc3cc7e53;hpb=77d62699ced7fd0493e9932f30c9bac5d8e913c4;p=catagits%2FCatalystX-Routes.git

diff --git a/t/routes.t b/t/routes.t
index 15d0368..52296ec 100644
--- a/t/routes.t
+++ b/t/routes.t
@@ -8,24 +8,14 @@ use Catalyst::Test 'MyApp1';
 use HTTP::Request::Common qw( GET PUT POST DELETE );
 
 {
-    request(
-        GET '/foo',
-        [
-            Accept => 'application/json',
-        ]
-    );
+    request( GET '/foo', ( Accept => 'application/json' ) );
 
     is(
         $MyApp1::Controller::C1::REQ{get}, 1,
         'GET request for /foo went to the right sub'
     );
 
-    request(
-        GET '/foo',
-        [
-            Accept => '*/*',
-        ]
-    );
+    request( GET '/foo', ( Accept => '*/*' ) );
 
     is(
         $MyApp1::Controller::C1::REQ{get_html}, 1,
@@ -55,60 +45,118 @@ use HTTP::Request::Common qw( GET PUT POST DELETE );
 }
 
 {
-    get('c1/bar');
+    request( GET '/c1/bar', ( Accept => 'application/json' ) );
 
     is(
         $MyApp1::Controller::C1::REQ{get}, 2,
-        'GET request for c1/bar went to the right sub'
+        'GET request for /c1/bar went to the right sub'
     );
 
-    request(
-        GET 'c1/bar',
-        [
-            Accept => '*/*',
-        ]
-    );
+    request( GET '/c1/bar', ( Accept => '*/*', ) );
 
     is(
         $MyApp1::Controller::C1::REQ{get_html}, 2,
-        'GET request for c1/bar that looks like a browser went to the right sub'
+        'GET request for /c1/bar that looks like a browser went to the right sub'
     );
 
-    request( POST 'c1/bar' );
+    request( POST '/c1/bar' );
 
     is(
         $MyApp1::Controller::C1::REQ{post}, 2,
-        'POST request for c1/bar went to the right sub'
+        'POST request for /c1/bar went to the right sub'
     );
 
-    request( PUT 'c1/bar' );
+    request( PUT '/c1/bar' );
 
     is(
         $MyApp1::Controller::C1::REQ{put}, 2,
-        'PUT request for c1/bar went to the right sub'
+        'PUT request for /c1/bar went to the right sub'
     );
 
-    request( DELETE 'c1/bar' );
+    request( DELETE '/c1/bar' );
 
     is(
         $MyApp1::Controller::C1::REQ{delete}, 2,
-        'DELETE request for c1/bar went to the right sub'
+        'DELETE request for /c1/bar went to the right sub'
+    );
+}
+
+{
+    request( GET '/chain1/42/chain2/84/baz/foo' );
+
+    is(
+        $MyApp1::Controller::C1::REQ{chain1}, 42,
+        'chain1 chain point captured the first arg'
+    );
+
+    is(
+        $MyApp1::Controller::C1::REQ{chain2}, 84,
+        'chain2 chain point captured the second arg'
+    );
+
+    is(
+        $MyApp1::Controller::C1::REQ{baz}, 'foo',
+        'baz route captured the third arg'
     );
 }
 
 {
-    get('/normal');
+    request( GET '/user/99' );
+
+    is(
+        $MyApp1::Controller::C1::REQ{user}, 99,
+        'get /user/99 calls _set_user chain point'
+    );
+
+    is(
+        $MyApp1::Controller::C1::REQ{user_end}, 99,
+        'get /user/99 calls get chained from _set_user'
+    );
+}
+
+{
+    request( GET '/thing/99' );
+
+    is(
+        $MyApp1::Controller::C1::REQ{thing}, 99,
+        'get /thing/99 calls _set_thing chain point'
+    );
+
+    is(
+        $MyApp1::Controller::C1::REQ{thing_end}, 99,
+        'get /thing/99 calls get chained from _set_thing'
+    );
+}
+
+{
+    request( GET '/normal' );
 
     is(
         $MyApp1::Controller::C1::REQ{normal}, 1,
-        'GET request for /norma went to the right sub'
+        'GET request for /normal went to the right sub'
     );
 
     request( POST '/normal' );
 
     is(
         $MyApp1::Controller::C1::REQ{normal}, 2,
-        'POST request for /norma went to the right sub'
+        'POST request for /normal went to the right sub'
+    );
+}
+
+{
+    request( GET '/' );
+
+    is(
+        $MyApp1::Controller::Root::REQ{root}, 1,
+        'GET request for / went to the right sub (routes work when namespace is empty string)'
+    );
+
+    request( GET '/foo.txt' );
+
+    is(
+        $MyApp1::Controller::Root::REQ{'foo.txt'}, 1,
+        'GET request for /foo.txt went to the right sub (routes work when namespace is empty string)'
     );
 }