removed duplicate tests

mojolicious · Aug 18, 2012 · 58e042a · 58e042a
1 parent e12093c
commit 58e042a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 19 deletions.
diff --git a/lib/Test/Mojo.pm b/lib/Test/Mojo.pm
@@ -192,8 +192,8 @@ sub message_unlike {
 sub options_ok { shift->_request_ok(options => @_) }
 
 sub or {
-  my ($self, $diag) = @_;
-  $self->$diag unless $self->{latest};
+  my ($self, $cb) = @_;
+  $self->$cb unless $self->{latest};
   return $self;
 }
 

diff --git a/t/mojo/delay.t b/t/mojo/delay.t
@@ -6,7 +6,7 @@ BEGIN {
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';
 }
 
-use Test::More tests => 14;
+use Test::More tests => 12;
 
 # "And now to create an unstoppable army of between one million and two
 #  million zombies!"
@@ -16,7 +16,7 @@ use Mojo::IOLoop::Delay;
 # Basic functionality
 my $delay = Mojo::IOLoop::Delay->new;
 my @results;
-for my $i (0, 0) {
+for my $i (1, 1) {
   $delay->begin;
   Mojo::IOLoop->timer(0 => sub { push @results, $i; $delay->end });
 }
@@ -25,19 +25,19 @@ $delay->begin;
 is $end->(), 3, 'three remaining';
 is $delay->end, 2, 'two remaining';
 $delay->wait;
-is_deeply \@results, [0, 0], 'right results';
+is_deeply \@results, [1, 1], 'right results';
 
 # Arguments
 $delay = Mojo::IOLoop::Delay->new;
 my $finished;
 $delay->on(finish => sub { shift; $finished = [@_, 'works!'] });
-for my $i (0, 0) {
+for my $i (2, 2) {
   $delay->begin;
   Mojo::IOLoop->timer(0 => sub { $delay->end($i) });
 }
 @results = $delay->wait;
-is_deeply $finished, [0, 0, 'works!'], 'right results';
-is_deeply \@results, [0, 0], 'right results';
+is_deeply $finished, [2, 2, 'works!'], 'right results';
+is_deeply \@results, [2, 2], 'right results';
 
 # Context
 $delay = Mojo::IOLoop::Delay->new;
@@ -73,17 +73,6 @@ is_deeply [$delay->wait], [2, 3, 2, 1, 4], 'right numbers';
 is $finished, 1, 'finish event has been emitted once';
 is_deeply $result, [2, 3, 2, 1, 4], 'right numbers';
 
-# Event loop
-$finished = undef;
-$delay = Mojo::IOLoop->delay(sub { shift; $finished = [@_, 'too!'] });
-for my $i (1, 1) {
-  my $cb = $delay->begin;
-  Mojo::IOLoop->timer(0 => sub { $delay->$cb($i) });
-}
-@results = $delay->wait;
-is_deeply $finished, [1, 1, 'too!'], 'right results';
-is_deeply \@results, [1, 1], 'right results';
-
 # Nested delays
 ($result, $finished) = undef;
 $delay = Mojo::IOLoop->delay(