use lib t/lib instead of t::lib::

PerlDancer · Nov 9, 2010 · f732368 · f732368
1 parent dcc43bb
commit f732368
Show file tree

Hide file tree

Showing 45 changed files with 135 additions and 61 deletions.
diff --git a/t/00_base/dancer_test.t b/t/00_base/dancer_test.t
@@ -5,7 +5,11 @@ use warnings;
 
 use Dancer ':syntax';
 use Dancer::Test;
-load_app 't::lib::TestApp';
+use File::Spec;
+
+use lib File::Spec->catdir( 't', 'lib' );
+
+load_app 'TestApp';
 
 # in t::lib::TestApp, we have 
 # get '/' => sub { "Hello, this is the home" };

diff --git a/t/01_config/04_config_file.t b/t/01_config/04_config_file.t
@@ -8,7 +8,9 @@ plan tests => 17;
 
 use File::Temp qw/tempdir/;
 use Dancer ':syntax';
-use t::lib::TestUtils;
+use File::Spec;
+use lib File::Spec->catdir( 't', 'lib' );
+use TestUtils;
 
 my $dir = tempdir(CLEANUP => 1);
 set appdir => $dir;

diff --git a/t/01_config/yaml_dependency.t b/t/01_config/yaml_dependency.t
@@ -5,7 +5,9 @@ use warnings;
 use Dancer::Config;
 use Dancer::ModuleLoader;
 
-use t::lib::EasyMocker;
+use File::Spec;
+use lib File::Spec->catdir( 't', 'lib' );
+use EasyMocker;
 
 mock 'Dancer::Config'
     => method 'conffile'

diff --git a/t/02_request/07_raw_data.t b/t/02_request/07_raw_data.t
@@ -3,6 +3,8 @@ use strict;
 use warnings;
 use Dancer::ModuleLoader;
 use Dancer;
+use File::Spec;
+use lib File::Spec->catdir( 't', 'lib' );
 
 plan skip_all => "Test::TCP is needed for this test"
     unless Dancer::ModuleLoader->load("Test::TCP");
