Fix clone_and_inherit_options() to take 'traits' and 'metaclass' correctly

[gitmo/Mouse.git] / t / 020_attributes / 016_attribute_traits_registered.t

diff --git a/t/020_attributes/016_attribute_traits_registered.t b/t/020_attributes/016_attribute_traits_registered.t
index 91dc88a..1264c68 100755 (executable)
--- a/t/020_attributes/016_attribute_traits_registered.t
+++ b/t/020_attributes/016_attribute_traits_registered.t
@@ -5,13 +5,13 @@ use warnings;
 
 use Test::More tests => 23;
 use Test::Exception;
-use Test::Moose;
-
 
+use lib 't/lib';
+use Test::Mouse;
 
 {
     package My::Attribute::Trait;
-    use Moose::Role;
+    use Mouse::Role;
 
     has 'alias_to' => (is => 'ro', isa => 'Str');
 
@@ -25,13 +25,13 @@ use Test::Moose;
         );
     };
 
-    package Moose::Meta::Attribute::Custom::Trait::Aliased;
+    package Mouse::Meta::Attribute::Custom::Trait::Aliased;
     sub register_implementation { 'My::Attribute::Trait' }
 }
 
 {
     package My::Other::Attribute::Trait;
-    use Moose::Role;
+    use Mouse::Role;
 
     my $method = sub {
         42;
@@ -47,13 +47,13 @@ use Test::Moose;
         );
     };
 
-    package Moose::Meta::Attribute::Custom::Trait::Other;
+    package Mouse::Meta::Attribute::Custom::Trait::Other;
     sub register_implementation { 'My::Other::Attribute::Trait' }
 }
 
 {
     package My::Class;
-    use Moose;
+    use Mouse;
 
     has 'bar' => (
         traits   => [qw/Aliased/],
@@ -65,7 +65,7 @@ use Test::Moose;
 
 {
     package My::Derived::Class;
-    use Moose;
+    use Mouse;
 
     extends 'My::Class';
 
@@ -87,7 +87,10 @@ does_ok($bar_attr, 'My::Attribute::Trait');
 is($bar_attr->foo, "blah", "attr initialized");
 
 ok(!$bar_attr->meta->does_role('Aliased'), "does_role ignores aliases for sanity");
-ok($bar_attr->does('Aliased'), "attr->does uses aliases");
+{
+    local $TODO = 'Mouse does not support ->does($aliased)';
+    ok($bar_attr->does('Aliased'), "attr->does uses aliases");
+}
 ok(!$bar_attr->meta->does_role('Fictional'), "does_role returns false for nonexistent roles");
 ok(!$bar_attr->does('Fictional'), "attr->does returns false for nonexistent roles");
 
@@ -108,7 +111,10 @@ does_ok($derived_bar_attr, 'My::Other::Attribute::Trait' );
 is($derived_bar_attr->the_other_attr, "oink", "attr initialized" );
 
 ok(!$derived_bar_attr->meta->does_role('Aliased'), "does_role ignores aliases for sanity");
-ok($derived_bar_attr->does('Aliased'), "attr->does uses aliases");
+{
+    local $TODO = 'Mouse does not support ->does($aliased)';
+    ok($derived_bar_attr->does('Aliased'), "attr->does uses aliases");
+}
 ok(!$derived_bar_attr->meta->does_role('Fictional'), "does_role returns false for nonexistent roles");
 ok(!$derived_bar_attr->does('Fictional'), "attr->does returns false for nonexistent roles");