From: Florian Ragwitz <rafl@debian.org>
Date: Thu, 4 Sep 2008 08:15:44 +0000 (+0000)
Subject: Move aggregatable tests using TestApp to t/aggregate.
X-Git-Tag: 5.8000_03~64^2~4
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=42da66a91b0a87ebb81d8552bcd0b05d3557c83e

Move aggregatable tests using TestApp to t/aggregate.
---

diff --git a/Makefile.PL b/Makefile.PL
index 29dd6f8..dc525a3 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -33,6 +33,8 @@ requires 'URI' => '1.35';
 requires 'Text::Balanced'; # core in 5.8.x but mentioned for completeness
 requires 'MRO::Compat';
 
+tests 't/*.t t/aggregate/*.t';
+
 if (-e 'inc/.author') {
   build_requires 'Test::NoTabs';
   build_requires 'Test::Pod' => 1.14;
diff --git a/t/live_component_controller_action_action.t b/t/aggregate/live_component_controller_action_action.t
similarity index 99%
rename from t/live_component_controller_action_action.t
rename to t/aggregate/live_component_controller_action_action.t
index 43af4f9..ea52e78 100644
--- a/t/live_component_controller_action_action.t
+++ b/t/aggregate/live_component_controller_action_action.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 our $iters;
 
diff --git a/t/live_component_controller_action_auto.t b/t/aggregate/live_component_controller_action_auto.t
similarity index 99%
rename from t/live_component_controller_action_auto.t
rename to t/aggregate/live_component_controller_action_auto.t
index bd35306..bf566dc 100644
--- a/t/live_component_controller_action_auto.t
+++ b/t/aggregate/live_component_controller_action_auto.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 our $iters;
 
diff --git a/t/live_component_controller_action_begin.t b/t/aggregate/live_component_controller_action_begin.t
similarity index 97%
rename from t/live_component_controller_action_begin.t
rename to t/aggregate/live_component_controller_action_begin.t
index 43d13c7..49b3163 100644
--- a/t/live_component_controller_action_begin.t
+++ b/t/aggregate/live_component_controller_action_begin.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 our $iters;
 
diff --git a/t/live_component_controller_action_chained.t b/t/aggregate/live_component_controller_action_chained.t
similarity index 99%
rename from t/live_component_controller_action_chained.t
rename to t/aggregate/live_component_controller_action_chained.t
index a8b7e09..a08c701 100644
--- a/t/live_component_controller_action_chained.t
+++ b/t/aggregate/live_component_controller_action_chained.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 our $iters;
 
diff --git a/t/live_component_controller_action_default.t b/t/aggregate/live_component_controller_action_default.t
similarity index 98%
rename from t/live_component_controller_action_default.t
rename to t/aggregate/live_component_controller_action_default.t
index e3c90fd..935a326 100644
--- a/t/live_component_controller_action_default.t
+++ b/t/aggregate/live_component_controller_action_default.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 our $iters;
 
diff --git a/t/live_component_controller_action_detach.t b/t/aggregate/live_component_controller_action_detach.t
similarity index 98%
rename from t/live_component_controller_action_detach.t
rename to t/aggregate/live_component_controller_action_detach.t
index 5896793..5905596 100644
--- a/t/live_component_controller_action_detach.t
+++ b/t/aggregate/live_component_controller_action_detach.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 our $iters;
 
diff --git a/t/live_component_controller_action_end.t b/t/aggregate/live_component_controller_action_end.t
similarity index 97%
rename from t/live_component_controller_action_end.t
rename to t/aggregate/live_component_controller_action_end.t
index 78d6178..22b8333 100644
--- a/t/live_component_controller_action_end.t
+++ b/t/aggregate/live_component_controller_action_end.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 our $iters;
 
diff --git a/t/live_component_controller_action_forward.t b/t/aggregate/live_component_controller_action_forward.t
similarity index 99%
rename from t/live_component_controller_action_forward.t
rename to t/aggregate/live_component_controller_action_forward.t
index 7c14b78..750c067 100644
--- a/t/live_component_controller_action_forward.t
+++ b/t/aggregate/live_component_controller_action_forward.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 our $iters;
 
diff --git a/t/live_component_controller_action_global.t b/t/aggregate/live_component_controller_action_global.t
similarity index 98%
rename from t/live_component_controller_action_global.t
rename to t/aggregate/live_component_controller_action_global.t
index 50dcf55..5a90084 100644
--- a/t/live_component_controller_action_global.t
+++ b/t/aggregate/live_component_controller_action_global.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 our $iters;
 
diff --git a/t/live_component_controller_action_go.t b/t/aggregate/live_component_controller_action_go.t
similarity index 99%
rename from t/live_component_controller_action_go.t
rename to t/aggregate/live_component_controller_action_go.t
index 544166d..7f93369 100644
--- a/t/live_component_controller_action_go.t
+++ b/t/aggregate/live_component_controller_action_go.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 our $iters;
 
diff --git a/t/live_component_controller_action_index.t b/t/aggregate/live_component_controller_action_index.t
similarity index 99%
rename from t/live_component_controller_action_index.t
rename to t/aggregate/live_component_controller_action_index.t
index ba92a78..99e9435 100644
--- a/t/live_component_controller_action_index.t
+++ b/t/aggregate/live_component_controller_action_index.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 our $iters;
 
diff --git a/t/live_component_controller_action_inheritance.t b/t/aggregate/live_component_controller_action_inheritance.t
similarity index 99%
rename from t/live_component_controller_action_inheritance.t
rename to t/aggregate/live_component_controller_action_inheritance.t
index e957329..c58866b 100644
--- a/t/live_component_controller_action_inheritance.t
+++ b/t/aggregate/live_component_controller_action_inheritance.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 our $iters;
 
diff --git a/t/live_component_controller_action_local.t b/t/aggregate/live_component_controller_action_local.t
similarity index 99%
rename from t/live_component_controller_action_local.t
rename to t/aggregate/live_component_controller_action_local.t
index 3670bd9..ae98831 100644
--- a/t/live_component_controller_action_local.t
+++ b/t/aggregate/live_component_controller_action_local.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 our $iters;
 
diff --git a/t/live_component_controller_action_multipath.t b/t/aggregate/live_component_controller_action_multipath.t
similarity index 98%
rename from t/live_component_controller_action_multipath.t
rename to t/aggregate/live_component_controller_action_multipath.t
index 7f026db..be54df2 100644
--- a/t/live_component_controller_action_multipath.t
+++ b/t/aggregate/live_component_controller_action_multipath.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 my $content = q/foo
 bar
diff --git a/t/live_component_controller_action_path.t b/t/aggregate/live_component_controller_action_path.t
similarity index 99%
rename from t/live_component_controller_action_path.t
rename to t/aggregate/live_component_controller_action_path.t
index 18fc83d..338e696 100644
--- a/t/live_component_controller_action_path.t
+++ b/t/aggregate/live_component_controller_action_path.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 our $iters;
 
diff --git a/t/live_component_controller_action_private.t b/t/aggregate/live_component_controller_action_private.t
similarity index 98%
rename from t/live_component_controller_action_private.t
rename to t/aggregate/live_component_controller_action_private.t
index a7baaf8..44d4f16 100644
--- a/t/live_component_controller_action_private.t
+++ b/t/aggregate/live_component_controller_action_private.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 our $iters;
 
diff --git a/t/live_component_controller_action_regexp.t b/t/aggregate/live_component_controller_action_regexp.t
similarity index 99%
rename from t/live_component_controller_action_regexp.t
rename to t/aggregate/live_component_controller_action_regexp.t
index be005bc..ab5d4ba 100644
--- a/t/live_component_controller_action_regexp.t
+++ b/t/aggregate/live_component_controller_action_regexp.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 our $iters;
 
diff --git a/t/live_component_controller_action_streaming.t b/t/aggregate/live_component_controller_action_streaming.t
similarity index 95%
rename from t/live_component_controller_action_streaming.t
rename to t/aggregate/live_component_controller_action_streaming.t
index 68584a1..6cf1866 100644
--- a/t/live_component_controller_action_streaming.t
+++ b/t/aggregate/live_component_controller_action_streaming.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 our $iters;
 
@@ -54,7 +54,7 @@ EOF
             skip "Using remote server", 5;
         }
 
