Rewrite the wait function so that it gives useful failure messages in IE 6-7.

Author: savetheclocktower

test.new/static/js/test_helpers.js

@@ -1,6 +1,8 @@
 
 (function () {
 
+  var IS_IE6 = (navigator.userAgent.indexOf('MSIE 6.0') > -1);
+  var IS_IE7 = (navigator.userAgent.indexOf('MSIE 7.0') > -1);
   var CONSOLE_LOG_SUPPORTED = ('console' in window) && console.log;
   var CONSOLE_GROUP_SUPPORTED = ('console' in window) && console.group &&
    console.groupEnd;
@@ -26,10 +28,33 @@
 
   window.info = info;
 
-   // A function that acts like setTimeout, except with arguments reversed. This
+  // A function that acts like setTimeout, except with arguments reversed. This
   // is far more readable within tests.
-  function wait(duration, fn) {
-    return setTimeout(fn, duration);
+  function wait(duration, done, fn) {
+    var handler = function () {
+      try {
+        fn();
+      } catch (e) {
+        // In IE6, manually throwing errors doesn't trigger window.onerror.
+        // Instead, we'll pass an actual error to the `done` callback.
+        if (IS_IE6) {
+          if (Object.isFunction(done)) {
+            return done(new Error(e.message));
+          }
+        }
+
+        // In IE7, window.onerror will get triggered, but with a generic
+        // error message. Instead we need to throw an actual Error object
+        // because it does not grok this whole custom error thing.
+        if (IS_IE7) {
+          throw new Error(e.message);
+        }
+
+        // In other browsers, we can just re-throw it and be fine.
+        throw e;
+      }
+    };
+    return setTimeout(handler, duration);
   }
   window.wait = wait;
 

test.new/tests/dom.test.js

@@ -429,7 +429,7 @@ suite('DOM', function () {
     $('testdiv').update('hello from div!<script>\ntestVar="hello!";\n</'+'script>');
     assert.equal('hello from div!', $('testdiv').innerHTML);
 
-    wait(100, function () {
+    wait(100, done, function () {
       assert.equal('hello!', testVar);
 
       Element.update('testdiv','another hello from div!\n<script>testVar="another hello!"</'+'script>\nhere it goes');
@@ -441,19 +441,19 @@ suite('DOM', function () {
         /^another hello from div!\s+here it goes$/
       );
 
-      wait(100, function() {
+      wait(100, done, function() {
         assert.equal('another hello!', testVar);
 
         Element.update('testdiv',
          'a\n<script>testVar="a"\ntestVar="b"</'+'script>');
 
-        wait(100, function () {
+        wait(100, done, function () {
           assert.equal('b', testVar);
 
           Element.update('testdiv',
             'x<script>testVar2="a"</'+'script>\nblah\n'+
             'x<script>testVar2="b"</'+'script>');
-          wait(100, function () {
+          wait(100, done, function () {
             assert.equal('b', testVar2);
             done();
           });
@@ -560,7 +560,7 @@ suite('DOM', function () {
   test('#replace (with script)', function (done) {
     $('testdiv-replace-4').replace('hello from div!<script>testVarReplace="hello!"</'+'script>');
     assert.equal('hello from div!', $('testdiv-replace-container-4').innerHTML);
-    wait(100, function(){
+    wait(100, done, function(){
       assert.equal('hello!', testVarReplace);
 
       $('testdiv-replace-5').replace('another hello from div!\n<script>testVarReplace="another hello!"</'+'script>\nhere it goes');
@@ -570,7 +570,7 @@ suite('DOM', function () {
         $('testdiv-replace-container-5').innerHTML,
         /^another hello from div!\s+here it goes$/
       );
-      wait(100, function(){
+      wait(100, done, function(){
         assert.equal('another hello!', testVarReplace);
         done();
       });

test.new/tests/form.test.js

@@ -111,17 +111,17 @@ suite('Form', function () {
     assert.equal(0, timedCounter);
 
     // Test it doesn't change on first check.
-    wait(550, function () {
+    wait(550, done, function () {
       assert.equal(0, timedCounter, 'callbacks should be 0');
 
       // Change it, ensure it hasn't changed immediately.
       $('input_enabled').value = 'yowza!';
       assert.equal(0, timedCounter, 'callbacks should be 0 still');
 
-      wait(550, function () {
+      wait(550, done, function () {
         assert.equal(1, timedCounter, 'callbacks should be 1');
 
-        wait(550, function () {
+        wait(550, done, function () {
           assert.equal(1, timedCounter, 'callbacks should be 1 still');
           observer.stop();
           done();

test.new/tests/function.test.js

@@ -118,7 +118,7 @@ suite('Function', function () {
     delayedFunction.delay(0.8);
     delayedFunctionWithArgs.delay(0.8, 'hello', 'world');
     assert.isUndefined(window.delayed);
-    wait(1000, function() {
+    wait(1000, done, function() {
       assert(window.delayed);
       assert.equal('hello world', window.delayedWithArgs);
       done();
@@ -152,13 +152,13 @@ suite('Function', function () {
     var deferredFunction = function() { window.deferred = true; };
     deferredFunction.defer();
     assert.isUndefined(window.deferred);
-    wait(50, function() {
+    wait(50, done, function() {
       assert(window.deferred);
 
       window.deferredValue = 0;
       var deferredFunction2 = function(arg) { window.deferredValue = arg; };
       deferredFunction2.defer('test');
-      wait(50, function() {
+      wait(50, done, function() {
         assert.equal('test', window.deferredValue);
 
         window.deferBoundProperly = false;
@@ -170,7 +170,7 @@ suite('Function', function () {
 
         func.bind(obj).defer();
 
-        wait(50, function() {
+        wait(50, done, function() {
           assert(window.deferBoundProperly,
            "deferred bound functions should preserve original scope");
 
@@ -179,7 +179,7 @@ suite('Function', function () {
 
           str.evalScripts.bind(str).defer();
 
-          wait(50, function() {
+          wait(50, done, function() {
             assert(window.deferBoundProperlyOnString);
             done();
           });

test.new/tests/layout.test.js

@@ -388,34 +388,34 @@ suite("Layout",function(){
   suite('document.viewport', function () {
 
     test('#getDimensions', function (done) {
-      this.timeout(5000);
+      this.timeout(60000);
       var original = document.viewport.getDimensions();
 
       try {
         window.resizeTo(800, 600);
       } catch (e) {
         info("Can't resize.");
-        return;
-      }
 
-      wait(1000, function() {
+        return done();
+      }
+      wait(1000, done, function() {
         var before = document.viewport.getDimensions();
 
         var delta = { width: 800 - before.width, height: 600 - before.height };
 
         window.resizeBy(50, 50);
-        wait(1000, function() {
+        wait(1000, done, function() {
           var after = document.viewport.getDimensions();
 
           // Assume that JavaScript window resizing is disabled if before width
           // and after width are the same.
           if (before.width === after.width) {
             RESIZE_DISABLED = true;
             info("SKIPPING REMAINING TESTS (JavaScript window resizing disabled)");
-            done();
-            return;
+            return done();
           }
 
+
           assert.equal(
             before.width + 50, after.width,
            "NOTE: YOU MUST ALLOW JAVASCRIPT TO RESIZE YOUR WINDOW FOR THIS TEST TO PASS"
@@ -425,7 +425,7 @@ suite("Layout",function(){
            "NOTE: YOU MUST ALLOW JAVASCRIPT TO RESIZE YOUR WINDOW FOR THIS TEST TO PASS"
          );
 
-          wait(1000, function() {
+          wait(1000, done, function() {
             // Restore original dimensions.
             window.resizeTo(
               original.width  + delta.width,
@@ -464,20 +464,21 @@ suite("Layout",function(){
 
       if (RESIZE_DISABLED) {
         info("SKIPPING REMAINING TESTS (JavaScript window resizing disabled)");
+        done();
         return;
       }
 
       window.resizeTo(200, 650);
 
-      wait(1000, function() {
+      wait(1000, done, function() {
         var before = document.viewport.getDimensions();
         var delta = { width: 200 - before.width, height: 650 - before.height };
 
         window.scrollTo(25, 35);
         assert.equal(25, document.viewport.getScrollOffsets().left,
          "NOTE: YOU MUST ALLOW JAVASCRIPT TO RESIZE YOUR WINDOW FOR THESE TESTS TO PASS");
 
-        wait(1000, function() {
+        wait(1000, done, function() {
           // Restore original dimensions.
           window.resizeTo(
             original.width  + delta.width,

test.new/tests/periodical_executer.test.js

@@ -11,7 +11,7 @@ suite('PeriodicalExecuter', function () {
     // peEventFired will stop the PeriodicalExecuter after 3 callbacks
     new PeriodicalExecuter(peEventFired, 0.05);
 
-    wait(600, function() {
+    wait(600, done, function() {
       assert.equal(3, peEventCount);
       done();
     });