[Jifty-commit] jifty branch, master, updated. b0a8006ed25a0c4f6662fc411174acc4a991ab76

Tue Feb 2 22:42:42 EST 2010

The branch, master has been updated
       via  b0a8006ed25a0c4f6662fc411174acc4a991ab76 (commit)
      from  cb063d64f3cc3d2941e970d0798c9d12c521cd5a (commit)

Summary of changes:
 .../share/web/static/js-test/01.behaviour.html     |    2 +-
 .../share/web/static/js-test/02.action.html        |    2 +-
 t/TestApp-JiftyJS/t/2-behaviour.t                  |    5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit b0a8006ed25a0c4f6662fc411174acc4a991ab76
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Feb 3 11:42:06 2010 +0800

    fix tests

diff --git a/t/TestApp-JiftyJS/share/web/static/js-test/01.behaviour.html b/t/TestApp-JiftyJS/share/web/static/js-test/01.behaviour.html
index 511e49e..5bba3b8 100644
--- a/t/TestApp-JiftyJS/share/web/static/js-test/01.behaviour.html
+++ b/t/TestApp-JiftyJS/share/web/static/js-test/01.behaviour.html
@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>behaviour.js test</title>
-<script type="text/javascript" src="/static/js/jsan/JSAN.js" charset="UTF-8"></script>
+<script type="text/javascript" src="/static/js-test/lib/JSAN.js" charset="UTF-8"></script>
 
 <script type="text/javascript" src="lib/Test/Builder.js" charset="UTF-8"></script>
 <script type="text/javascript" src="lib/Test/More.js" charset="UTF-8"></script>
diff --git a/t/TestApp-JiftyJS/share/web/static/js-test/02.action.html b/t/TestApp-JiftyJS/share/web/static/js-test/02.action.html
index 2a461ce..379463c 100644
--- a/t/TestApp-JiftyJS/share/web/static/js-test/02.action.html
+++ b/t/TestApp-JiftyJS/share/web/static/js-test/02.action.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <title>jifty.js test for "Action" object.</title>
-    <script type="text/javascript" src="/static/js/jsan/JSAN.js" charset="UTF-8"></script>
+    <script type="text/javascript" src="/static/js-test/lib/JSAN.js" charset="UTF-8"></script>
     <script type="text/javascript" src="lib/Test/Builder.js" charset="UTF-8"></script>
     <script type="text/javascript" src="lib/Test/More.js" charset="UTF-8"></script>
     <script type="text/javascript" src="/static/js/jquery-1.2.6.js" charset="UTF-8"></script>
diff --git a/t/TestApp-JiftyJS/t/2-behaviour.t b/t/TestApp-JiftyJS/t/2-behaviour.t
index 02f854d..df05a2f 100644
--- a/t/TestApp-JiftyJS/t/2-behaviour.t
+++ b/t/TestApp-JiftyJS/t/2-behaviour.t
@@ -13,9 +13,10 @@ my $URL    = $server->started_ok;
 for my $test_file (qw(01.behaviour.html 02.action.html)) {
     $sel->open_ok("/static/js-test/$test_file");
     my $html = $sel->get_text("test");
-    $html =~ /(\d+)\.\.(\d+)/;
+    like( $html, qr/(\d+)\.\.(\d+)/, 'contains tests' );
+    my ( $start, $end ) = $html =~ /(\d+)\.\.(\d+)/;
 
-    for($1..$2) {
+    for($start .. $end ) {
         $sel->wait_for_text_present("exact:ok $_");
         ok(! $sel->is_text_present("exact:nok $_") );
     }

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