better Mojo::Log test

mojolicious · Mar 31, 2012 · 198d6da · 198d6da
1 parent f47d421
commit 198d6da
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 25 deletions.
diff --git a/lib/Mojo/Content/Single.pm b/lib/Mojo/Content/Single.pm
@@ -51,16 +51,15 @@ sub parse {
   # Parse headers
   $self->parse_until_body(@_);
 
-  # Content needs to be upgraded to multipart
-  if ($self->auto_upgrade && defined($self->boundary)) {
-    $self->unsubscribe(read => $self->{read});
-    my $multi = Mojo::Content::MultiPart->new($self);
-    $self->emit(upgrade => $multi);
-    return $multi->parse;
-  }
-
   # Parse body
-  return $self->SUPER::parse;
+  return $self->SUPER::parse
+    unless $self->auto_upgrade && defined($self->boundary);
+
+  # Content needs to be upgraded to multipart
+  $self->unsubscribe(read => $self->{read});
+  my $multi = Mojo::Content::MultiPart->new($self);
+  $self->emit(upgrade => $multi);
+  return $multi->parse;
 }
 
 1;

diff --git a/lib/Mojo/Message.pm b/lib/Mojo/Message.pm
@@ -146,7 +146,6 @@ sub build_start_line {
 
 sub cookie {
   my ($self, $name) = @_;
-  return unless $name;
 
   # Map
   unless ($self->{cookies}) {
@@ -298,7 +297,6 @@ sub to_string {
 
 sub upload {
   my ($self, $name) = @_;
-  return unless $name;
 
   # Map
   unless ($self->{uploads}) {

diff --git a/lib/Mojo/Message/Request.pm b/lib/Mojo/Message/Request.pm
@@ -101,8 +101,7 @@ sub param {
 sub params {
   my $self   = shift;
   my $params = Mojo::Parameters->new;
-  $params->merge($self->body_params, $self->query_params);
-  return $params;
+  return $params->merge($self->body_params, $self->query_params);
 }
 
 sub parse {
@@ -159,19 +158,16 @@ sub parse {
 sub proxy {
   my ($self, $url) = @_;
 
+  # Get
+  return $self->{proxy} unless $url;
+
   # Mojo::URL object
-  if (ref $url) {
-    $self->{proxy} = $url;
-    return $self;
-  }
+  if (ref $url) { $self->{proxy} = $url }
 
   # String
-  elsif ($url) {
-    $self->{proxy} = Mojo::URL->new($url);
-    return $self;
-  }
+  elsif ($url) { $self->{proxy} = Mojo::URL->new($url) }
 
-  return $self->{proxy};
+  return $self;
 }
 
 sub query_params { shift->url->query }

diff --git a/lib/Mojo/Server/Daemon.pm b/lib/Mojo/Server/Daemon.pm
@@ -171,7 +171,6 @@ sub _group {
 
 sub _listen {
   my ($self, $listen) = @_;
-  return unless $listen;
 
   # Check listen value
   my $url   = Mojo::URL->new($listen);

diff --git a/t/mojo/log.t b/t/mojo/log.t
@@ -33,8 +33,8 @@ $log->level('debug')->log(info => 'Whatever.');
 is_deeply $messages, [qw/info Whatever./], 'right messages';
 $log->level('error')->log(info => 'Again.');
 is_deeply $messages, [qw/info Whatever./], 'right messages';
-$log->log(fatal => 'Test', 123);
-is_deeply $messages, [qw/info Whatever. fatal Test 123/], 'right messages';
+$log->log(fatal => 'Test', 1, 2, 3);
+is_deeply $messages, [qw/info Whatever. fatal Test 1 2 3/], 'right messages';
 
 # "debug"
 is $log->level('debug')->level, 'debug', 'right level';