tests cleaning: no more logs dir in tests directories; no more eval u…

…se but moduleloader instead; no more use_ok when not required; no more done_testing when we can avoid it

t/00_base/002_strict_and_warnings.t

@@ -2,7 +2,7 @@ use Test::More tests => 5, import => ['!pass'];
 
 {
     package Webapp;
-    use Dancer;
+    use Dancer ':syntax';
 
     eval '$foo = 5;';
     ::ok($@, 'got an error because strict is on');

t/00_base/003_syntax.t

@@ -41,7 +41,7 @@ my @keywords = qw(
 
 plan tests => scalar(@keywords);
 
-use Dancer;
+use Dancer ':syntax';
 
 foreach my $symbol (@keywords) {
     ok(exists($::{$symbol}), "symbol `$symbol' is exported");

t/01_config/01_settings.t

@@ -1,10 +1,11 @@
 use strict;
 use warnings;
 
-use Test::More tests => 7, import => ['!pass'];
+use Test::More tests => 6, import => ['!pass'];
+
+use Dancer ':syntax';
 
 BEGIN {
-    use_ok 'Dancer';
     use_ok 'Dancer::Config', 'setting';
 }
 

t/01_config/02_mime_type.t

@@ -1,10 +1,11 @@
 use strict;
 use warnings;
 
-use Test::More tests => 6, import => ['!pass'];
+use Test::More tests => 5, import => ['!pass'];
+
+use Dancer ':syntax';
 
 BEGIN {
-    use_ok 'Dancer';
     use_ok 'Dancer::Config', 'setting', 'mime_types';
 }
 

t/01_config/03_logger.t

@@ -1,7 +1,11 @@
 use Test::More tests => 15, import => ['!pass'];
 
 use Dancer::Config 'setting';
-use Dancer;
+use Dancer ':syntax';
+
+use File::Temp qw/tempdir/;
+my $dir = tempdir(CLEANUP => 1);
+set appdir => $dir;
 
 eval { logger 'foobar'};
 like($@, qr/unknown logger/, 'invalid logger detected');

t/01_config/04_config_file.t

@@ -2,14 +2,20 @@ use strict;
 use warnings;
 use Test::More import => ['!pass'];
 
-eval "use YAML";
-plan skip_all => "YAML is not installed" if $@;
+plan skip_all => "YAML needed to run this tests"
+    unless Dancer::ModuleLoader->load('YAML');
 plan tests => 16;
 
-use Dancer;
+use File::Temp qw/tempdir/;
+use Dancer ':syntax';
 use Dancer::Config 'setting'; 
 use t::lib::TestUtils;
 
+my $dir = tempdir(CLEAN_UP => 1);
+set appdir => $dir;
+my $envdir = File::Spec->catdir($dir, 'environments');
+mkdir $envdir;
+
 my $conffile = Dancer::Config->conffile;
 ok(defined($conffile), 'default conffile is defined');
 

t/02_request/07_raw_data.t

@@ -38,5 +38,3 @@ Test::TCP::test_tcp(
         Dancer->dance();
     },
 );
-
-done_testing;

t/02_request/10_mixed_params.t

@@ -53,5 +53,3 @@ Test::TCP::test_tcp(
         Dancer->dance();
     },
 );
-
-done_testing;

t/02_request/12_base.t

@@ -1,6 +1,8 @@
 use Test::More;
 use Dancer::Request;
 
+plan tests => 8;
+
 my $env = {
     'psgi.url_scheme' => 'http',
     REQUEST_METHOD    => 'GET',
@@ -35,5 +37,3 @@ is $req->path_info, '/foo/bar/baz';
     local $env->{HTTP_HOST} = 'oddhostname:5000';
     is $req->base, 'http://oddhostname:5000/foo';
 }
-
-done_testing;

t/02_request/13_ajax.t

@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use Test::More tests => 2, import => ['!pass'];
-use Dancer;
+use Dancer ':syntax';
 use t::lib::TestUtils;
 use Dancer::SharedData;
 

t/03_route_handler/00_http_methods.t

@@ -4,7 +4,7 @@ use t::lib::TestUtils;
 my @methods = qw(get head put post delete options);
 plan tests => scalar(@methods) + 5;
 
-use Dancer;
+use Dancer ':syntax';
 
 ok(get('/', sub { 'get' }), "GET / defined ");
 ok(post('/', sub { 'post' }), "POST / defined ");

t/03_route_handler/01_params.t

@@ -2,12 +2,10 @@ use strict;
 use warnings;
 
 use t::lib::TestUtils;
-use Test::More tests => 18, import => ['!pass'];
+use Test::More tests => 16, import => ['!pass'];
 
-BEGIN {
-    use_ok 'Dancer';
-    use_ok 'Dancer::Route';
-}
+use Dancer ':syntax';
+use Dancer::Route;
 use Data::Dumper;
 
 {

t/03_route_handler/02_before_filter.t

@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use Test::More 'no_plan', import => ['!pass'];
-use Dancer;
+use Dancer ':syntax';
 use t::lib::TestUtils;
 
 ok(before(sub { 

t/03_route_handler/03_passing.t

@@ -1,12 +1,10 @@
 use strict;
 use warnings;
-use Test::More tests => 19, import => ['!pass'];
+use Test::More tests => 17, import => ['!pass'];
 use t::lib::TestUtils;
 
-BEGIN { 
-    use_ok 'Dancer';
-    use_ok 'Dancer::Route'; 
-}
+use Dancer ':syntax';
+use Dancer::Route; 
 
 ok(get('/say/:char' => sub { 
     pass and return false if length(params->{char}) > 1;

t/03_route_handler/04_wildcards.t

@@ -4,7 +4,7 @@ use Test::More import => ['!pass'];
 
 use t::lib::TestUtils;
 
-use Dancer;
+use Dancer ':syntax';
 use Dancer::Route; 
 
 my @paths = ('/hello/*', '/hello/*/welcome/*', '/download/*.*');

t/03_route_handler/05_error_catching.t

@@ -1,7 +1,14 @@
 use Test::More import => ['!pass'];
 
 use t::lib::TestUtils;
-use Dancer;
+use Dancer ':syntax';
+
+use Dancer::Logger;
+use File::Temp qw/tempdir/;
+
+my $dir = tempdir(CLEAN_UP => 1);
+set appdir => $dir;
+Dancer::Logger->init('File');
 
 get '/error' => sub {
     Foo->bar;

t/03_route_handler/06_regexp.t

@@ -4,10 +4,8 @@ use Test::More 'no_plan', import => ['!pass'];
 
 use t::lib::TestUtils;
 
-BEGIN { 
-    use_ok 'Dancer';
-    use_ok 'Dancer::Route'; 
-}
+use Dancer ':syntax';
+use Dancer::Route; 
 
 ok(get(r('/hello/([\w]+)') => sub { [splat] }), 'first route set');
 ok(get(r('/show/([\d]+)') => sub { [splat] }), 'second route set');

t/03_route_handler/07_compilation_warning.t

@@ -1,7 +1,13 @@
 use Test::More import => ['!pass'];
 
 use t::lib::TestUtils;
-use Dancer;
+use Dancer ':syntax';
+use Dancer::Logger;
+use File::Temp qw/tempdir/;
+
+my $dir = tempdir(CLEAN_UP => 1);
+set appdir => $dir;
+Dancer::Logger->init('File');
 
 # perl <= 5.8.x won't catch the warning
 plan skip_all => 'Need perl >= 5.10' if $] < 5.010;

t/03_route_handler/09_status.t

@@ -3,7 +3,7 @@ use Test::More import => ['!pass'];
 use strict;
 use warnings;
 
-use Dancer;
+use Dancer ':syntax';
 use t::lib::TestUtils;
 
 get '/' => sub { 1 };

t/03_route_handler/10_merge_registries.t

@@ -9,7 +9,7 @@ use Test::More tests => 8, import => ['!pass'];
 use strict;
 use warnings;
 
-use Dancer;
+use Dancer ':syntax';
 use Dancer::Route;
 
 # first registry

t/03_route_handler/11_redirect.t

@@ -3,7 +3,13 @@ use warnings;
 use Test::More 'no_plan', import => ['!pass'];
 
 use t::lib::TestUtils;
-use Dancer;
+use Dancer ':syntax';
+use Dancer::Logger;
+use File::Temp qw/tempdir/;
+
+my $dir = tempdir(CLEAN_UP => 1);
+set appdir => $dir;
+Dancer::Logger->init('File');
 
 get '/' => sub { 'home' };
 get '/bounce' => sub { redirect '/' };
@@ -43,5 +49,3 @@ $res = get_response_for_request( GET => '/redirect_querystring' );
 is $headers{'Location'},
    'http://localhost/login?failed=1',
    'location is set to /login?failed=1';
-
-clean_tmp_files();

t/03_route_handler/12_response.t

@@ -1,9 +1,9 @@
-use Test::More tests => 7;
+use Test::More tests => 6;
 
 use strict;
 use warnings;
 
-use_ok 'Dancer::Response';
+use Dancer::Response;
 
 my $r = Dancer::Response->new;
 is $r->{status}, 200, "status looks good";

t/03_route_handler/13_any_route_handler.t

@@ -3,7 +3,7 @@ use warnings;
 use Test::More tests => 17, import => ['!pass'];
 use t::lib::TestUtils;
 
-use Dancer;
+use Dancer ':syntax';
 
 eval {
     any ['get', 'delete'] => '/any_1' => sub { 

t/03_route_handler/14_options.t

@@ -4,11 +4,9 @@ use warnings;
 use Test::More import => ['!pass'];
 use t::lib::TestUtils;
 
-BEGIN {
-    plan tests => 19;
-    use_ok 'Dancer';
-    use_ok 'Dancer::Route';
-};
+plan tests => 17;
+use Dancer ':syntax';
+use Dancer::Route;
 
 {
     ok( get( '/', { agent => 'foo' } => sub {'agent foo'} ),

t/03_route_handler/15_prefix.t

@@ -3,7 +3,7 @@ use t::lib::TestUtils;
 
 plan tests => 23;
 
-use Dancer;
+use Dancer ':syntax';
 use Dancer::Route;
 
 eval { prefix 'say' };

t/03_route_handler/16_caching.t

@@ -8,7 +8,7 @@ use warnings;
 use Test::More tests => 105, import => ['!pass'];
 use t::lib::TestUtils;
 
-use Dancer;
+use Dancer ':syntax';
 use Dancer::Config 'setting';
 
 setting route_cache => 1;

t/03_route_handler/17_compile.t

@@ -3,7 +3,7 @@ use warnings;
 use Test::More tests => 6, import => ['!pass'];
 
 {
-    use Dancer;
+    use Dancer ':syntax';
     get '/foo/:key' => sub { params->{'key'} };
 
     get '/simple' => sub { 1 };

t/03_route_handler/18_auto_page.t

@@ -9,8 +9,9 @@ use t::lib::TestUtils;
 
 {
     package Foo;
-    use Dancer;
+    use Dancer ':syntax';
 
+    set views => path(dirname(__FILE__), 'views');
     set auto_page => true;
 
     get '/' => sub { 1 };

t/03_route_handler/19_filters_and_params.t

@@ -5,7 +5,7 @@ use Test::More tests => 2, import => ['!pass'];
 # This test makes sure a before filter can access the request params
 
 {
-    use Dancer;
+    use Dancer ':syntax';
 
     before sub { 
         ok(defined(params->{'format'}), 

t/03_route_handler/20_params_multiple_tokens.t

@@ -3,7 +3,7 @@ use warnings;
 use Test::More tests => 2, import => ['!pass'];
 
 {
-    use Dancer;
+    use Dancer ':syntax';
 
     get '/:resource/:id.:format' => sub {
         [ params->{'resource'}, 

t/04_static_file/001_base.t

@@ -2,12 +2,10 @@ use strict;
 use warnings;
 
 use t::lib::TestUtils;
-use Test::More tests => 6, import => ['!pass'];
+use Test::More tests => 4, import => ['!pass'];
 
-BEGIN {
-    use_ok 'Dancer';
-    use_ok 'Dancer::Config', 'setting';
-}
+use Dancer ':syntax';
+use Dancer::Config 'setting';
 
 set public => path(dirname(__FILE__), 'static');
 my $public = setting('public');

t/04_static_file/002_mime_types.t

@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Dancer;
+use Dancer ':syntax';
 use Dancer::Config 'setting';
 use Dancer::ModuleLoader;
 

t/05_views/001_settings.t

@@ -1,8 +1,9 @@
 use Test::More tests => 2, import => ['!pass'];
 
-use Dancer;
+use Dancer ':syntax';
 use Dancer::Config;
 
+set views => path(dirname(__FILE__), 'views');
 my $views = Dancer::Config::setting('views');
 ok(defined($views), "the views directory is defined: $views");