[Catalyst-commits] r10300 - in Catalyst-Runtime/5.80/trunk/t: aggregate lib/TestApp/Controller/Action

[caelum at dev.catalyst.perl.org]

Author: caelum
Date: 2009-05-26 20:44:10 +0000 (Tue, 26 May 2009)
New Revision: 10300

Modified:
   Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_controller_action_chained.t
   Catalyst-Runtime/5.80/trunk/t/lib/TestApp/Controller/Action/Chained.pm
Log:
totally forgot to check if captureargs are decoded, and they already are

Modified: Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_controller_action_chained.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_controller_action_chained.t	2009-05-26 20:41:15 UTC (rev 10299)
+++ Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_controller_action_chained.t	2009-05-26 20:44:10 UTC (rev 10300)
@@ -10,7 +10,7 @@
 
 BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 1; }
 
-use Test::More tests => 147*$iters;
+use Test::More tests => 148*$iters;
 use Catalyst::Test 'TestApp';
 
 if ( $ENV{CAT_BENCHMARK} ) {
@@ -1007,9 +1007,10 @@
 
     {
         ok( my $content =
-            get('http://localhost/chained/return_arg/foo%2Fbar%3B'),
+            get('http://localhost/chained/capture%2Farg%3B/return_arg/foo%2Fbar%3B'),
             'request with URI-encoded arg' );
         like( $content, qr{foo/bar;\z}, 'args decoded' );
+        like( $content, qr{capture/arg;}, 'captureargs decoded' );
     }
     {
         ok( my $content =

Modified: Catalyst-Runtime/5.80/trunk/t/lib/TestApp/Controller/Action/Chained.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/lib/TestApp/Controller/Action/Chained.pm	2009-05-26 20:41:15 UTC (rev 10299)
+++ Catalyst-Runtime/5.80/trunk/t/lib/TestApp/Controller/Action/Chained.pm	2009-05-26 20:44:10 UTC (rev 10300)
@@ -197,7 +197,8 @@
 sub star_search : Chained('view') PathPart('search') Args(0) { }
 sub doc_star : Chained('/') PathPart('chained/doc') Args(1) {}
 
-sub return_arg : Chained('/') PathPart('chained/return_arg') Args(1) {}
+sub return_arg : Chained('view') PathPart('return_arg') Args(1) {}
+
 sub return_arg_decoded : Chained('/') PathPart('chained/return_arg_decoded') Args(1) {
     my ($self, $c) = @_;
     $c->req->args([ map { decode_entities($_) } @{ $c->req->args }]);