more grep tests

mojolicious · Jul 3, 2012 · 21b9832 · 21b9832
1 parent 1585084
commit 21b9832
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/Mojo/Collection.pm b/lib/Mojo/Collection.pm
@@ -36,8 +36,7 @@ sub first {
 #  I can get by with one."
 sub grep {
   my ($self, $cb) = @_;
-  return $self->new(grep { $_->$cb } @$self) if ref $cb eq 'CODE';
-  return $self->new(grep { $_ =~ $cb } @$self);
+  return $self->new(grep { $_ ~~ $cb } @$self);
 }
 
 sub join {

diff --git a/t/mojo/collection.t b/t/mojo/collection.t
@@ -1,6 +1,6 @@
 use Mojo::Base -strict;
 
-use Test::More tests => 50;
+use Test::More tests => 52;
 
 # "'What are you lookin at?' - the innocent words of a drunken child."
 use Mojo::Collection 'c';
@@ -37,6 +37,10 @@ is $collection->first(sub { defined $_ }), undef, 'no result';
 # grep
 $collection = c(1, 2, 3, 4, 5, 6, 7, 8, 9);
 is_deeply [$collection->grep(qr/[6-9]/)->each], [6, 7, 8, 9], 'right elements';
+is_deeply [$collection->grep(sub {/[6-9]/})->each], [6, 7, 8, 9],
+  'right elements';
+is_deeply [$collection->grep(sub { $_ > 5 })->each], [6, 7, 8, 9],
+  'right elements';
 is_deeply [$collection->grep(sub { $_ < 5 })->each], [1, 2, 3, 4],
   'right elements';
 is_deeply [$collection->grep(sub { shift == 5 })->each], [5], 'right elements';