RequireSSL 0.05, skipped tests will now run if Catalyst >= 5.5

diff --git a/Changes b/Changes
index 2f7cb21..eee6551 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,8 @@
 Revision history for Perl extension Catalyst::Plugin::RequireSSL
 
+0.05    2005-09-15 12:15:00
+        - Updated skipped tests to run if Catalyst >= 5.5.
+
 0.04    2005-09-14 13:30:00
         - Fixed bug in redirect code that ignored duplicate key names.
         - Strip all output content when doing a redirect from HTTP -> HTTPS

diff --git a/META.yml b/META.yml
index f54c07b..b00bbf3 100644 (file)
--- a/META.yml
+++ b/META.yml
@@ -1,6 +1,6 @@
 ---
 name: Catalyst-Plugin-RequireSSL
-version: 0.04
+version: 0.05
 author:
   - 'Andy Grundman, <andy@hybridized.org>'
 abstract: Force SSL mode on select pages
@@ -10,5 +10,5 @@ requires:
 provides:
   Catalyst::Plugin::RequireSSL:
     file: lib/Catalyst/Plugin/RequireSSL.pm
-    version: 0.04
+    version: 0.05
 generated_by: Module::Build version 0.2611

diff --git a/lib/Catalyst/Plugin/RequireSSL.pm b/lib/Catalyst/Plugin/RequireSSL.pm
index f5457db..c9bc5d8 100644 (file)
--- a/lib/Catalyst/Plugin/RequireSSL.pm
+++ b/lib/Catalyst/Plugin/RequireSSL.pm
@@ -4,7 +4,7 @@ use strict;
 use base qw/Class::Accessor::Fast/;
 use NEXT;
 
-our $VERSION = '0.04';
+our $VERSION = '0.05';
 
 __PACKAGE__->mk_accessors( qw/_require_ssl _ssl_strip_output/ );
 
@@ -51,7 +51,7 @@ sub finalize {
 
     # do not allow any output to be displayed on the insecure page
     if ( $c->_ssl_strip_output ) {
-        $c->res->body( undef );
+        $c->res->body( '' );
     }
 
     return $c->NEXT::finalize(@_);

diff --git a/t/04ssl.t b/t/04ssl.t
index 18fc7d1..a120471 100644 (file)
--- a/t/04ssl.t
+++ b/t/04ssl.t
@@ -31,9 +31,9 @@ is( $res->code, 200, 'POST ok' );
 # test that it doesn't redirect if already in SSL mode\r
 SKIP:\r
 {\r
-    skip "These tests require a patch to Catalyst", 7;\r
-    # patch is to Catalyst::Engine::HTTP::Base in 5.3x\r
-    #             Catalyst::Engine::Test in 5.5\r
+    if ( Catalyst->VERSION < 5.5 ) {\r
+        skip "These tests require Catalyst >= 5.5", 7;\r
+    }\r
     ok( $res = request('https://localhost/ssl/secured'), 'request ok' );\r
     is( $res->code, 200, 'SSL request, ok' );\r
     \r

diff --git a/t/05ssl_host.t b/t/05ssl_host.t
index 56235f9..c826593 100644 (file)
--- a/t/05ssl_host.t
+++ b/t/05ssl_host.t
@@ -23,9 +23,9 @@ isnt( $res->content, 'Secured', 'no content displayed on secure page, ok' );
 # test redirect back to HTTP
 SKIP:
 {
-    skip "These tests require a patch to Catalyst", 2;
-    # patch is to Catalyst::Engine::HTTP::Base in 5.3x
-    #             Catalyst::Engine::Test in 5.5
+    if ( Catalyst->VERSION < 5.5 ) {
+        skip "These tests require Catalyst >= 5.5", 2;
+    }
     ok( $res = request('https://secure.mydomain.com/ssl/unsecured'), 'request ok' );
     is( $res->header('location'), 'http://www.mydomain.com/ssl/unsecured', 'other domain redirect uri ok' );
 }

diff --git a/t/06remain_in_ssl.t b/t/06remain_in_ssl.t
index 956385a..948d97a 100644 (file)
--- a/t/06remain_in_ssl.t
+++ b/t/06remain_in_ssl.t
@@ -22,9 +22,9 @@ isnt( $res->content, 'Secured', 'no content displayed on secure page, ok' );
 # test redirect back to HTTP, should not redirect
 SKIP:
 {
-    skip "These tests require a patch to Catalyst", 2;
-    # patch is to Catalyst::Engine::HTTP::Base in 5.3x
-    #             Catalyst::Engine::Test in 5.5
+    if ( Catalyst->VERSION < 5.5 ) {
+        skip "These tests require Catalyst >= 5.5", 2;
+    }
     ok( $res = request('https://localhost/ssl/unsecured'), 'request ok' );
     is( $res->code, 200, 'remain in SSL ok' );
 }