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=cc9d5e7483fc297fe6e2e0b3d6cfb31a9a8528a1;hb=4b22d4c68583deff5c5b2e0e1fbdf15e7dd91139;hp=311d6ac33ab47436853ce84c94e7fe63693b4780;hpb=89b6b254a923f245093d323d9f526b891c8c866f;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 311d6ac..cc9d5e7 100644
--- a/t/aggregate/unit_core_container_mock_load_env.t
+++ b/t/aggregate/unit_core_container_mock_load_env.t
@@ -1,23 +1,25 @@
-package MockApp;
+package MockAppEnv;
 
 use Test::More tests => 10;
 use Cwd;
 
+{
 # Remove all relevant env variables to avoid accidental fail
-foreach my $name ( grep { m{^(CATALYST|MOCKAPP)} } keys %ENV ) {
-    delete $ENV{ $name };
-}
+    foreach my $name ( grep { m{^(CATALYST|MOCKAPPENV)} } keys %ENV ) {
+        delete $ENV{ $name };
+    }
 
-$ENV{ CATALYST_HOME }  = cwd . '/t/mockapp';
-$ENV{ MOCKAPP_CONFIG } = $ENV{ CATALYST_HOME } . '/mockapp.pl';
+    $ENV{ CATALYST_HOME }  = cwd . '/t/mockapp';
+    $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' );