projects
/
catagits/Catalyst-Runtime.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4dcdaae
7698836
)
Merge branch captures_and_args_combined
Tomas Doran [Fri, 21 Oct 2011 15:27:37 +0000 (09:27 -0600)]
1
2
lib/Catalyst.pm
patch
|
diff1
|
diff2
|
blob
|
history
t/aggregate/unit_core_uri_for_action.t
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/Catalyst.pm
Simple merge
diff --cc
t/aggregate/unit_core_uri_for_action.t
index
ccc5910
,
c8925d8
..
c95f978
---
1
/
t/aggregate/unit_core_uri_for_action.t
---
2
/
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;
++