better content negotiation tests

mojolicious · Dec 14, 2012 · 75b17c6 · 75b17c6
1 parent eaf1402
commit 75b17c6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/lib/Mojolicious/Types.pm b/lib/Mojolicious/Types.pm
@@ -38,7 +38,7 @@ sub detect {
   # Extract and prioritize MIME types
   my %types;
   for my $type (split /,/, $accept // '') {
-    next unless $type =~ /^\s*([^,; ]+)(?:.*\;\s*q=([\d.]+))?.*$/i;
+    next unless $type =~ /^\s*([^,; ]+)(?:\s*\;\s*q=([\d.]+))?\s*$/i;
     $types{lc $1} = $2 // 1;
   }
   my @types = sort { $types{$b} <=> $types{$a} } keys %types;

diff --git a/t/mojolicious/restful_lite_app.t b/t/mojolicious/restful_lite_app.t
@@ -434,6 +434,13 @@ $t->post_ok('/rest.png?format=json')->status_is(201)
 # GET /nothing (does not exist)
 $t->get_ok('/nothing' => {Accept => 'image/png'})->status_is(404);
 
+# GET /rest (Ajax)
+my $ajax = 'text/html;q=0.1,application/xml';
+$t->get_ok(
+  '/rest' => {Accept => $ajax, 'X-Requested-With' => 'XMLHttpRequest'})
+  ->status_is(200)->content_type_is('application/xml')
+  ->text_is(just => 'works');
+
 # GET /rest.html (Internet Explorer 8)
 my $ie
   = 'image/jpeg, application/x-ms-application, image/gif, application/xaml+xml'
@@ -460,7 +467,7 @@ $t->get_ok('/rest?format=html' => {Accept => $chrome})->status_is(200)
   ->content_type_is('text/html;charset=UTF-8')
   ->text_is('html > body', 'works');
 
-# GET /rest (jQuery Ajax)
+# GET /rest (jQuery 1.8)
 my $jquery = 'application/json, text/javascript, */*; q=0.01';
 $t->get_ok(
   '/rest' => {Accept => $jquery, 'X-Requested-With' => 'XMLHttpRequest'})

diff --git a/t/mojolicious/types.t b/t/mojolicious/types.t
@@ -39,7 +39,7 @@ is_deeply $t->detect('application/zip'),        ['zip'],  'right format';
 
 # Detect special cases
 is_deeply $t->detect('Application/Xml'), ['xml'], 'right formats';
-is_deeply $t->detect('Text/Xml'),        ['xml'], 'right formats';
+is_deeply $t->detect(' Text/Xml '),      ['xml'], 'right formats';
 is_deeply $t->detect('APPLICATION/XML'), ['xml'], 'right formats';
 is_deeply $t->detect('TEXT/XML'),        ['xml'], 'right formats';
 is_deeply $t->detect('text/html;q=0.9'), ['htm', 'html'], 'right formats';
@@ -68,8 +68,7 @@ is $t->type('html'), 'text/html;charset=UTF-8', 'right type';
 
 # Prioritize
 is_deeply $t->detect('text/plain', 1), ['txt'], 'right formats';
-is_deeply $t->detect('TEXT/HTML;V=1.0; q=0.8 ; foo=bar', 1), ['htm', 'html'],
-  'right formats';
+is_deeply $t->detect('TEXT/HTML; q=0.8 ', 1), ['htm', 'html'], 'right formats';
 is_deeply $t->detect('TEXT/HTML;Q=0.8,text/plain;Q=0.9', 1),
   ['txt', 'htm', 'html'], 'right formats';
 is_deeply $t->detect(' TEXT/HTML , text/plain;Q=0.9', 1),