a few more boundary tests

mojolicious · Oct 30, 2012 · df375ad · df375ad
1 parent 0432925
commit df375ad
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,5 @@
 
-3.53  2012-10-29
+3.53  2012-10-30
   - Improved documentation.
   - Improved tests.
 

diff --git a/lib/Mojo/Content/MultiPart.pm b/lib/Mojo/Content/MultiPart.pm
@@ -39,9 +39,7 @@ sub build_boundary {
   my $self = shift;
 
   # Check for existing boundary
-  my $headers = $self->headers;
-  my $type = $headers->content_type || '';
-  $type =~ /boundary="?([^\s"]+)"?/i and return $1;
+  if (defined(my $boundary = $self->boundary)) { return $boundary }
 
   # Generate and check boundary
   my $boundary;
@@ -53,7 +51,8 @@ sub build_boundary {
   }
 
   # Add boundary to Content-Type header
-  $type =~ m!^(.*multipart/[^;]+)(.*)$!;
+  my $headers = $self->headers;
+  ($headers->content_type || '') =~ m!^(.*multipart/[^;]+)(.*)$!;
   my $before = $1 || 'multipart/mixed';
   my $after  = $2 || '';
   $headers->content_type("$before; boundary=$boundary$after");

diff --git a/t/mojo/content.t b/t/mojo/content.t
@@ -29,6 +29,11 @@ ok $content->body_contains('foo'),     'content contains "foo"';
 ok $content->body_contains('bar+'),    'content contains "bar+"';
 ok $content->body_contains('.'),       'content contains "."';
 ok $content->body_contains('.*?foo+'), 'content contains ".*?foo+"';
+ok !$content->headers->content_type, 'no "Content-Type" header';
+ok my $boundary = $content->build_boundary, 'boundary has been generated';
+is $boundary, $content->boundary, 'same boundary';
+is $content->headers->content_type, "multipart/mixed; boundary=$boundary",
+  'right "Content-Type" header';
 
 # Dynamic content
 $content = Mojo::Content::Single->new;