improved user agent tests slightly

mojolicious · Dec 22, 2011 · 3d83f74 · 3d83f74
1 parent 2ca668e
commit 3d83f74
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/t/mojo/user_agent.t b/t/mojo/user_agent.t
@@ -111,20 +111,19 @@ ok $success, 'successful';
 is $code,    200, 'right status';
 is $body,    'works!', 'right content';
 
-# Error in callback
-my $cb = app->log->subscribers('message')->[0];
-app->log->unsubscribe(message => $cb);
+# Error in callback is logged
+my $message = app->log->subscribers('message')->[0];
+app->log->unsubscribe(message => $message);
 app->log->level('error');
 app->ua->once(error => sub { Mojo::IOLoop->stop });
 ok app->ua->has_subscribers('error'), 'has subscribers';
 my $err;
-my $cb2 = app->log->on(message => sub { $err .= pop });
+app->log->once(message => sub { $err .= pop });
 app->ua->get('/' => sub { die 'error event works' });
 Mojo::IOLoop->start;
 app->log->level('fatal');
-app->log->on(message => $cb);
+app->log->on(message => $message);
 like $err, qr/error event works/, 'right error';
-app->log->unsubscribe(message => $cb2);
 
 # GET / (blocking)
 my $tx = $ua->get('/');
@@ -178,20 +177,20 @@ is $tx->res->body, 'works!', 'right content';
 
 # GET /timeout (built-in server times out)
 my $log = '';
-$cb = app->log->subscribers('message')->[0];
-app->log->unsubscribe(message => $cb);
+$message = app->log->subscribers('message')->[0];
+app->log->unsubscribe(message => $message);
 app->log->level('error');
 app->log->on(message => sub { $log .= pop });
 $tx = $ua->get('/timeout?timeout=0.5');
 app->log->level('fatal');
-app->log->on(message => $cb);
+app->log->on(message => $message);
 ok !$tx->success, 'not successful';
 is $tx->error, 'Premature connection close.', 'right error';
 is $timeout, 1, 'finish event has been emitted';
 like $log, qr/Connection\ timeout\./, 'right log message';
 
 # GET /timeout (client times out)
-$cb = $ua->once(
+$ua->once(
   start => sub {
     my ($ua, $tx) = @_;
     $tx->on(

diff --git a/t/mojolicious/websocket_lite_app.t b/t/mojolicious/websocket_lite_app.t
@@ -162,7 +162,7 @@ $t->websocket_ok('/unicode')->send_message_ok('hello again')
 my $bytes = b("I ♥ Mojolicious")->encode('UTF-16LE')->to_string;
 $t->websocket_ok('/bytes');
 my $binary;
-my $cb = $t->tx->on(
+$t->tx->on(
   frame => sub {
     my ($ws, $frame) = @_;
     $binary++ if $frame->[1] == 2;