-        my $file = "$FindBin::Bin/01use.t";
+        my $file = "$FindBin::Bin/../01use.t";
         my $fh = IO::File->new( $file, 'r' );
         my $buffer;
         if ( defined $fh ) {
diff --git a/t/live_component_controller_args.t b/t/aggregate/live_component_controller_args.t
similarity index 98%
rename from t/live_component_controller_args.t
rename to t/aggregate/live_component_controller_args.t
index 861b4ad..29d26a1 100644
--- a/t/live_component_controller_args.t
+++ b/t/aggregate/live_component_controller_args.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 use URI::Escape;
 
diff --git a/t/live_engine_request_auth.t b/t/aggregate/live_engine_request_auth.t
similarity index 96%
rename from t/live_engine_request_auth.t
rename to t/aggregate/live_engine_request_auth.t
index b15c4d7..f5370ce 100644
--- a/t/live_engine_request_auth.t
+++ b/t/aggregate/live_engine_request_auth.t
@@ -6,7 +6,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 use Test::More tests => 7;
 use Catalyst::Test 'TestApp';
diff --git a/t/live_engine_request_body.t b/t/aggregate/live_engine_request_body.t
similarity index 98%
rename from t/live_engine_request_body.t
rename to t/aggregate/live_engine_request_body.t
index 06198f0..f5c5066 100644
--- a/t/live_engine_request_body.t
+++ b/t/aggregate/live_engine_request_body.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 use Test::More tests => 18;
 use Catalyst::Test 'TestApp';
diff --git a/t/live_engine_request_body_demand.t b/t/aggregate/live_engine_request_body_demand.t
similarity index 98%
rename from t/live_engine_request_body_demand.t
rename to t/aggregate/live_engine_request_body_demand.t
index 2444dc8..b4d7889 100644
--- a/t/live_engine_request_body_demand.t
+++ b/t/aggregate/live_engine_request_body_demand.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 use Test::More tests => 8;
 use Catalyst::Test 'TestAppOnDemand';
diff --git a/t/live_engine_request_cookies.t b/t/aggregate/live_engine_request_cookies.t
similarity index 97%
rename from t/live_engine_request_cookies.t
rename to t/aggregate/live_engine_request_cookies.t
index 4247ca4..5a45acc 100644
--- a/t/live_engine_request_cookies.t
+++ b/t/aggregate/live_engine_request_cookies.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 use Test::More tests => 13;
 use Catalyst::Test 'TestApp';
diff --git a/t/live_engine_request_headers.t b/t/aggregate/live_engine_request_headers.t
similarity index 98%
rename from t/live_engine_request_headers.t
rename to t/aggregate/live_engine_request_headers.t
index 33c57f9..551561e 100644
--- a/t/live_engine_request_headers.t
+++ b/t/aggregate/live_engine_request_headers.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 use Test::More tests => 17;
 use Catalyst::Test 'TestApp';
diff --git a/t/live_engine_request_parameters.t b/t/aggregate/live_engine_request_parameters.t
similarity index 99%
rename from t/live_engine_request_parameters.t
rename to t/aggregate/live_engine_request_parameters.t
index 684660a..56a7074 100644
--- a/t/live_engine_request_parameters.t
+++ b/t/aggregate/live_engine_request_parameters.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 use Test::More tests => 53;
 use Catalyst::Test 'TestApp';
diff --git a/t/live_engine_request_uploads.t b/t/aggregate/live_engine_request_uploads.t
similarity index 96%
rename from t/live_engine_request_uploads.t
rename to t/aggregate/live_engine_request_uploads.t
index e2bb0d4..2454330 100644
--- a/t/live_engine_request_uploads.t
+++ b/t/aggregate/live_engine_request_uploads.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 use Test::More tests => 88;
 use Catalyst::Test 'TestApp';
@@ -153,7 +153,7 @@ use Path::Class::Dir;
         'http://localhost/dump/request',
         'Content-Type' => 'multipart/form-data',
         'Content'      =>
-          [ 'file' => ["$FindBin::Bin/catalyst_130pix.gif"], ]
+          [ 'file' => ["$FindBin::Bin/../catalyst_130pix.gif"], ]
     );
 
     # LWP will auto-correct Content-Length when using a remote server
