Make sure roles are applied to right metaclass

diff --git a/lib/MooseX/ClassAttribute/Trait/Application/ToClass.pm b/lib/MooseX/ClassAttribute/Trait/Application/ToClass.pm
index 423de0f..12a9f29 100644 (file)
--- a/lib/MooseX/ClassAttribute/Trait/Application/ToClass.pm
+++ b/lib/MooseX/ClassAttribute/Trait/Application/ToClass.pm
@@ -8,7 +8,8 @@ use Moose::Role;
 
 with 'MooseX::ClassAttribute::Trait::Application';
 
-sub _apply_class_attributes {
+around apply => sub {
+    my $orig = shift;
     my $self  = shift;
     my $role  = shift;
     my $class = shift;
@@ -20,6 +21,14 @@ sub _apply_class_attributes {
         },
     );
 
+    $self->$orig( $role, $class );
+};
+
+sub _apply_class_attributes {
+    my $self  = shift;
+    my $role  = shift;
+    my $class = shift;
+
     my $attr_metaclass = $class->attribute_metaclass();
 
     foreach my $attribute_name ( $role->get_class_attribute_list() ) {

diff --git a/lib/MooseX/ClassAttribute/Trait/Application/ToRole.pm b/lib/MooseX/ClassAttribute/Trait/Application/ToRole.pm
index 52a6047..babdbff 100644 (file)
--- a/lib/MooseX/ClassAttribute/Trait/Application/ToRole.pm
+++ b/lib/MooseX/ClassAttribute/Trait/Application/ToRole.pm
@@ -11,7 +11,8 @@ use Moose::Role;
 
 with 'MooseX::ClassAttribute::Trait::Application';
 
-sub _apply_class_attributes {
+around apply => sub {
+    my $orig  = shift;
     my $self  = shift;
     my $role1 = shift;
     my $role2 = shift;
@@ -27,6 +28,14 @@ sub _apply_class_attributes {
         },
     );
 
+    $self->$orig( $role1, $role2 );
+};
+
+sub _apply_class_attributes {
+    my $self  = shift;
+    my $role1 = shift;
+    my $role2 = shift;
+
     foreach my $attribute_name ( $role1->get_class_attribute_list() ) {
         if (   $role2->has_class_attribute($attribute_name)
             && $role2->get_class_attribute($attribute_name)

diff --git a/t/06-role.t b/t/06-role.t
index fb1cbb5..43ca560 100644 (file)
--- a/t/06-role.t
+++ b/t/06-role.t
@@ -45,9 +45,8 @@ use Moose::Util qw( apply_all_roles );
     }
 }
 
-is_deeply(
-    [ map { $_->name() } ClassWithRoleHCA->meta()->calculate_all_roles() ],
-    ['RoleHCA'],
+ok(
+    ClassWithRoleHCA->meta()->does_role('RoleHCA'),
     'ClassWithRoleHCA does RoleHCA'
 );
 
@@ -55,9 +54,8 @@ SharedTests::run_tests('ClassWithRoleHCA');
 
 ClassWithRoleHCA->meta()->make_immutable();
 
-is_deeply(
-    [ map { $_->name() } ClassWithRoleHCA->meta()->calculate_all_roles() ],
-    ['RoleHCA'],
+ok(
+    ClassWithRoleHCA->meta()->does_role('RoleHCA'),
     'ClassWithRoleHCA (immutable) does RoleHCA'
 );
 
@@ -73,6 +71,11 @@ is_deeply(
     with 'RoleHCA';
 }
 
+ok(
+    RoleWithRoleHCA->meta()->does_role('RoleHCA'),
+    'RoleWithRoleHCA does RoleHCA'
+);
+
 {
     package ClassWithRoleWithRoleHCA;
 
@@ -99,9 +102,8 @@ is_deeply(
     }
 }
 
-is_deeply(
-    [ map { $_->name() } ClassWithRoleHCA->meta()->calculate_all_roles() ],
-    ['RoleHCA'],
+ok(
+    ClassWithRoleWithRoleHCA->meta()->does_role('RoleHCA'),
     'ClassWithRoleWithRoleHCA does RoleHCA'
 );
 
@@ -109,9 +111,8 @@ SharedTests::run_tests('ClassWithRoleWithRoleHCA');
 
 ClassWithRoleWithRoleHCA->meta()->make_immutable();
 
-is_deeply(
-    [ map { $_->name() } ClassWithRoleHCA->meta()->calculate_all_roles() ],
-    ['RoleHCA'],
+ok(
+    ClassWithRoleWithRoleHCA->meta()->does_role('RoleHCA'),
     'ClassWithRoleWithRoleHCA (immutable) does RoleHCA'
 );
 
@@ -137,9 +138,8 @@ my $instance = InstanceWithRoleHCA->new();
 
 apply_all_roles( $instance, 'RoleHCA' );
 
-is_deeply(
-    [ map { $_->name() } $instance->meta()->calculate_all_roles() ],
-    ['RoleHCA'],
+ok(
+    $instance->meta()->does_role('RoleHCA'),
     '$instance does RoleHCA'
 );
 
@@ -149,9 +149,8 @@ SharedTests::run_tests($instance);
 
 $instance->meta()->make_immutable();
 
-is_deeply(
-    [ map { $_->name() } $instance->meta()->calculate_all_roles() ],
-    ['RoleHCA'],
+ok(
+    $instance->meta()->does_role('RoleHCA'),
     '$instance (immutable) does RoleHCA'
 );