preserve original test target

mojolicious · Jan 18, 2014 · 932b965 · 932b965
1 parent 59e5287
commit 932b965
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/lib/Test/Mojo.pm b/lib/Test/Mojo.pm
@@ -223,7 +223,7 @@ sub patch_ok { shift->_build_ok(PATCH => @_) }
 sub post_ok  { shift->_build_ok(POST  => @_) }
 sub put_ok   { shift->_build_ok(PUT   => @_) }
 
-sub request_ok { shift->_request_ok(@_) }
+sub request_ok { shift->_request_ok($_[0], $_[0]->req->url->to_string) }
 
 sub reset_session {
   my $self = shift;
@@ -277,13 +277,13 @@ sub text_unlike {
 
 sub websocket_ok {
   my $self = shift;
-  return $self->_request_ok($self->ua->build_websocket_tx(@_));
+  return $self->_request_ok($self->ua->build_websocket_tx(@_), $_[0]);
 }
 
 sub _build_ok {
-  my $self = shift;
+  my ($self, $method, $url) = (shift, shift, shift);
   local $Test::Builder::Level = $Test::Builder::Level + 1;
-  return $self->_request_ok($self->ua->build_tx(@_));
+  return $self->_request_ok($self->ua->build_tx($method, $url, @_), $url);
 }
 
 sub _json {
@@ -311,7 +311,7 @@ sub _message {
 }
 
 sub _request_ok {
-  my ($self, $tx) = @_;
+  my ($self, $tx, $url) = @_;
 
   local $Test::Builder::Level = $Test::Builder::Level + 1;
 
@@ -331,7 +331,7 @@ sub _request_ok {
     );
     Mojo::IOLoop->start;
 
-    my $desc = encode 'UTF-8', "WebSocket @{[$tx->req->url]}";
+    my $desc = encode 'UTF-8', "WebSocket $url";
     return $self->_test('ok', $self->tx->is_websocket, $desc);
   }
 
@@ -340,7 +340,7 @@ sub _request_ok {
   my ($err, $code) = $self->tx->error;
   Test::More::diag $err if !(my $ok = !$err || $code) && $err;
   return $self->_test('ok', $ok,
-    encode('UTF-8', "@{[uc $tx->req->method]} @{[$tx->req->url]}"));
+    encode('UTF-8', "@{[uc $tx->req->method]} $url"));
 }
 
 sub _test {
@@ -820,7 +820,6 @@ arguments as L<Mojo::UserAgent/"put">, except for the callback.
 =head2 request_ok
 
   $t = $t->request_ok(Mojo::Transaction::HTTP->new);
-  $t = $t->request_ok(Mojo::Transaction::HTTP->new, 'request successful');
 
 Perform request and check for transport errors.
 

diff --git a/t/mojolicious/restful_lite_app.t b/t/mojolicious/restful_lite_app.t
@@ -56,8 +56,8 @@ $t->request_ok($tx)->status_is(200)->content_type_is('application/json')
 # Array with "json" format
 $tx = $t->ua->build_tx(
   PUT => '/json/echo' => {Accept => 'application/json'} => json => [1, 2, 3]);
-$t->request_ok($tx, 'request succesful')->status_is(200)
-  ->content_type_is('application/json')->json_is([1, 2, 3]);
+$t->request_ok($tx)->status_is(200)->content_type_is('application/json')
+  ->json_is([1, 2, 3]);
 
 # Nothing
 $t->get_ok('/rest')->status_is(200)