From: André Walker Date: Thu, 9 Jun 2011 22:25:39 +0000 (-0300) Subject: renamed MockApp so that it doesn't fail when run aggregate tests X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=4b22d4c68583deff5c5b2e0e1fbdf15e7dd91139 renamed MockApp so that it doesn't fail when run aggregate tests --- 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' );