X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Fdeprecated.t;h=9e5579e8519facc9ae67ecfef508f571b335a482;hp=cfb5adf845c8674a6e8bc7b3e1aef37a03d194aa;hb=c7e57864972917f9db617f3401aa5ba1a2715e9d;hpb=6a163489e06d0e5035aa3f1a155e8c9d82b3ffd2 diff --git a/t/deprecated.t b/t/deprecated.t index cfb5adf..9e5579e 100644 --- a/t/deprecated.t +++ b/t/deprecated.t @@ -1,5 +1,3 @@ -#!/usr/bin/perl - use strict; use warnings; use FindBin qw/$Bin/; @@ -9,13 +7,18 @@ use Test::More tests => 4; my $warnings; BEGIN { # Do this at compile time in case we generate a warning when use # DeprecatedTestApp - $SIG{__WARN__} = sub { $warnings++ if $_[0] =~ /trying to use NEXT/ }; + $SIG{__WARN__} = sub { + $warnings++ if $_[0] =~ /uses NEXT, which is deprecated/; + $warnings++ if $_[0] =~ /trying to use NEXT, which is deprecated/; + }; } use Catalyst; # Cause catalyst to be used so I can fiddle with the logging. my $mvc_warnings; BEGIN { my $logger = Class::MOP::Class->create_anon_class( methods => { + debug => sub {0}, + info => sub {0}, warn => sub { if ($_[1] =~ /switch your class names/) { $mvc_warnings++; @@ -34,7 +37,4 @@ is( $mvc_warnings, 1, 'Get the ::MVC:: warning' ); ok( my $response = request('http://localhost/'), 'Request' ); is( $response->header('X-Catalyst-Plugin-Deprecated'), '1', 'NEXT plugin ran correctly' ); -SKIP: { - skip 'non-dev release', 1 unless Catalyst::_IS_DEVELOPMENT_VERSION(); - is( $warnings, 1, 'Got one and only one Adopt::NEXT warning'); -} +is( $warnings, 1, 'Got one and only one Adopt::NEXT warning');