Use Class::Load instead of Class::MOP::load_class(). RT#90978

diff --git a/CHANGES b/CHANGES
index 73045fc..dffa4b9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 Revision history for Perl module Test::WWW::Mechanize::Catalyst:
 
+     - Use Class::Load instead of Class::MOP::load_class(). RT#90978
+
 0.58 Sat Jun 30 17:01 BST 2012
      - Fix external server test.
      - Fix infinite redirects. RT#76614

diff --git a/Makefile.PL b/Makefile.PL
index f901f19..dbe7c9f 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -9,6 +9,7 @@ perl_version '5.008004';
 all_from 'lib/Test/WWW/Mechanize/Catalyst.pm';
 
 requires 'Catalyst'                                 => '5.90';
+requires 'Class::Load'                              => '0.19';
 requires 'LWP'                                      => '5.816';
 requires 'Test::WWW::Mechanize'                     => '1.14';
 requires 'WWW::Mechanize'                           => '1.54';

diff --git a/lib/Test/WWW/Mechanize/Catalyst.pm b/lib/Test/WWW/Mechanize/Catalyst.pm
index 31d6cbd..4baffd1 100644 (file)
--- a/lib/Test/WWW/Mechanize/Catalyst.pm
+++ b/lib/Test/WWW/Mechanize/Catalyst.pm
@@ -4,6 +4,7 @@ use Moose;
 
 use Carp qw/croak/;
 require Catalyst::Test; # Do not call import
+use Class::Load qw(load_class is_class_loaded);
 use Encode qw();
 use HTML::Entities;
 use Test::WWW::Mechanize;
@@ -66,8 +67,8 @@ sub BUILD {
   unless ($ENV{CATALYST_SERVER}) {
     croak "catalyst_app attribute is required unless CATALYST_SERVER env variable is set"
       unless $self->has_catalyst_app;
-    Class::MOP::load_class($self->catalyst_app)
-      unless (Class::MOP::is_class_loaded($self->catalyst_app));
+    load_class($self->catalyst_app)
+      unless (is_class_loaded($self->catalyst_app));
   }
 }
 
@@ -241,8 +242,8 @@ sub import {
   my ($class, $app) = @_;
 
   if (defined $app) {
-    Class::MOP::load_class($app)
-      unless (Class::MOP::is_class_loaded($app));
+    load_class($app)
+      unless (is_class_loaded($app));
     $APP_CLASS = $app; 
   }