From: Jonathan "Duke" Leto Date: Sat, 12 Mar 2011 01:05:27 +0000 (-0800) Subject: Make default test names reflect reality more and fix a buglet, rafl++ X-Git-Tag: 5.80033~33 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=901991e63957ab5361ea13e867532d8d8ef2cf7a;hp=2d65525759b6ff95cd0838ccef48892d7d45b92b Make default test names reflect reality more and fix a buglet, rafl++ --- diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm index 14dcc47..7befe99 100644 --- a/lib/Catalyst/Test.pm +++ b/lib/Catalyst/Test.pm @@ -84,15 +84,21 @@ my $build_exports = sub { }, action_ok => sub { my $action = shift; - return Test::More->builder->ok($request->($action)->is_success,@_ || "a route handler is defined for $action"); + my $meth = $request->($action)->request->method; + my @args = @_ ? @_ : ("$meth $action returns successfully"); + return Test::More->builder->ok($request->($action)->is_success,@args); }, action_redirect => sub { my $action = shift; - return Test::More->builder->ok($request->($action)->is_redirect,@_ || "a route handler redirects for $action"); + my $meth = $request->($action)->request->method; + my @args = @_ ? @_ : ("$meth $action returns a redirect"); + return Test::More->builder->ok($request->($action)->is_redirect,@args); }, action_notfound => sub { my $action = shift; - return Test::More->builder->is_eq($request->($action)->code,404,@_ || "a route handler is not defined for $action"); + my $meth = $request->($action)->request->method; + my @args = @_ ? @_ : ("$meth $action returns a 404"); + return Test::More->builder->is_eq($request->($action)->code,404,@args); }, contenttype_is => sub { my $action = shift; diff --git a/t/live_catalyst_test.t b/t/live_catalyst_test.t index 1adecbb..c37372a 100644 --- a/t/live_catalyst_test.t +++ b/t/live_catalyst_test.t @@ -3,12 +3,16 @@ use lib "$FindBin::Bin/lib"; use Catalyst::Test 'TestApp', {default_host => 'default.com'}; use Catalyst::Request; -use Test::More tests => 9; +use Test::More tests => 10; content_like('/',qr/root/,'content check'); action_ok('/','Action ok ok','normal action ok'); action_redirect('/engine/response/redirect/one','redirect check'); action_notfound('/engine/response/status/s404','notfound check'); + +# so we can see the default test name +action_ok('/'); + contenttype_is('/action/local/one','text/plain','Contenttype check'); ### local_request() was not setting response base from base href