X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F010_basics%2F030_deprecations.t;h=90880c62638ba700fe1ca22cba746efd13b546f9;hb=61697425b329bc667185bb5b2f4be223f2be62c0;hp=7074266626ef09266153e33f05a6db75fd3da51d;hpb=a8eb9fe077a08efb845facc0ba156a79682fa546;p=gitmo%2FMoose.git

diff --git a/t/010_basics/030_deprecations.t b/t/010_basics/030_deprecations.t
index 7074266..90880c6 100644
--- a/t/010_basics/030_deprecations.t
+++ b/t/010_basics/030_deprecations.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::Exception;
+use Test::Fatal;
 use Test::More;
 
 use Test::Requires {
@@ -24,7 +24,7 @@ use Test::Requires {
 
     use Moose;
 
-    ::lives_and(
+    ::is( ::exception (
         sub {
             ::stderr_like{ has foo => (
                     traits => ['String'],
@@ -32,7 +32,7 @@ use Test::Requires {
                     isa    => 'Str',
                 );
                 }
-                qr{\QAllowing a native trait to automatically supply a default is deprecated. You can avoid this warning by supply a default, builder, or making the attribute required at t/010_basics/030_deprecations.t line},
+                qr{\QAllowing a native trait to automatically supply a default is deprecated. You can avoid this warning by supplying a default, builder, or making the attribute required at t/010_basics/030_deprecations.t line},
                 'Not providing a default for native String trait warns';
 
             ::stderr_is{ has bar => (
@@ -49,7 +49,7 @@ use Test::Requires {
             ::stderr_like{ with 'Role' =>
                     { excludes => ['thing'], alias => { thing => 'thing2' } };
                 }
-                qr/\QThe alias and excludes options for role application have been renamed -alias and -excludes (applying Role to Foo - do you need to upgrade Foo?)/,
+                qr/\QThe alias and excludes options for role application have been renamed -alias and -excludes (Foo is consuming Role - do you need to upgrade Foo?)/,
                 'passing excludes or alias with a leading dash warns';
             ::ok(
                 !Foo->meta->has_method('thing'),
@@ -59,15 +59,16 @@ use Test::Requires {
                 Foo->meta->has_method('thing2'),
                 'thing2 method is created as alias in role application'
             );
-        } );
-    }
+        }
+    ), undef );
+}
 
 {
     package Pack1;
 
     use Moose;
 
-    ::lives_and(
+    ::is( ::exception (
         sub {
             ::stderr_is{ has foo => (
                     traits  => ['String'],
@@ -93,7 +94,7 @@ use Test::Requires {
             ::stderr_is{ Pack1->new->_bar } q{},
                 'Providing a reader for a String trait avoids default is warning';
         }
-    );
+    ), undef );
 
     sub _build_foo { q{} }
 }
@@ -103,7 +104,7 @@ use Test::Requires {
 
     use Moose;
 
-    ::lives_and(
+    ::is( ::exception (
         sub {
             ::stderr_is{ has foo => (
                     traits   => ['String'],
@@ -130,6 +131,7 @@ use Test::Requires {
                 q{},
                 'Providing a writer for a String trait avoids default is warning';
         }
+    ), undef );
 }
 
 {
@@ -137,7 +139,7 @@ use Test::Requires {
 
     use Moose;
 
-    ::lives_and(
+    ::is( ::exception (
         sub {
             ::stderr_is{ has foo => (
                     traits     => ['String'],
@@ -164,7 +166,7 @@ use Test::Requires {
                 q{},
                 'Providing a accessor for a String trait avoids default is warning';
         }
-    );
+    ), undef );
 
     sub _build_foo { q{} }
 }