Async test support

test/public/app.js

@@ -49,7 +49,7 @@ function runTests() {
 function runTest(name, canvas, dest) {
   var fn = tests[name]
     , start = new Date;
-  fn(canvas.getContext('2d'));
+  fn(canvas.getContext('2d'), function(){});
   canvas.title += ' (rendered in ' + (new Date - start) + 'ms)';
   renderOnServer(name, canvas, function(res){
     if (res.error) {

test/public/tests.js

@@ -1388,50 +1388,56 @@ tests['font state'] = function(ctx){
   ctx.fillText('Boom again!', 50, 140);
 };
 
-tests['drawImage(img,0,0)'] = function(ctx){
+tests['drawImage(img,0,0)'] = function(ctx, done){
   var img = new Image;
   img.onload = function(){
     ctx.drawImage(img, 0, 0);
+    done();
   };
   img.src = 'state.png';
 };
 
-tests['drawImage(img,x,y)'] = function(ctx){
+tests['drawImage(img,x,y)'] = function(ctx, done){
   var img = new Image;
   img.onload = function(){
     ctx.drawImage(img, 5, 25);
+    done();
   };
   img.src = 'state.png';
 };
 
-tests['drawImage(img,x,y,w,h) scale down'] = function(ctx){
+tests['drawImage(img,x,y,w,h) scale down'] = function(ctx, done){
   var img = new Image;
   img.onload = function(){
     ctx.drawImage(img, 25, 25, 10, 10);
+    done();
   };
   img.src = 'state.png';
 };
 
-tests['drawImage(img,x,y,w,h) scale up'] = function(ctx){
+tests['drawImage(img,x,y,w,h) scale up'] = function(ctx, done){
   var img = new Image;
   img.onload = function(){
     ctx.drawImage(img, 0, 0, 200, 200);
+    done();
   };
   img.src = 'state.png';
 };
 
-tests['drawImage(img,x,y,w,h) scale vertical'] = function(ctx){
+tests['drawImage(img,x,y,w,h) scale vertical'] = function(ctx, done){
   var img = new Image;
   img.onload = function(){
     ctx.drawImage(img, 0, 0, img.width, 200);
+    done();
   };
   img.src = 'state.png';
 };
 
-tests['drawImage(img,sx,sy,sw,sh,x,y,w,h)'] = function(ctx){
+tests['drawImage(img,sx,sy,sw,sh,x,y,w,h)'] = function(ctx, done){
   var img = new Image;
   img.onload = function(){
     ctx.drawImage(img, 13, 13, 80, 80, 25, 25, img.width / 2, img.height / 2);
+    done();
   };
   img.src = 'state.png';
 };

test/server.js

@@ -30,6 +30,7 @@ app.get('/', function(req, res){
   res.render('tests');
 });
 
+var n = 0;
 app.post('/render', function(req, res, next){
   // Normalize state.png as ./public/state.png
   // no good way around this at the moment
@@ -43,12 +44,16 @@ app.post('/render', function(req, res, next){
     , ctx = canvas.getContext('2d')
     , start = new Date;
 
-  fn(ctx);
+  function done(){
-  var duration = new Date - start;
+    var duration = new Date - start;
+    canvas.toDataURL(function(err, str){
+      res.send({ data: str, duration: duration });
+    });
+  }
 
-  canvas.toDataURL(function(err, str){
+  2 == fn.length 
-    res.send({ data: str, duration: duration });
+    ? fn(ctx, done)
-  });
+    : fn(ctx), done();
 });
 
 app.listen(parseInt(process.argv[2] || '3000', 10));