@@ -174,8 +174,8 @@ use Path::Class::Dir;
         'http://localhost/dump/request',
         'Content-Type' => 'multipart/form-data',
         'Content'      =>
-          [ 'file1' => ["$FindBin::Bin/catalyst_130pix.gif"],
-            'file2' => ["$FindBin::Bin/catalyst_130pix.gif"], ]
+          [ 'file1' => ["$FindBin::Bin/../catalyst_130pix.gif"],
+            'file2' => ["$FindBin::Bin/../catalyst_130pix.gif"], ]
     );
 
     ok( my $response = request($request), 'Request' );
@@ -193,7 +193,7 @@ use Path::Class::Dir;
         'Content-Type' => 'form-data',
         'Content'      => [
             'testfile' => 'textfield value',
-            'testfile' => ["$FindBin::Bin/catalyst_130pix.gif"],
+            'testfile' => ["$FindBin::Bin/../catalyst_130pix.gif"],
         ]
     );
 
diff --git a/t/live_engine_request_uri.t b/t/aggregate/live_engine_request_uri.t
similarity index 99%
rename from t/live_engine_request_uri.t
rename to t/aggregate/live_engine_request_uri.t
index 65166dc..7d1628d 100644
--- a/t/live_engine_request_uri.t
+++ b/t/aggregate/live_engine_request_uri.t
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 use Test::More tests => 66;
 use Catalyst::Test 'TestApp';
