Fix tests to work regardless of order of get_all_attributes return value (RT#81713)

diff --git a/Changes b/Changes
index 9e167f6..fdedabe 100644 (file)
--- a/Changes
+++ b/Changes
@@ -3,9 +3,12 @@ Revision history for Perl extension MooseX::MetaDescription
     * Fix tests to work regardless of order of get_all_attributes
       return value (RT#81713)
 
+<<<<<<< HEAD
 0.05 Sat. Mar 3, 2012
     * Fix undeclared dependency on Test::Excpetion. RT#75491
 
+=======
+>>>>>>> 3724a0d... Fix tests to work regardless of order of get_all_attributes return value (RT#81713)
 0.04 Tue. Feb 8, 2010
     * Fix tests to work without undocumented features which
       aren't present in the latest refactor of attributes in roles

diff --git a/t/003_inheriting_meta_desc.t b/t/003_inheriting_meta_desc.t
index 0419d3a..c6833cf 100644 (file)
--- a/t/003_inheriting_meta_desc.t
+++ b/t/003_inheriting_meta_desc.t
@@ -66,7 +66,7 @@ is($baz_attr->metadescription->descriptor, $baz_attr, '... got the circular ref'
     isa_ok($baz_attr->metadescription, 'MooseX::MetaDescription::Description');
     is($baz_attr->metadescription->descriptor, $baz_attr, '... got the circular ref');
 
-    my ($bar_attr_2, $baz_attr_2) = Bar->meta->get_all_attributes;
+    my ($bar_attr_2, $baz_attr_2) = sort { $a->name cmp $b->name } Bar->meta->get_all_attributes;
     is($bar_attr, $bar_attr_2, '... got the same attribute');
     is($baz_attr, $baz_attr_2, '... got the same attribute');
 }