Merge branch 'master' into topic/more-compatible

[gitmo/Mouse.git] / t / 400-define-role.t

diff --git a/t/400-define-role.t b/t/400-define-role.t
index aa7f598..1441463 100644 (file)
--- a/t/400-define-role.t
+++ b/t/400-define-role.t
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 use Test::More tests => 11;
-use Mouse::Util ':test';
+use Test::Exception;
 
 lives_ok {
     package Role;
@@ -18,7 +18,7 @@ throws_ok {
     extends 'Role::Parent';
 
     no Mouse::Role;
-} qr/Roles do not support 'extends'/;
+} qr/Roles do not currently support 'extends'/;
 
 lives_ok {
     package Role;
@@ -44,7 +44,7 @@ lives_ok {
     package Role;
     use Mouse::Role;
 
-    has 'foo';
+    has 'foo' => (is => 'bare');
 
     no Mouse::Role;
 };
@@ -55,23 +55,27 @@ do {
     no Mouse::Role;
 };
 
-throws_ok {
+lives_ok {
     package Role;
     use Mouse::Role;
 
     with 'Other::Role';
 
     no Mouse::Role;
-} qr/Mouse::Role does not currently support 'with'/;
+};
 
-throws_ok {
+TODO: {
     package Role;
     use Mouse::Role;
 
-    excludes 'excluded';
+    eval {
+        excludes 'excluded';
+    };
+    local our $TODO = "Mouse::Role does not currently support 'excludes'";
+    ::ok(!$@, "excludes");
 
     no Mouse::Role;
-} qr/Mouse::Role does not currently support 'excludes'/;
+};
 
 throws_ok {
     package Role;
@@ -89,6 +93,7 @@ lives_ok {
     ::is(blessed($obj), "Impromptu::Class");
 };
 
+our $TODO = 'skip';
 throws_ok {
     package Class;
     use Mouse;