[Jifty-commit] r3785 - in Test-WWW-Declare: lib/Test/WWW t

[jifty-commit at lists.jifty.org]

Author: sartak
Date: Fri Aug  3 19:42:17 2007
New Revision: 3785

Modified:
   Test-WWW-Declare/   (props changed)
   Test-WWW-Declare/lib/Test/WWW/Declare.pm
   Test-WWW-Declare/t/06-title.t

Log:
 r29891 at caladan:  sartak | 2007-08-03 18:56:11 -0400
 Add: content should contain 'string'


Modified: Test-WWW-Declare/lib/Test/WWW/Declare.pm
==============================================================================
--- Test-WWW-Declare/lib/Test/WWW/Declare.pm	(original)
+++ Test-WWW-Declare/lib/Test/WWW/Declare.pm	Fri Aug  3 19:42:17 2007
@@ -9,7 +9,7 @@
 
 our @EXPORT = qw(flow run get session check mech match follow link content
                  should shouldnt click href button fill form SKIP _twd_dummy
-                 title equal caselessly);
+                 title equal caselessly contain);
 our $BUILDER = Test::Builder->new();
 our $WWW_MECHANIZE;
 
@@ -60,6 +60,12 @@
     return $args;
 }
 
+sub contain ($) {
+    my $args = _args(shift);
+    $args->{match} = 'index';
+    return $args;
+}
+
 sub caselessly ($) {
     my $args = _args(shift);
     $args->{case_insensitive} = 1;
@@ -154,9 +160,21 @@
                                       : "equals";
         push @output, $orig->{expected};
 
-
         $match = $args{got} eq $args{expected};
     }
+    elsif ($args{match} eq 'index') {
+        if ($args{case_insensitive}) {
+            push @output, "caselessly";
+            $args{got} = lc $args{got};
+            $args{expected} = lc $args{expected};
+        }
+
+        push @output, $args{positive} ? "contain"
+                                      : "contains";
+        push @output, $orig->{expected};
+
+        $match = index($args{got}, $args{expected}) >= 0;
+    }
     elsif ($args{match} eq 'regex') {
         if ($args{case_insensitive}) {
             push @output, "caselessly";

Modified: Test-WWW-Declare/t/06-title.t
==============================================================================
--- Test-WWW-Declare/t/06-title.t	(original)
+++ Test-WWW-Declare/t/06-title.t	Fri Aug  3 19:42:17 2007
@@ -13,6 +13,9 @@
                 title should equal 'GOOD';
                 click href qr{index};
                 title should caselessly equal 'InDeX';
+                title should contain 'DEX';
+                title shouldnt contain 'dEX';
+                title should caselessly contain 'dEX';
             };
         };
     }