improved default descriptions for many methods in Test::Mojo

mojolicious · Jul 18, 2012 · 0c7fc56 · 0c7fc56
1 parent 9ff97e3
commit 0c7fc56
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/Changes b/Changes
@@ -1,6 +1,7 @@
 
 3.11  2012-07-18
   - Added or method to Test::Mojo. (moritz, sri)
+  - Improved default descriptions for many methods in Test::Mojo.
   - Improved documentation.
   - Improved tests.
   - Fixed a few small encoding bugs in Test::Mojo.

diff --git a/lib/Test/Mojo.pm b/lib/Test/Mojo.pm
@@ -89,13 +89,13 @@ sub delete_ok { shift->_request_ok(delete => @_) }
 
 sub element_exists {
   my ($self, $selector, $desc) = @_;
-  $desc ||= encode 'UTF-8', qq{"$selector" exists};
+  $desc ||= encode 'UTF-8', qq{element for selector "$selector" exists};
   return $self->_test('ok', $self->tx->res->dom->at($selector), $desc);
 }
 
 sub element_exists_not {
   my ($self, $selector, $desc) = @_;
-  $desc ||= encode 'UTF-8', qq{"$selector" exists not};
+  $desc ||= encode 'UTF-8', qq{no element for selector "$selector"};
   return $self->_test('ok', !$self->tx->res->dom->at($selector), $desc);
 }
 
@@ -238,13 +238,13 @@ sub status_isnt {
 
 sub text_is {
   my ($self, $selector, $value, $desc) = @_;
-  $desc ||= encode 'UTF-8', $selector;
+  $desc ||= encode 'UTF-8', qq{exact match for selector "$selector"};
   return $self->_test('is', $self->_text($selector), $value, $desc);
 }
 
 sub text_isnt {
   my ($self, $selector, $value, $desc) = @_;
-  $desc ||= encode 'UTF-8', $selector;
+  $desc ||= encode 'UTF-8', qq{no match for selector "$selector"};
   return $self->_test('isnt', $self->_text($selector), $value, $desc);
 }
 
@@ -253,13 +253,13 @@ sub text_isnt {
 #  Is it, or is it you girls can't admit that you have a problem?"
 sub text_like {
   my ($self, $selector, $regex, $desc) = @_;
-  $desc ||= encode 'UTF-8', $selector;
+  $desc ||= encode 'UTF-8', qq{similar match for selector "$selector"};
   return $self->_test('like', $self->_text($selector), $regex, $desc);
 }
 
 sub text_unlike {
   my ($self, $selector, $regex, $desc) = @_;
-  $desc ||= encode 'UTF-8', $selector;
+  $desc ||= encode 'UTF-8', qq{no similar match for selector "$selector"};
   return $self->_test('unlike', $self->_text($selector), $regex, $desc);
 }
 

diff --git a/t/mojolicious/lite_app.t b/t/mojolicious/lite_app.t
@@ -9,7 +9,7 @@ BEGIN {
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';
 }
 
-use Test::More tests => 702;
+use Test::More tests => 698;
 
 # "Wait you're the only friend I have...
 #  You really want a robot for a friend?
@@ -1236,14 +1236,11 @@ $t->ua->max_redirects(3);
 $t->get_ok('/redirect_named')->status_is(200)
   ->header_is(Server         => 'Mojolicious (Perl)')
   ->header_is('X-Powered-By' => 'Mojolicious (Perl)')
-  ->header_is(Location       => undef)->element_exists('#foo')
-  ->element_exists_not('#bar')->text_isnt('#bar' => 'whatever')
-  ->text_isnt('div' => 'Redirect')->text_isnt('div.☃' => 'Redirect')
-  ->text_is('div'     => 'Redirect works!')
-  ->text_is('div.☃' => 'Redirect works!')
-  ->text_unlike('[id="foo"]' => qr/Foo/)->text_unlike('div.☃' => qr/Foo/)
-  ->text_like('[id="foo"]' => qr/^Redirect/)
-  ->text_like('div.☃'    => qr/^Redirect/);
+  ->header_is(Location       => undef)->element_exists('#☃')
+  ->element_exists_not('#foo')->text_isnt('#foo' => 'whatever')
+  ->text_isnt('div#☃' => 'Redirect')
+  ->text_is('div#☃' => 'Redirect works!')->text_unlike('div#☃' => qr/Foo/)
+  ->text_like('div#☃' => qr/^Redirect/);
 $t->ua->max_redirects(0);
 Test::Mojo->new->tx($t->tx->previous)->status_is(302)
   ->header_is(Server         => 'Mojolicious (Perl)')
@@ -1399,7 +1396,7 @@ Just some
 text!
 
 @@ template.txt.epl
-<div id="foo" class="☃">Redirect works!</div>
+<div id="☃">Redirect works!</div>
 
 @@ test(test)(\Qtest\E)(.html.ep
 <%= $self->match->endpoint->name %>