Merge branch 'release/1.3059_04'

pjcj · Jun 12, 2011 · 1b876f4 · 1b876f4
2 parents b106f91 + 3dc673a
commit 1b876f4
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 14 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,9 @@
+1.3059_04      12.06.2011
+
+    [ BUG FIXES ]
+    * Fix a bunch of cpan testers reports 
+    (Alberto Simões)
+
 1.3059_03      11.06.2011
 
     [ BUG FIXES ]

diff --git a/lib/Dancer.pm b/lib/Dancer.pm
@@ -5,7 +5,7 @@ use warnings;
 use Carp;
 use Cwd 'realpath';
 
-our $VERSION   = '1.3059_03';
+our $VERSION   = '1.3059_04';
 our $AUTHORITY = 'SUKRIA';
 
 use Dancer::App;

diff --git a/lib/Dancer/Test.pm b/lib/Dancer/Test.pm
@@ -323,7 +323,7 @@ Content-Type: text/plain
         $l = length $content if defined $content;
         open my $in, '<', \$content;
         $ENV{'CONTENT_LENGTH'} = $l;
-        $ENV{'CONTENT_TYPE'}   = $content_type;
+        $ENV{'CONTENT_TYPE'}   = $content_type || "";
         $ENV{'psgi.input'}     = $in;
     }
 

diff --git a/t/03_route_handler/24_named_captures.t b/t/03_route_handler/24_named_captures.t
@@ -8,7 +8,7 @@ use Dancer::Test;
 plan tests => 2;
 
 SKIP: {
-    skip "Need perl >= 5.10", 3 unless $] >= 5.010;
+    skip "Need perl >= 5.10", 2 unless $] >= 5.010;
 
     my $route_regex =
       "/(?<class> user | content | post )/(?<action> delete | find )/(?<id> \\d+ )";

diff --git a/t/14_serializer/01_helpers.t b/t/14_serializer/01_helpers.t
@@ -43,7 +43,7 @@ SKIP: {
 }
 
 SKIP: {
-    skip 'JSON is needed to run this test', 17
+    skip 'JSON is needed to run this test', 16
       unless Dancer::ModuleLoader->load('JSON');
 
     # helpers syntax
@@ -154,10 +154,10 @@ SKIP: {
 }
 
 SKIP: {
-    skip 'YAML is needed to run this test', 1
+    skip 'YAML is needed to run this test', 7
       unless Dancer::ModuleLoader->load('YAML');
 
-    skip 'JSON is needed to run this test', 1
+    skip 'JSON is needed to run this test', 7
       unless Dancer::ModuleLoader->load('JSON');
 
     setting( 'serializer' => 'Mutable' );

diff --git a/t/14_serializer/06_api.t b/t/14_serializer/06_api.t
@@ -48,7 +48,7 @@ SKIP: {
         "application/json is not supported" );
 }
 
-{
+SKIP: {
     skip 'JSON is needed to run this test', 3
       unless Dancer::ModuleLoader->load('JSON');
     skip 'YAML is needed to run this test', 3
@@ -92,7 +92,7 @@ SKIP: {
 }
 
 # handler helper
-{
+SKIP: {
     skip 'JSON is needed to run this test', 3
       unless Dancer::ModuleLoader->load('JSON');
 
@@ -108,6 +108,7 @@ SKIP: {
 
     my $expected_params = { foo => '42', };
 
+    # ---
     my $req = Dancer::Request->new( env => $env);
     is $req->body, $body, "body is untouched";
 

diff --git a/t/14_serializer/99_bugs.t b/t/14_serializer/99_bugs.t
@@ -8,7 +8,7 @@ use HTTP::Request;
 plan tests => 13;
 
 # issue 57829
-{
+SKIP: {
     skip 'JSON is needed to run this test', 2
       unless Dancer::ModuleLoader->load('JSON');
 
@@ -21,7 +21,7 @@ plan tests => 13;
 }
 
 # issue gh-106
-{
+SKIP: {
     skip 'JSON is needed to run this test', 1
       unless Dancer::ModuleLoader->load('JSON');
 
@@ -38,7 +38,7 @@ plan tests => 13;
 }
 
 # issue gh-299
-{
+SKIP: {
     skip 'JSON is needed to run this test', 5
       unless Dancer::ModuleLoader->load('JSON');
 
@@ -59,7 +59,7 @@ plan tests => 13;
 #
 # Serializer issue: params hash not populated when the Content-Type is a
 # supported media type with additional parameters
-{
+SKIP: {
     skip 'JSON is needed to run this test', 3
       unless Dancer::ModuleLoader->load('JSON');
 
@@ -88,12 +88,12 @@ plan tests => 13;
 }
 
 # show errors
-{
+SKIP: {
     skip 'JSON is needed to run this test', 2
         unless Dancer::ModuleLoader->load('JSON');
 
     set environment => 'production';
-    
+
     get '/with_errors' => sub {
         setting show_errors => 1;
         # bam!