X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Faggregate%2Funit_core_mvc.t;h=280a7b9f6f9746a24ab1472d572f582af344587c;hb=06316b0d1f745d8a2775cabcae87737831f308f1;hp=c6f9eee73bad3b8b33093d2b43586ad47a5717b9;hpb=9d718832b06daf90ba6e4e497340a9c75c1ab3bb;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/aggregate/unit_core_mvc.t b/t/aggregate/unit_core_mvc.t
index c6f9eee..280a7b9 100644
--- a/t/aggregate/unit_core_mvc.t
+++ b/t/aggregate/unit_core_mvc.t
@@ -2,7 +2,10 @@ use Test::More;
 use strict;
 use warnings;
 
-*Catalyst::Utils::ensure_class_loaded = sub { };
+{
+    no warnings 'redefine';
+    *Catalyst::Utils::ensure_class_loaded = sub { };
+}
 
 use Moose::Meta::Class;
 
@@ -17,7 +20,6 @@ foreach my $comp (@complist) {
     );
 }
 our $warnings = 0;
-our $loaded   = 0;
 
 Moose::Meta::Class->create('Some::Test::Object');
 
@@ -46,17 +48,12 @@ Moose::Meta::Class->create(
         );
     };
     local *Catalyst::Log::warn = sub { $warnings++ };
-    *Class::MOP::load_class = sub {
-        my $class = shift;
-        $loaded++
-            if Class::MOP::is_class_loaded($class) && $class =~ /^MyMVCTestApp/
-    };
 
     __PACKAGE__->setup;
 }
 
 ok( $warnings, 'Issues deprecated warnings' );
-is( $loaded, scalar @complist + 1, 'Loaded all components' );
+is( @{[ MyMVCTestApp->component_list ]}, scalar @complist + 1, 'Loaded all components' );
 
 is( MyMVCTestApp->view('View'), 'MyMVCTestApp::V::View', 'V::View ok' );
 
@@ -158,11 +155,6 @@ our @complist_default_view =
         );
     };
     local *Catalyst::Log::warn = sub { $warnings++ };
-    *Class::MOP::load_class = sub {
-        my $class = shift;
-        $loaded++
-            if Class::MOP::is_class_loaded($class) && $class =~ /^MyMVCTestAppDefaultView/
-    };
 
     __PACKAGE__->config( default_view => 'V' );
 
@@ -194,11 +186,6 @@ our @complist_default_model =
         );
     };
     local *Catalyst::Log::warn = sub { $warnings++ };
-    *Class::MOP::load_class = sub {
-        my $class = shift;
-        $loaded++
-            if Class::MOP::is_class_loaded($class) && $class =~ /^MyMVCTestAppDefaultModel/
-    };
 
     __PACKAGE__->config( default_model => 'M' );
 
@@ -287,10 +274,6 @@ is( MyMVCTestAppDefaultModel->model , 'MyMVCTestAppDefaultModel::Model::M', 'def
 
     no warnings 'redefine';
 
-    *Class::MOP::load_class = sub {
-        $loaded++;
-    };
-
     __PACKAGE__->config( { disable_component_resolution_regex_fallback => 1 } );
 
     __PACKAGE__->components( { map { ( ref($_)||$_ , $_ ) }