X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Faggregate%2Funit_core_container_mock_load_env.t;h=88c3b0b2ec664bc31101eb7b883971aa7e6d470a;hb=48e17d2615b1371d75d96a52a8ec17dca83ae007;hp=cc9d5e7483fc297fe6e2e0b3d6cfb31a9a8528a1;hpb=4b22d4c68583deff5c5b2e0e1fbdf15e7dd91139;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/aggregate/unit_core_container_mock_load_env.t b/t/aggregate/unit_core_container_mock_load_env.t
index cc9d5e7..88c3b0b 100644
--- a/t/aggregate/unit_core_container_mock_load_env.t
+++ b/t/aggregate/unit_core_container_mock_load_env.t
@@ -1,25 +1,23 @@
 package MockAppEnv;
 
-use Test::More tests => 10;
+use Test::More;
 use Cwd;
 
-{
 # Remove all relevant env variables to avoid accidental fail
-    foreach my $name ( grep { m{^(CATALYST|MOCKAPPENV)} } keys %ENV ) {
-        delete $ENV{ $name };
-    }
+foreach my $name ( grep { m{^(CATALYST|MOCKAPPENV)} } keys %ENV ) {
+    delete $ENV{ $name };
+}
 
-    $ENV{ CATALYST_HOME }  = cwd . '/t/mockapp';
-    $ENV{ MOCKAPPENV_CONFIG } = $ENV{ CATALYST_HOME } . '/mockapp.pl';
+$ENV{ CATALYST_HOME }  = cwd . '/t/lib/MockAppConfigLoader';
+$ENV{ MOCKAPPENV_CONFIG } = $ENV{ CATALYST_HOME } . '/mockapp.pl';
 
-    use_ok( 'Catalyst' );
+use_ok( 'Catalyst' );
 
-    __PACKAGE__->config->{substitutions} = {
-        foo => sub { shift; join( '-', @_ ); }
-    };
+__PACKAGE__->config->{substitutions} = {
+    foo => sub { shift; join( '-', @_ ); }
+};
 
-    __PACKAGE__->setup;
-}
+__PACKAGE__->setup;
 
 ok( my $conf = __PACKAGE__->config, 'config loads' );
 is( $conf->{ 'Controller::Foo' }->{ foo }, 'bar' );
@@ -30,3 +28,5 @@ is( $conf->{ 'view' },                     'View::TT::New' );
 is( $conf->{ 'foo_sub' },                  'x-y' );
 is( $conf->{ 'literal_macro' },            '__DATA__', 'literal macro' );
 is( $conf->{ 'environment_macro' },        $ENV{ CATALYST_HOME }.'/mockapp.pl', 'environment macro' );
+
+done_testing;