mockapp moved to a sensible place

diff --git a/t/aggregate/unit_core_container_mock_load.t b/t/aggregate/unit_core_container_mock_load.t
index 9a04b2d..b2af3ae 100644 (file)
--- a/t/aggregate/unit_core_container_mock_load.t
+++ b/t/aggregate/unit_core_container_mock_load.t
@@ -1,6 +1,6 @@
 package MockApp;
 
-use Test::More tests => 10;
+use Test::More;
 use Cwd;
 
 # Remove all relevant env variables to avoid accidental fail
@@ -8,7 +8,7 @@ foreach my $name ( grep { m{^(CATALYST)} } keys %ENV ) {
     delete $ENV{ $name };
 }
 
-$ENV{ CATALYST_HOME } = cwd . '/t/mockapp';
+$ENV{ CATALYST_HOME } = cwd . '/t/lib/MockAppConfigLoader';
 
 use_ok( 'Catalyst' );
 
@@ -27,3 +27,5 @@ is( $conf->{ 'view' },                     'View::TT::New' );
 is( $conf->{ 'foo_sub' },                  'x-y' );
 is( $conf->{ 'literal_macro' },            '__DATA__', 'literal macro' );
 is( $conf->{ 'Plugin::Zot' }->{ zoot },    'zooot');
+
+done_testing;

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 (file)
--- 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;

diff --git a/t/mockapp/mockapp.pl b/t/lib/MockAppConfigLoader/mockapp.pl
similarity index 100%
rename from t/mockapp/mockapp.pl
rename to t/lib/MockAppConfigLoader/mockapp.pl

diff --git a/t/mockapp/mockapp_local.pl b/t/lib/MockAppConfigLoader/mockapp_local.pl
similarity index 100%
rename from t/mockapp/mockapp_local.pl
rename to t/lib/MockAppConfigLoader/mockapp_local.pl