diff --git a/t/live_engine_response_cookies.t b/t/aggregate/live_engine_response_cookies.t
similarity index 98%
rename from t/live_engine_response_cookies.t
rename to t/aggregate/live_engine_response_cookies.t
index abd0476..8442fcf 100644
--- a/t/live_engine_response_cookies.t
+++ b/t/aggregate/live_engine_response_cookies.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 use Test::More tests => 15;
 use Catalyst::Test 'TestApp';
diff --git a/t/live_engine_response_errors.t b/t/aggregate/live_engine_response_errors.t
similarity index 98%
rename from t/live_engine_response_errors.t
rename to t/aggregate/live_engine_response_errors.t
index 1fb8842..b991402 100644
--- a/t/live_engine_response_errors.t
+++ b/t/aggregate/live_engine_response_errors.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 use Test::More tests => 18;
 use Catalyst::Test 'TestApp';
diff --git a/t/live_engine_response_headers.t b/t/aggregate/live_engine_response_headers.t
similarity index 98%
rename from t/live_engine_response_headers.t
rename to t/aggregate/live_engine_response_headers.t
index 1b374e4..0d373c2 100644
--- a/t/live_engine_response_headers.t
+++ b/t/aggregate/live_engine_response_headers.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 use Test::More tests => 18;
 use Catalyst::Test 'TestApp';
diff --git a/t/live_engine_response_large.t b/t/aggregate/live_engine_response_large.t
similarity index 95%
rename from t/live_engine_response_large.t
rename to t/aggregate/live_engine_response_large.t
index 86665f2..84b796b 100644
--- a/t/live_engine_response_large.t
+++ b/t/aggregate/live_engine_response_large.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 use Test::More tests => 6;
 use Catalyst::Test 'TestApp';
diff --git a/t/live_engine_response_redirect.t b/t/aggregate/live_engine_response_redirect.t
similarity index 98%
rename from t/live_engine_response_redirect.t
rename to t/aggregate/live_engine_response_redirect.t
index 3812120..a01b9d0 100644
--- a/t/live_engine_response_redirect.t
+++ b/t/aggregate/live_engine_response_redirect.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 use Test::More tests => 26;
 use Catalyst::Test 'TestApp';
diff --git a/t/live_engine_response_status.t b/t/aggregate/live_engine_response_status.t
similarity index 98%
rename from t/live_engine_response_status.t
rename to t/aggregate/live_engine_response_status.t
index 51f6373..a37c9b6 100644
--- a/t/live_engine_response_status.t
+++ b/t/aggregate/live_engine_response_status.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 use Test::More tests => 30;
 use Catalyst::Test 'TestApp';
diff --git a/t/live_engine_setup_basics.t b/t/aggregate/live_engine_setup_basics.t
similarity index 89%
rename from t/live_engine_setup_basics.t
rename to t/aggregate/live_engine_setup_basics.t
index 7d3d2d3..c2b81ba 100644
--- a/t/live_engine_setup_basics.t
+++ b/t/aggregate/live_engine_setup_basics.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 use Test::More tests => 1;
 use Catalyst::Test 'TestApp';
