-package MockApp;
+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|MOCKAPP)} } keys %ENV ) {
+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/lib/MockAppConfigLoader';
+$ENV{ MOCKAPPENV_CONFIG } = $ENV{ CATALYST_HOME } . '/mockapp.pl';
use_ok( 'Catalyst' );
__PACKAGE__->setup;
-ok( my $conf = __PACKAGE__->config );
+ok( my $conf = __PACKAGE__->config, 'config loads' );
is( $conf->{ 'Controller::Foo' }->{ foo }, 'bar' );
is( $conf->{ 'Controller::Foo' }->{ new }, 'key' );
is( $conf->{ 'Model::Baz' }->{ qux }, 'xyzzy' );
is( $conf->{ 'Model::Baz' }->{ another }, 'new key' );
is( $conf->{ 'view' }, 'View::TT::New' );
is( $conf->{ 'foo_sub' }, 'x-y' );
-is( $conf->{ 'literal_macro' }, '__DATA__' );
-is( $conf->{ 'environment_macro' }, $ENV{ CATALYST_HOME }.'/mockapp.pl' );
+is( $conf->{ 'literal_macro' }, '__DATA__', 'literal macro' );
+is( $conf->{ 'environment_macro' }, $ENV{ CATALYST_HOME }.'/mockapp.pl', 'environment macro' );
+
+done_testing;