[Jifty-commit] jifty branch, master, updated. 1.10518-48-gf6b0bf4

[Jifty commits]

The branch, master has been updated
       via  f6b0bf4aa30cd595c78334ea3b8cc8a49599e257 (commit)
       via  a53f8267b8b18f7dd646fcf070339996cb76e260 (commit)
       via  e468b25535ce1d4d4d6a03f202c28bedd7053e0c (commit)
      from  58eb17a40ab9d628554cb06e6089a4c7d1257c0f (commit)

Summary of changes:
 lib/Jifty/Test/WWW/Selenium.pm |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

- Log -----------------------------------------------------------------
commit e468b25535ce1d4d4d6a03f202c28bedd7053e0c
Author: Luke Closs <luke at 5thplane.com>
Date:   Thu Sep 22 14:46:34 2011 -0700

    Finish testing so no_plan tests are happy.

diff --git a/lib/Jifty/Test/WWW/Selenium.pm b/lib/Jifty/Test/WWW/Selenium.pm
index a00dcff..c1e3d69 100644
--- a/lib/Jifty/Test/WWW/Selenium.pm
+++ b/lib/Jifty/Test/WWW/Selenium.pm
@@ -145,6 +145,7 @@ sub _skip_rest {
             $Tester->skip($why); # skip rest of the test
         }
     }
+    $Tester->done_testing();
     exit(0);
 }
 

commit a53f8267b8b18f7dd646fcf070339996cb76e260
Merge: 58eb17a e468b25
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Mon Sep 26 10:48:15 2011 -0400

    Merge branch 'lukec/master'


commit f6b0bf4aa30cd595c78334ea3b8cc8a49599e257
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Mon Sep 26 11:11:01 2011 -0400

    Don't call done_testing if the test is marked as no_plan
    
    Otherwise a plan is output twice, leading to soft test failure.  This
    happened with t/TestApp-JiftyJS/t/2-behaviour.t.

diff --git a/lib/Jifty/Test/WWW/Selenium.pm b/lib/Jifty/Test/WWW/Selenium.pm
index c1e3d69..4aa42db 100644
--- a/lib/Jifty/Test/WWW/Selenium.pm
+++ b/lib/Jifty/Test/WWW/Selenium.pm
@@ -144,8 +144,8 @@ sub _skip_rest {
         for my $ct ($Tester->{Curr_Test} + 1 .. $Tester->{Expected_Tests}) {
             $Tester->skip($why); # skip rest of the test
         }
+        $Tester->done_testing();
     }
-    $Tester->done_testing();
     exit(0);
 }
 

-----------------------------------------------------------------------