X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Fplugin_new_method_backcompat.t;h=28455fb8e69ffced73bed05a957308307d258837;hp=a5a2e8a79a091c15714bd8fc225cccb0081aef39;hb=33d3ae66457093bf400181b1a8145460257fc563;hpb=bca6bdad36357e75b0efdcd92bc25f32c07182cd

diff --git a/t/plugin_new_method_backcompat.t b/t/plugin_new_method_backcompat.t
index a5a2e8a..28455fb 100644
--- a/t/plugin_new_method_backcompat.t
+++ b/t/plugin_new_method_backcompat.t
@@ -8,27 +8,27 @@
 # that plugins don't get it wrong for us.
 
 # Also tests method modifiers and etc in MyApp.pm still work as expected.
-use Test::More tests => 6;
-use Test::Exception;
+use Test::More;
 use Moose::Util qw/find_meta/;
 use FindBin;
 use lib "$FindBin::Bin/lib";
 
 use Catalyst::Test qw/TestAppPluginWithConstructor/;
+TestAppPluginWithConstructor->_make_immutable_if_needed;
 ok find_meta('TestAppPluginWithConstructor')->is_immutable,
     'Am immutable after use';
 
 ok request('/foo')->is_success, 'Can get /foo';
 is $TestAppPluginWithConstructor::MODIFIER_FIRED, 1, 'Before modifier was fired correctly.';
 
-throws_ok {
-    package TestAppBadlyImmutable;
-    use Catalyst qw/+TestPluginWithConstructor/;
+my $warning;
+eval "use TestAppBadlyImmutable";
+local $SIG{__WARN__} = sub { $warning .= $_[0] };
 
-    TestAppBadlyImmutable->setup;
+TestAppBadlyImmutable->_make_immutable_if_needed;
 
-    __PACKAGE__->meta->make_immutable( inline_constructor => 0 );
-}
-    qr/\QYou made your application class (TestAppBadlyImmutable) immutable/,
-    'An application class that is already immutable but does not inline the constructor dies at ->setup';
+like $warning, qr/\QYou made your application class (TestAppBadlyImmutable) immutable/,
+    'An application class that is already immutable but does not inline the constructor warns at ->setup';
+
+done_testing;