diff --git a/t/live_engine_setup_plugins.t b/t/aggregate/live_engine_setup_plugins.t
similarity index 90%
rename from t/live_engine_setup_plugins.t
rename to t/aggregate/live_engine_setup_plugins.t
index d280551..419982b 100644
--- a/t/live_engine_setup_plugins.t
+++ b/t/aggregate/live_engine_setup_plugins.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 use Test::More tests => 2;
 use Catalyst::Test 'TestApp';
diff --git a/t/live_loop.t b/t/aggregate/live_loop.t
similarity index 94%
rename from t/live_loop.t
rename to t/aggregate/live_loop.t
index 34fea5f..e7b59f9 100644
--- a/t/live_loop.t
+++ b/t/aggregate/live_loop.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 use Test::More tests => 3;
 use Catalyst::Test 'TestApp';
diff --git a/t/live_plugin_loaded.t b/t/aggregate/live_plugin_loaded.t
similarity index 95%
rename from t/live_plugin_loaded.t
rename to t/aggregate/live_plugin_loaded.t
index de27574..3881997 100644
--- a/t/live_plugin_loaded.t
+++ b/t/aggregate/live_plugin_loaded.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 use Test::More tests => 5;
 use Catalyst::Test 'TestApp';
diff --git a/t/live_priorities.t b/t/aggregate/live_priorities.t
similarity index 98%
rename from t/live_priorities.t
rename to t/aggregate/live_priorities.t
index e726027..1e05747 100644
--- a/t/live_priorities.t
+++ b/t/aggregate/live_priorities.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 use Test::More tests => 28;
 use Catalyst::Test 'TestApp';
diff --git a/t/live_recursion.t b/t/aggregate/live_recursion.t
similarity index 95%
rename from t/live_recursion.t
rename to t/aggregate/live_recursion.t
index 6e55877..a2fcea8 100644
--- a/t/live_recursion.t
+++ b/t/aggregate/live_recursion.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 use Test::More tests => 3;
 use Catalyst::Test 'TestApp';
diff --git a/t/unit_core_action_for.t b/t/aggregate/unit_core_action_for.t
similarity index 93%
rename from t/unit_core_action_for.t
rename to t/aggregate/unit_core_action_for.t
index fe47161..3e75eaa 100644
--- a/t/unit_core_action_for.t
+++ b/t/aggregate/unit_core_action_for.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 use Test::More;
 
diff --git a/t/unit_core_component_layers.t b/t/aggregate/unit_core_component_layers.t
similarity index 100%
rename from t/unit_core_component_layers.t
rename to t/aggregate/unit_core_component_layers.t
diff --git a/t/unit_core_uri_for_action.t b/t/aggregate/unit_core_uri_for_action.t
similarity index 99%
rename from t/unit_core_uri_for_action.t
rename to t/aggregate/unit_core_uri_for_action.t
index a0297f4..9b84582 100644
--- a/t/unit_core_uri_for_action.t
+++ b/t/aggregate/unit_core_uri_for_action.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib "$FindBin::Bin/../lib";
 
 use Test::More;
 
diff --git a/t/unit_core_uri_for_multibytechar.t b/t/aggregate/unit_core_uri_for_multibytechar.t
similarity index 93%
rename from t/unit_core_uri_for_multibytechar.t
rename to t/aggregate/unit_core_uri_for_multibytechar.t
index b0ccdc5..3320491 100644
--- a/t/unit_core_uri_for_multibytechar.t
+++ b/t/aggregate/unit_core_uri_for_multibytechar.t
@@ -2,8 +2,7 @@ use strict;
 use warnings;
 
 use FindBin;
-use File::Spec;
-use lib File::Spec->catfile($FindBin::Bin, 'lib');
+use lib "$FindBin::Bin/../lib";
 
 use Test::More tests => 5;
 
diff --git a/t/lib/TestApp/Controller/Action/Streaming.pm b/t/lib/TestApp/Controller/Action/Streaming.pm
index ef475e4..f619a7d 100644
--- a/t/lib/TestApp/Controller/Action/Streaming.pm
+++ b/t/lib/TestApp/Controller/Action/Streaming.pm
@@ -17,7 +17,7 @@ EOF
 sub body : Local {
     my ( $self, $c ) = @_;
     
-    my $file = "$FindBin::Bin/01use.t";
+    my $file = "$FindBin::Bin/../01use.t";
     my $fh = IO::File->new( $file, 'r' );
     if ( defined $fh ) {
         $c->res->body( $fh );