imrpoved default descriptions in Test::Mojo

mojolicious · Apr 12, 2013 · 255f107 · 255f107
1 parent 360d51b
commit 255f107
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/Changes b/Changes
@@ -1,4 +1,7 @@
 
+3.96  2013-04-13
+  - Improved default descriptions in Test::Mojo.
+
 3.95  2013-04-12
   - Added finished_ok method to Test::Mojo.
   - Removed deprecated slurp_rel_file method from Mojo::Home.

diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -40,7 +40,7 @@ has static   => sub { Mojolicious::Static->new };
 has types    => sub { Mojolicious::Types->new };
 
 our $CODENAME = 'Rainbow';
-our $VERSION  = '3.95';
+our $VERSION  = '3.96';
 
 sub AUTOLOAD {
   my $self = shift;

diff --git a/lib/Test/Mojo.pm b/lib/Test/Mojo.pm
@@ -105,13 +105,13 @@ sub finish_ok {
   my $self = shift;
   $self->tx->finish(@_);
   Mojo::IOLoop->one_tick while !$self->{finished};
-  return $self->_test('ok', 1, 'finished websocket');
+  return $self->_test('ok', 1, 'finished WebSocket');
 }
 
 sub finished_ok {
   my ($self, $code) = @_;
   Mojo::IOLoop->one_tick while !$self->{finished};
-  return $self->_test('is', $self->{finished}[0], $code, 'finished websocket');
+  return $self->_test('is', $self->{finished}[0], $code, 'finished WebSocket');
 }
 
 sub get_ok  { shift->_request_ok(get  => @_) }
@@ -230,7 +230,7 @@ sub post_form_ok {
     'Test::Mojo::post_form_ok is DEPRECATED in favor of Test::Mojo::post_ok';
   my ($self, $url) = (shift, shift);
   my $tx = $self->tx($self->ua->post_form($url, @_))->tx;
-  return $self->_test('ok', $tx->is_finished, encode('UTF-8', "post $url"));
+  return $self->_test('ok', $tx->is_finished, encode('UTF-8', "POST $url"));
 }
 
 # DEPRECATED in Rainbow!
@@ -239,7 +239,7 @@ sub post_json_ok {
     'Test::Mojo::post_json_ok is DEPRECATED in favor of Test::Mojo::post_ok';
   my ($self, $url) = (shift, shift);
   my $tx = $self->tx($self->ua->post_json($url, @_))->tx;
-  return $self->_test('ok', $tx->is_finished, encode('UTF-8', "post $url"));
+  return $self->_test('ok', $tx->is_finished, encode('UTF-8', "POST $url"));
 }
 
 sub put_ok { shift->_request_ok(put => @_) }
@@ -318,7 +318,7 @@ sub websocket_ok {
   );
   Mojo::IOLoop->start;
 
-  my $desc = encode 'UTF-8', "websocket $url";
+  my $desc = encode 'UTF-8', "WebSocket $url";
   return $self->_test('ok', $self->tx->res->code eq 101, $desc);
 }
 
@@ -361,7 +361,7 @@ sub _request_ok {
   local $Test::Builder::Level = $Test::Builder::Level + 1;
   my ($err, $code) = $self->tx->error;
   Test::More::diag $err if !(my $ok = !$err || $code) && $err;
-  return $self->_test('ok', $ok, encode('UTF-8', "$method $url"));
+  return $self->_test('ok', $ok, encode('UTF-8', "@{[uc $method]} $url"));
 }
 
 sub _test {