[Catalyst-commits] r6496 - in trunk/Catalyst-Plugin-Static-Simple: . lib/Catalyst/Plugin/Static t

[andyg at dev.catalyst.perl.org]

Author: andyg
Date: 2007-07-02 22:31:53 +0100 (Mon, 02 Jul 2007)
New Revision: 6496

Modified:
   trunk/Catalyst-Plugin-Static-Simple/Changes
   trunk/Catalyst-Plugin-Static-Simple/lib/Catalyst/Plugin/Static/Simple.pm
   trunk/Catalyst-Plugin-Static-Simple/t/11serve_static.t
Log:
Static::Simple 0.19, fixed a test that fails on some systems

Modified: trunk/Catalyst-Plugin-Static-Simple/Changes
===================================================================
--- trunk/Catalyst-Plugin-Static-Simple/Changes	2007-07-02 12:30:07 UTC (rev 6495)
+++ trunk/Catalyst-Plugin-Static-Simple/Changes	2007-07-02 21:31:53 UTC (rev 6496)
@@ -1,5 +1,9 @@
 Revision history for Perl extension Catalyst::Plugin::Static::Simple
 
+0.19    2007-07-02 17:00:00
+        - Fixed test failure on some systems in 11serve_static.t due to
+          multiple MIME types defined for the extension '.pm'.
+
 0.18    2007-07-01 00:15:00
         - Logging may now be enabled with the less confusing
           MyApp->config->{static}->{logging} = 1;

Modified: trunk/Catalyst-Plugin-Static-Simple/lib/Catalyst/Plugin/Static/Simple.pm
===================================================================
--- trunk/Catalyst-Plugin-Static-Simple/lib/Catalyst/Plugin/Static/Simple.pm	2007-07-02 12:30:07 UTC (rev 6495)
+++ trunk/Catalyst-Plugin-Static-Simple/lib/Catalyst/Plugin/Static/Simple.pm	2007-07-02 21:31:53 UTC (rev 6496)
@@ -8,7 +8,7 @@
 use IO::File ();
 use MIME::Types ();
 
-our $VERSION = '0.18';
+our $VERSION = '0.19';
 
 __PACKAGE__->mk_accessors( qw/_static_file _static_debug_message/ );
 

Modified: trunk/Catalyst-Plugin-Static-Simple/t/11serve_static.t
===================================================================
--- trunk/Catalyst-Plugin-Static-Simple/t/11serve_static.t	2007-07-02 12:30:07 UTC (rev 6495)
+++ trunk/Catalyst-Plugin-Static-Simple/t/11serve_static.t	2007-07-02 21:31:53 UTC (rev 6496)
@@ -12,7 +12,8 @@
 # test getting a file via serve_static_file
 ok( my $res = request('http://localhost/serve_static'), 'request ok' );
 is( $res->code, 200, '200 ok' );
-is( $res->content_type, 'application/x-pagemaker', 'content-type ok' );
+# .pm can be both application/x-pagemaker or text/x-perl, so only check for a slash
+like( $res->content_type, qr{/}, 'content-type ok' );
 like( $res->content, qr/serve_static/, 'content of serve_static ok' );
 
 # test getting a non-existant file via serve_static_file