Changeset 4707 for trunk/plugins/accordion/test

Timestamp:

02/10/08 15:02:03 (10 months ago)

Author:

joern.zaefferer

Message:

updated change event to 1.5 callback API

Location:

trunk/plugins/accordion/test

Files:

• test.js (modified) (2 diffs)
• testrunner.js (modified) (6 diffs)

trunk/plugins/accordion/test/test.js

@@ -13 +13 @@
 
 test("autoheight", function() {
-    $('#navigation').makeAccordion({ header: '.head', autoheight: false });
+    $('#navigation').accordion({ header: '.head', autoheight: false });
     equals( 90, $('#navigation ul:first').height() );
     equals( 126, $('#navigation ul:eq(1)').height() );
     equals( 54, $('#navigation ul:last').height() );
-    $('#navigation').removeAccordion().makeAccordion({ header: '.head',autoheight: true });
+    $('#navigation').accordion("destroy").accordion({ header: '.head',autoheight: true });
     equals( 126, $('#navigation ul:first').height() );
     equals( 126, $('#navigation ul:eq(1)').height() );
@@ -24 +24 @@
 
 test("activate, numeric", function() {
-    var ac = $('#list1').makeAccordion({ active: 1 });
+    var ac = $('#list1').accordion({ active: 1 });
     state(ac, 0, 1, 0);
-    ac.activate(2);
+    ac.accordion("activate", 2);
     state(ac, 0, 0, 1);
-    ac.activate(0);
+    ac.accordion("activate", 0);
     state(ac, 1, 0, 0);
-    ac.activate(1);
+    ac.accordion("activate", 1);
     state(ac, 0, 1, 0);
-    ac.activate(2);
+    ac.accordion("activate", 2);
     state(ac, 0, 0, 1);
-    ac.activate(-1);
+    ac.accordion("activate", -1);
     state(ac, 0, 0, 1);
 });
 
 test("activate, boolean and numeric, alwaysOpen:false", function() {
-    var ac = $('#list1').makeAccordion({alwaysOpen: false}).activate(2);
+    var ac = $('#list1').accordion({alwaysOpen: false}).accordion("activate", 2);
     state(ac, 0, 0, 1);
     ok("x", "----")
-    ac.activate(0);
+    ac.accordion("activate", 0);
     state(ac, 1, 0, 0);
     ok("x", "----")
-    ac.activate(-1);
+    ac.accordion("activate", -1);
     state(ac, 0, 0, 0);
 });
 
 test("activate, boolean, alwaysOpen:true", function() {
-    var ac = $('#list1').makeAccordion().activate(2);
+    var ac = $('#list1').accordion().accordion("activate", 2);
     state(ac, 0, 0, 1);
-    ac.activate(-1);
+    ac.accordion("activate", -1);
     state(ac, 0, 0, 1);
 });
 
 test("activate, string expression", function() {
-    var ac = $('#list1').makeAccordion({ active: ":last" });
+    var ac = $('#list1').accordion({ active: ":last" });
     state(ac, 0, 0, 1);
-    ac.activate(":first");
+    ac.accordion("activate", ":first");
     state(ac, 1, 0, 0);
-    ac.activate(":eq(1)");
+    ac.accordion("activate", ":eq(1)");
     state(ac, 0, 1, 0);
-    ac.activate(":last");
+    ac.accordion("activate", ":last");
     state(ac, 0, 0, 1);
 });
 
 test("activate, jQuery or DOM element", function() {
-    var ac = $('#list1').makeAccordion({ active: $("#list1 a:last") });
+    var ac = $('#list1').accordion({ active: $("#list1 a:last") });
     state(ac, 0, 0, 1);
-    ac.activate($("#list1 a:first"));
+    ac.accordion("activate", $("#list1 a:first"));
     state(ac, 1, 0, 0);
-    ac.activate($("#list1 a")[1]);
+    ac.accordion("activate", $("#list1 a")[1]);
     state(ac, 0, 1, 0);
 });

trunk/plugins/accordion/test/testrunner.js

@@ -14 +14 @@
 };
 
+var isLocal = !!(window.location.protocol == 'file:');
+
 $(function() {
     $('#userAgent').html(navigator.userAgent);
@@ -40 +42 @@
         start();
     };
-    _config.timeout = setTimeout(handler, _config.asyncTimeout * 1000);
+    // Disabled, caused too many random errors
+    //_config.timeout = setTimeout(handler, _config.asyncTimeout * 1000);
 }
 function start() {
-    if(_config.timeout)
-        clearTimeout(_config.timeout);
-    _config.blocking = false;
-    process();
+    // A slight delay, to avoid any current callbacks
+    setTimeout(function(){
+        if(_config.timeout)
+            clearTimeout(_config.timeout);
+        _config.blocking = false;
+        process();
+    }, 13);
 }
 
@@ -53 +59 @@
     var time = new Date();
     _config.fixture = document.getElementById('main').innerHTML;
-    reset();
     synchronize(function() {
         time = new Date() - time;
@@ -70 +75 @@
         
     var filter = location.search.slice(1);
-    if ( filter && encodeURIComponent(name) != filter )
+    if ( filter && encodeURIComponent(name).indexOf(filter) == -1 )
         return;
         
@@ -84 +89 @@
             }
             _config.Test.push( [ false, "Died on test #" + (_config.Test.length+1) + ": " + e ] );
-            throw e;
         }
     });
@@ -158 +162 @@
  */
 function reset() {
-    document.getElementById('main').innerHTML = _config.fixture;
+    $("#main").html( _config.fixture );
 }