@@ -29,7 +31,7 @@ Test::TCP::test_tcp(
     server => sub {
         my $port = shift;
 
-        use t::lib::TestApp;
+        use TestApp;
         Dancer::Config->load;
 
         setting environment => 'production';

diff --git a/t/02_request/10_mixed_params.t b/t/02_request/10_mixed_params.t
@@ -4,6 +4,8 @@ use warnings;
 
 use Dancer ':syntax';
 use Dancer::ModuleLoader;
+use File::Spec;
+use lib File::Spec->catdir( 't', 'lib' );
 
 plan skip_all => "Test::TCP is needed for this test"
     unless Dancer::ModuleLoader->load("Test::TCP");
@@ -45,7 +47,7 @@ Test::TCP::test_tcp(
     server => sub {
         my $port = shift;
 
-        use t::lib::TestApp;
+        use TestApp;
         Dancer::Config->load;
 
         setting environment => 'production';

diff --git a/t/03_route_handler/04_wildcards.t b/t/03_route_handler/04_wildcards.t
@@ -2,7 +2,9 @@ use strict;
 use warnings;
 use Test::More import => ['!pass'];
 
-use t::lib::TestUtils;
+use File::Spec;
+use lib File::Spec->catdir( 't', 'lib' );
+use TestUtils;
 
 use Dancer ':syntax';
 use Dancer::Route; 

diff --git a/t/03_route_handler/07_compilation_warning.t b/t/03_route_handler/07_compilation_warning.t
@@ -1,6 +1,8 @@
 use Test::More import => ['!pass'];
 
-use t::lib::TestUtils;
+use File::Spec;
+use lib File::Spec->catdir( 't', 'lib' );
+use TestUtils;
 use Dancer ':syntax';
 use Dancer::Logger;
 use File::Temp qw/tempdir/;

diff --git a/t/03_route_handler/09_status.t b/t/03_route_handler/09_status.t
@@ -4,7 +4,9 @@ use strict;
 use warnings;
 
 use Dancer ':syntax';
-use t::lib::TestUtils;
+use File::Spec;
+use lib File::Spec->catdir( 't', 'lib' );
+use TestUtils;
 
 get '/' => sub { 1 };
 

diff --git a/t/03_route_handler/13_any_route_handler.t b/t/03_route_handler/13_any_route_handler.t
@@ -1,7 +1,9 @@
 use strict;
 use warnings;
 use Test::More tests => 17, import => ['!pass'];
-use t::lib::TestUtils;
+use File::Spec;
+use lib File::Spec->catdir( 't', 'lib' );
+use TestUtils;
 
 use Dancer ':syntax';
 
@@ -43,7 +45,7 @@ my @routes = (
 # making sure response are OK
 foreach my $route (@routes) {
     foreach my $method (@{ $route->{methods} }) {
-        my $request = t::lib::TestUtils::fake_request($method => $route->{path});
+        my $request = TestUtils::fake_request($method => $route->{path});
         Dancer::SharedData->request($request);
         my $response = Dancer::Renderer::get_action_response();
         ok(defined($response), 
@@ -62,7 +64,7 @@ my @failed = (
 
 foreach my $route (@failed) {
     foreach my $method (@{ $route->{methods} }) {
-        my $request = t::lib::TestUtils::fake_request($method => $route->{path});
+        my $request = TestUtils::fake_request($method => $route->{path});
         Dancer::SharedData->request($request);
         my $response = Dancer::Renderer::get_action_response();
         ok(!defined($response), 

diff --git a/t/03_route_handler/16_caching.t b/t/03_route_handler/16_caching.t
@@ -3,7 +3,9 @@ use strict;
 use warnings;
 
 use Test::More tests => 105, import => ['!pass'];
-use t::lib::TestUtils;
+use File::Spec;
+use lib File::Spec->catdir( 't', 'lib' );
+use TestUtils;
 
 use Dancer ':syntax';
 setting route_cache => 1;
@@ -48,7 +50,7 @@ my %reqs = (
 
 foreach my $method ( qw/get post/ ) {
     foreach my $path ( '/in', '/out', '/err' ) {
-        my $req = t::lib::TestUtils::fake_request( $method => $path );
+        my $req = TestUtils::fake_request( $method => $path );
         Dancer::SharedData->request($req);
         my $res = Dancer::Renderer::get_action_response();
 
@@ -113,7 +115,7 @@ $cache->{'cache_array'} = [];
     }
 
     foreach my $path (@paths) {
-        my $req = t::lib::TestUtils::fake_request( get => "/$path" );
+        my $req = TestUtils::fake_request( get => "/$path" );
         Dancer::SharedData->request($req);
         my $res = Dancer::Renderer::get_action_response();
 
@@ -160,7 +162,7 @@ SKIP: {
     }
 
     foreach my $path (@paths) {
-        my $req = t::lib::TestUtils::fake_request( get => $path );
+        my $req = TestUtils::fake_request( get => $path );
         Dancer::SharedData->request($req);
         my $res = Dancer::Renderer::get_action_response();
 

diff --git a/t/03_route_handler/18_auto_page.t b/t/03_route_handler/18_auto_page.t
@@ -4,8 +4,10 @@
 use strict;
 use warnings;
 use Test::More import => ['!pass'], tests => 4;
+use File::Spec;
+use lib File::Spec->catdir( 't', 'lib' );
 
-use t::lib::TestUtils;
+use TestUtils;
 
 {
     package Foo;

diff --git a/t/03_route_handler/20_params_multiple_tokens.t b/t/03_route_handler/20_params_multiple_tokens.t
@@ -12,7 +12,9 @@ use Test::More tests => 2, import => ['!pass'];
     };
 }
 
-use t::lib::TestUtils;
+use File::Spec;
+use lib File::Spec->catdir( 't', 'lib' );
+use TestUtils;
 
 my $response = get_response_for_request(GET => '/user/42.json');
 ok( defined($response), "response found for '/user/42.json'" );

diff --git a/t/04_static_file/002_mime_types.t b/t/04_static_file/002_mime_types.t
@@ -4,7 +4,9 @@ use warnings;
 use Dancer ':syntax';
 use Dancer::ModuleLoader;
 
-use t::lib::TestUtils;
+use File::Spec;
+use lib File::Spec->catdir( 't', 'lib' );
+use TestUtils;
 use Test::More import => ['!pass'];
 
 plan tests => 7;

diff --git a/t/05_views/002_view_rendering.t b/t/05_views/002_view_rendering.t
@@ -3,7 +3,9 @@ use strict;
 use warnings;
 
 use Dancer ':syntax';
-use t::lib::TestUtils;
+use File::Spec;
+use lib File::Spec->catdir( 't', 'lib' );
+use TestUtils;
 
 set views => path(dirname(__FILE__), 'views');
 

diff --git a/t/05_views/03_layout.t b/t/05_views/03_layout.t
@@ -8,7 +8,9 @@ BEGIN {
 };
 
 use Dancer ':syntax';
-use t::lib::TestUtils;
+use File::Spec;
+use lib File::Spec->catdir( 't', 'lib' );
+use TestUtils;
 
 set views => path(dirname(__FILE__), 'views');
 

diff --git a/t/06_helpers/01_send_file.t b/t/06_helpers/01_send_file.t
@@ -1,5 +1,7 @@
 use Test::More import => ['!pass'];
-use t::lib::TestUtils;
+use File::Spec;
+use lib File::Spec->catdir( 't', 'lib' );
+use TestUtils;
 use Dancer ':syntax';
 use Dancer::FileUtils 'read_glob_content';
 

diff --git a/t/06_helpers/03_content_type.t b/t/06_helpers/03_content_type.t
@@ -1,5 +1,7 @@
 use Test::More import => ['!pass'];
-use t::lib::TestUtils;
+use File::Spec;
+use lib File::Spec->catdir( 't', 'lib' );
+use TestUtils;
 use Dancer ':syntax';
 
 get '/' => sub {

diff --git a/t/06_helpers/04_status.t b/t/06_helpers/04_status.t
@@ -1,5 +1,7 @@
 use Test::More import => ['!pass'];
-use t::lib::TestUtils;
+use File::Spec;
+use lib File::Spec->catdir( 't', 'lib' );
+use TestUtils;
 
 use Dancer ':syntax';
 

diff --git a/t/06_helpers/05_send_error.t b/t/06_helpers/05_send_error.t
@@ -1,7 +1,9 @@
 use Test::More tests => 2, import => ['!pass'];
 
 use Dancer ':syntax';
-use t::lib::TestUtils;
+use File::Spec;
+use lib File::Spec->catdir( 't', 'lib' );
+use TestUtils;
 
 set show_errors => 1;
 

diff --git a/t/06_helpers/06_load.t b/t/06_helpers/06_load.t
@@ -1,7 +1,9 @@
 use Test::More 'no_plan', import => ['!pass'];
 
 use Dancer ':syntax';
-use t::lib::TestUtils;
+use File::Spec;
+use lib File::Spec->catdir( 't', 'lib' );
+use TestUtils;
 
 my $routes = path('t', '06_helpers', 'routes.pl');
 

diff --git a/t/07_apphandlers/03_psgi_app.t b/t/07_apphandlers/03_psgi_app.t
@@ -36,7 +36,9 @@ Test::TCP::test_tcp(
     server => sub {
         my $port = shift;
 
-        use t::lib::TestApp;
+        use File::Spec;
+        use lib File::Spec->catdir( 't', 'lib' );
+        use TestApp;
         use Dancer;
         setting apphandler  => 'PSGI';
         setting environment => 'production';

diff --git a/t/07_apphandlers/04_standalone_app.t b/t/07_apphandlers/04_standalone_app.t
@@ -31,7 +31,9 @@ Test::TCP::test_tcp(
         my $port = shift;
 
         use Dancer;
-        use t::lib::TestApp;
+        use File::Spec;
+        use lib File::Spec->catdir( 't', 'lib' );
+        use TestApp;
         Dancer::Config->load;
 
         setting environment => 'production';

diff --git a/t/08_session/02_dependency_check.t b/t/08_session/02_dependency_check.t
@@ -5,7 +5,9 @@ use Test::More import => ['!pass'];
 plan tests => 5;
 
 use Dancer ':syntax';
-use t::lib::EasyMocker;
+use File::Spec;
+use lib File::Spec->catdir( 't', 'lib' );
+use EasyMocker;
 
 {
     # checking that EasyMocker works

diff --git a/t/08_session/03_http_requests.t b/t/08_session/03_http_requests.t
@@ -59,7 +59,9 @@ Test::TCP::test_tcp(
     server => sub {
         my $port = shift;
 
-        use t::lib::TestApp;
+        use File::Spec;
+        use lib File::Spec->catdir( 't', 'lib' );
+        use TestApp;
         Dancer::Config->load;
 
         setting appdir => $tempdir;

diff --git a/t/08_session/04_api.t b/t/08_session/04_api.t
@@ -4,7 +4,9 @@ use Dancer::Session::YAML;
 
 plan tests => '4';
 
-use t::lib::EasyMocker;
+use File::Spec;
+use lib File::Spec->catdir( 't', 'lib' );
+use EasyMocker;
 
 my $fake_session = bless { foo => 42 }, 'Dancer::Session::YAML';
 

diff --git a/t/08_session/07_session_expires.t b/t/08_session/07_session_expires.t
@@ -37,7 +37,9 @@ Test::TCP::test_tcp(
     server => sub {
         my $port = shift;
 
-        use t::lib::TestApp;
+        use File::Spec;
+        use lib File::Spec->catdir( 't', 'lib' );
+        use TestApp;
         Dancer::Config->load;
 
         setting session         => 'YAML';

diff --git a/t/09_cookies/03_persistence.t b/t/09_cookies/03_persistence.t
@@ -43,7 +43,9 @@ Test::TCP::test_tcp(
     server => sub {
         my $port = shift;
 
-        use t::lib::TestApp;
+        use File::Spec;
+        use lib File::Spec->catdir( 't', 'lib' );
+        use TestApp;
         Dancer::Config->load;
 
         setting access_log => 0;

diff --git a/t/10_template/05_template_toolkit.t b/t/10_template/05_template_toolkit.t
@@ -6,7 +6,9 @@ use warnings;
 use Dancer::ModuleLoader;
 use Dancer::FileUtils 'path';
 
-use t::lib::EasyMocker;
+use File::Spec;
+use lib File::Spec->catdir( 't', 'lib' );
+use EasyMocker;
 
 BEGIN { 
     plan skip_all => "need Template to run this test" 

diff --git a/t/12_response/02_headers.t b/t/12_response/02_headers.t
@@ -3,7 +3,9 @@
 #
 
 use Test::More import => ['!pass'];
-use t::lib::TestUtils;
+use File::Spec;
+use lib File::Spec->catdir( 't', 'lib' );
+use TestUtils;
 
 use Dancer ':syntax';
 

diff --git a/t/14_serializer/06_serialize_response.t b/t/14_serializer/06_serialize_response.t
@@ -21,7 +21,9 @@ my $json = JSON::encode_json($data);
     };
 }
 
-use t::lib::TestUtils;
+use File::Spec;
+use lib File::Spec->catdir( 't', 'lib' );
+use TestUtils;
 
 my $response = get_response_for_request(GET => '/data');
 ok(defined($response), "response found for /data");

diff --git a/t/15_plugins/01_register.t b/t/15_plugins/01_register.t
@@ -2,8 +2,10 @@ use strict;
 use warnings;
 use Test::More 'import' => ['!pass'], tests => 2;
 
-use t::lib::TestUtils;
-use t::lib::TestApp;
+use File::Spec;
+use lib File::Spec->catdir( 't', 'lib' );
+use TestUtils;
+use TestApp;
 
 $ENV{HTTP_REFERER} = 'http://www.google.com';
 my $response = get_response_for_request(GET => '/');