Merge branch 'master' of jules.scsys.co.uk:Moose

diff --git a/lib/Moose/Meta/Role/Application/ToInstance.pm b/lib/Moose/Meta/Role/Application/ToInstance.pm
index 5b5a5f1..f1e3d4e 100644 (file)
--- a/lib/Moose/Meta/Role/Application/ToInstance.pm
+++ b/lib/Moose/Meta/Role/Application/ToInstance.pm
@@ -29,11 +29,11 @@ sub apply {
         unless $obj_meta->isa('Moose::Meta::Class');
 
     my $class = $obj_meta->create_anon_class(
-        superclasses => [ blessed($object) ], cache => 1,
+        superclasses => [ blessed($object) ],
+        roles => [ $role ],
+        cache => 1,
     );
 
-    $self->SUPER::apply( $role, $class );
-
     $class->rebless_instance( $object, %{ $self->rebless_params } );
 }
 

diff --git a/t/030_roles/010_run_time_role_composition.t b/t/030_roles/010_run_time_role_composition.t
index 4ec636c..fbc3937 100644 (file)
--- a/t/030_roles/010_run_time_role_composition.t
+++ b/t/030_roles/010_run_time_role_composition.t
@@ -61,12 +61,12 @@ isa_ok($obj2, 'My::Class');
 }
 
 {
-    ok(!$obj2->does('Bark'), '... we do not do any roles yet');
+    ok(!$obj2->does('Sleeper'), '... we do not do any roles yet');
 
-    Bark->meta->apply($obj2);
+    Sleeper->meta->apply($obj2);
 
-    ok($obj2->does('Bark'), '... we now do the Bark role');
-    is(blessed($obj), blessed($obj2), '... they share the same anon-class/role thing');
+    ok($obj2->does('Sleeper'), '... we now do the Sleeper role');
+    isnt(blessed($obj), blessed($obj2), '... they DO NOT share the same anon-class/role thing');
 }
 
 {
@@ -81,7 +81,7 @@ isa_ok($obj2, 'My::Class');
 
     ok(!My::Class->does('Sleeper'), '... the class does not do the Sleeper role');
 
-    isnt(blessed($obj), blessed($obj2), '... they no longer share the same anon-class/role thing');
+    isnt(blessed($obj), blessed($obj2), '... they still don\'t share the same anon-class/role thing');
 
     isa_ok($obj, 'My::Class');
 
@@ -92,12 +92,12 @@ isa_ok($obj2, 'My::Class');
 }
 
 {
-    ok(!$obj2->does('Sleeper'), '... we do not do any roles yet');
+    ok(!$obj2->does('Bark'), '... we do not do Bark yet');
 
-    Sleeper->meta->apply($obj2);
+    Bark->meta->apply($obj2);
 
-    ok($obj2->does('Sleeper'), '... we now do the Bark role');
-    is(blessed($obj), blessed($obj2), '... they share the same anon-class/role thing again');
+    ok($obj2->does('Bark'), '... we now do the Bark role');
+    isnt(blessed($obj), blessed($obj2), '... they still don\'t share the same anon-class/role thing');
 }
 
 done_testing;

diff --git a/t/100_bugs/028_apply_role_to_one_instance_only.t b/t/100_bugs/028_apply_role_to_one_instance_only.t
new file mode 100644 (file)
index 0000000..be31007
--- /dev/null
+++ b/t/100_bugs/028_apply_role_to_one_instance_only.t
@@ -0,0 +1,44 @@
+#!/usr/bin/perl
+use strict;
+use warnings;
+use Test::More;
+use Test::Exception;
+
+{
+    package MyRole1;
+    use Moose::Role;
+
+    sub a_role_method { 'foo' }
+}
+
+{
+    package MyRole2;
+    use Moose::Role;
+    # empty
+}
+
+{
+    package Foo;
+    use Moose;
+}
+
+my $instance_with_role1 = Foo->new;
+MyRole1->meta->apply($instance_with_role1);
+
+my $instance_with_role2 = Foo->new;
+MyRole2->meta->apply($instance_with_role2);
+
+ok ((not $instance_with_role2->does('MyRole1')),
+    'instance does not have the wrong role');
+
+ok ((not $instance_with_role2->can('a_role_method')),
+    'instance does not have methods from the wrong role');
+
+ok (($instance_with_role1->does('MyRole1')),
+    'role was applied to the correct instance');
+
+lives_and {
+    is $instance_with_role1->a_role_method, 'foo'
+} 'instance has correct role method';
+
+done_testing;