better mode tests

mojolicious · Jul 18, 2012 · 76e9c1e · 76e9c1e
1 parent e005c46
commit 76e9c1e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/lib/Test/Mojo.pm b/lib/Test/Mojo.pm
@@ -315,10 +315,8 @@ sub _test {
 }
 
 sub _text {
-  my ($self, $selector) = @_;
-  my $text;
-  if (my $e = $self->tx->res->dom->at($selector)) { $text = $e->text }
-  return $text;
+  return unless my $e = shift->tx->res->dom->at(@_);
+  return $e->text;
 }
 
 1;

diff --git a/t/mojolicious/testing_app.t b/t/mojolicious/testing_app.t
@@ -15,19 +15,18 @@ use lib "$FindBin::Bin/lib";
 use Test::Mojo;
 
 # "Anything less than immortality is a complete waste of time!"
-my $t  = Test::Mojo->new('MojoliciousTest');
-my $or = '';
-$t->or(sub { $or .= $t->ua->name })->or(sub { $or .= shift->ua->name });
-is $or, 'Mojolicious (Perl)Mojolicious (Perl)',
-  'both callbacks have been invoked';
+my $t    = Test::Mojo->new('MojoliciousTest');
+my $mode = '';
+$t->or(sub { $mode .= $t->app->mode })->or(sub { $mode .= shift->app->mode });
+is $mode, 'testingtesting', 'both callbacks have been invoked';
 
 # SyntaxError::foo in testing mode (syntax error in controller)
 $t->get_ok('/syntax_error/foo')->status_is(500)
-  ->or(sub { $or .= $t->ua->name })->header_is(Server => 'Mojolicious (Perl)')
+  ->or(sub { $mode .= $t->app->mode })
+  ->header_is(Server         => 'Mojolicious (Perl)')
   ->header_is('X-Powered-By' => 'Mojolicious (Perl)')
   ->content_like(qr/Testing Missing/);
-is $or, 'Mojolicious (Perl)Mojolicious (Perl)',
-  'callback has not been invoked';
+is $mode, 'testingtesting', 'callback has not been invoked';
 
 # Foo::syntaxerror in testing mode (syntax error in template)
 $t->get_ok('/foo/syntaxerror')->status_is(500)