X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Flib%2FTestApp.pm;h=c2545db9006059f25c5fe31a54fb83c9f37d7bb6;hp=89332babc9a73a9878691c6cece910ff29510d69;hb=eefc03e12890c06c9a76d78b4d68e3b2ad781328;hpb=6e8520be0c895f96e8e28f724ba73ba70ea4fac6

diff --git a/t/lib/TestApp.pm b/t/lib/TestApp.pm
index 89332ba..c2545db 100644
--- a/t/lib/TestApp.pm
+++ b/t/lib/TestApp.pm
@@ -11,9 +11,10 @@ use Catalyst qw/
     +TestApp::Role
 /;
 use Catalyst::Utils;
+use Class::Load 'try_load_class';
 
 use Moose;
-use namespace::autoclean;
+use namespace::clean -except => [ 'meta' ];
 
 # -----------
 # t/aggregate/unit_core_ctx_attr.t pukes until lazy is true
@@ -50,6 +51,7 @@ TestApp->config(
             action_action_nine => { another_extra_arg => 13 }
         }
     },
+    encoding => 'UTF-8',
     abort_chain_on_error_fix => 1,
 );
 
@@ -58,7 +60,7 @@ TestApp->config(
 # above ->setup so we have some generated methods to be double sure.
 has an_attribute_before_we_change_base_classes => ( is => 'ro');
 
-if ($::setup_leakchecker && eval { Class::MOP::load_class('CatalystX::LeakChecker'); 1 }) {
+if ($::setup_leakchecker && try_load_class('CatalystX::LeakChecker')) {
     with 'CatalystX::LeakChecker';
 
     has leaks => (
@@ -143,9 +145,6 @@ sub finalize_headers {
 # Make sure we can load Inline plugins. 
 
 package Catalyst::Plugin::Test::Inline;
-
-use strict;
-
-use base qw/Class::Data::Inheritable/;
+use Moose;
 
 1;