From: Tomas Doran <bobtfish@bobtfish.net>
Date: Fri, 21 Oct 2011 15:27:37 +0000 (-0600)
Subject: Merge branch captures_and_args_combined
X-Git-Tag: 5.90005~4^2~6
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=2ebbf7b954a7c5bf5024a9788728386b37e61e55

Merge branch captures_and_args_combined
---

2ebbf7b954a7c5bf5024a9788728386b37e61e55
diff --cc t/aggregate/unit_core_uri_for_action.t
index ccc5910,c8925d8..c95f978
--- a/t/aggregate/unit_core_uri_for_action.t
+++ b/t/aggregate/unit_core_uri_for_action.t
@@@ -6,9 -6,9 +6,7 @@@ use warnings
  use FindBin;
  use lib "$FindBin::Bin/../lib";
  
--use Test::More;
--
- plan tests => 33;
 -plan tests => 39;
++use Test::More 0.88;
  
  use_ok('TestApp');
  
@@@ -190,3 -212,3 +223,5 @@@ is($context->uri_for($chained_action, 
  
  }
  
++done_testing;
++