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

[jifty-commit at lists.jifty.org]

Author: sartak
Date: Mon Aug  6 12:58:07 2007
New Revision: 3805

Modified:
   Test-WWW-Declare/   (props changed)
   Test-WWW-Declare/lib/Test/WWW/Declare.pm
   Test-WWW-Declare/t/09-multisession.t

Log:
 r29949 at caladan:  sartak | 2007-08-06 12:57:57 -0400
 Add support for mech("session name"), refactor t/09


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	Mon Aug  6 12:58:07 2007
@@ -101,8 +101,9 @@
 sub never { shouldnt $_[0] }
 
 # Mech interactions
-sub mech {
-    return $WWW_MECHANIZE;
+sub mech(;$) {
+    my $name = shift;
+    return defined $name ? $mechs{$name} : $WWW_MECHANIZE;
 }
 
 sub get {

Modified: Test-WWW-Declare/t/09-multisession.t
==============================================================================
--- Test-WWW-Declare/t/09-multisession.t	(original)
+++ Test-WWW-Declare/t/09-multisession.t	Mon Aug  6 12:58:07 2007
@@ -1,8 +1,11 @@
 #!perl
-use Test::WWW::Declare::Tester tests => 23;
+use Test::WWW::Declare::Tester;
 use warnings;
 use strict;
 
+my @testnames = ('a', 'b', 'visit FORMY', 'c', 'argy mech', 'visit GOOD', 'd', 'f', 'visit FORMY', 'e', 'visit GOOD', 'visit FORMY');
+plan tests => 1 + 2 * @testnames;
+
 my @results = run_tests(
     sub {
         session "visit GOOD" => run {
@@ -22,6 +25,8 @@
             flow "c" => check {
                 title should equal 'GOOD';
             };
+
+            is(mech("visit FORMY")->title, "FORMY", "argy mech");
         };
 
         session "visit FORMY" => run {
@@ -45,12 +50,11 @@
 );
 
 shift @results; # Test::Tester gives 1-based arrays
-is(@results, 11, "had eleven tests");
-for (0..10) { ok($results[$_]{ok}, "test $_ passed") }
-
-my @testnames = ('a', 'b', 'visit FORMY', 'c', 'visit GOOD', 'd', 'f', 'visit FORMY', 'e', 'visit GOOD', 'visit FORMY');
+is(@results, @testnames, "had ". at testnames." tests");
+for (1.. at testnames) { ok($results[$_-1]{ok}, "test $_ passed") }
 
 for (1.. at testnames)
 {
     is($results[$_-1]{name}, $testnames[$_-1], "correct test name for test $_");
 }
+