added a warning to ->components(), and changed tests which called it to be after...

[catagits/Catalyst-Runtime.git] / t / aggregate / unit_core_component_setup_components.t

diff --git a/t/aggregate/unit_core_component_setup_components.t b/t/aggregate/unit_core_component_setup_components.t
index 5586b42..fd40127 100644 (file)
--- a/t/aggregate/unit_core_component_setup_components.t
+++ b/t/aggregate/unit_core_component_setup_components.t
@@ -10,14 +10,14 @@ Moose::Meta::Class->create( TestAppComponents => (
     },
 ));
 
-TestAppComponents->components( {} );
-
 # this is so TestAppComponents->container will work
 TestAppComponents->setup_config;
 
 # this is so TestAppComponents->log->warn will work
 TestAppComponents->setup_log;
 
+TestAppComponents->components( {} );
+
 my @comps = TestAppComponents->locate_components;
 
 for my $component (@comps) {
@@ -39,12 +39,16 @@ for my $component (@comps) {
 
     ok( !$@, "setup_components doesnt die" );
     ok( $warnings, "it warns about deprecated names" );
-    is_deeply( \@comps, \@loaded_comps, 'all components loaded' );
+
+    # FIXME - do I need the original sort in locate_components service?
+    is_deeply( [ sort @comps ], [ sort @loaded_comps ], 'all components loaded' );
 }
 
-my @controllers = @comps[0..7];
-my @models      = @comps[8..15];
-my @views       = @comps[16..23];
+my @comps_copy  = @comps;
+
+my @controllers = map { s/^TestAppComponents::(C|Controller):://; $_; } @comps_copy[0..7];
+my @models      = map { s/^TestAppComponents::(M|Model):://; $_; }      @comps_copy[8..15];
+my @views       = map { s/^TestAppComponents::(V|View):://; $_; }       @comps_copy[16..23];
 my $container   = TestAppComponents->container;
 
 is_deeply(