Clean up tests

package.json

@@ -10,7 +10,7 @@
     "rebuild": "npm run postinstall",
     "watch": "mkdir -p editor/js && watchify client/index.js -o editor/js/bundle.js",
     "debug": "npm run postinstall && DEBUG=1 bin/server",
-    "test": "tape 'test/**/*-test.js'"
+    "test": "rm -rf test/tmp && tape 'test/**/*-test.js'"
   },
   "repository": {
     "type": "git",

test/frame-test.js

@@ -12,93 +12,55 @@ var frameDir = path.join(__dirname, "tmp", "frames");
 
 var waveform = [[0, 1, 0], [1, 0.1, 1]];
 
-tape.test("Draw frame", function(test){
-
-  var options = {
-    width: 1280,
-    height: 720,
-    backgroundColor: "#f00",
-    foregroundColor: "#fff",
-    waveTop: 340,
-    waveBottom: 380
-  };
+function tester(options) {
 
-  initializeCanvas(options, function(err, renderer){
+  return function(test) {
 
-    test.error(err);
+    initializeCanvas(options, function(err, renderer){
 
-    drawFrames(renderer, {
-      numFrames: 2,
-      frameDir: frameDir,
-      width: options.width,
-      height: options.height,
-      waveform: waveform
-    }, function(err){
       test.error(err);
-      checkFrame(test, options);
-    });
-
-  });
-
-});
 
-tape.test("Default colors", function(test){
+      drawFrames(renderer, {
+        numFrames: waveform.length,
+        frameDir: frameDir,
+        width: options.width,
+        height: options.height,
+        waveform: waveform
+      }, function(err){
+        test.error(err);
+        checkFrame(test, options);
+      });
 
-  var options = {
-    width: 1280,
-    height: 720,
-    waveTop: 340,
-    waveBottom: 380
-  };
-
-  initializeCanvas(options, function(err, renderer){
-
-    test.error(err);
-
-    drawFrames(renderer, {
-      numFrames: 2,
-      frameDir: frameDir,
-      width: options.width,
-      height: options.height,
-      waveform: waveform
-    }, function(err){
-      test.error(err);
-      checkFrame(test, options);
     });
 
-  });
-
-});
-
-tape.test("Square frame", function(test){
-
-  var options = {
-    width: 720,
-    height: 720,
-    backgroundColor: "#f00",
-    foregroundColor: "#fff",
-    waveTop: 340,
-    waveBottom: 380
   };
 
-  initializeCanvas(options, function(err, renderer){
-
-    test.error(err);
-
-    drawFrames(renderer, {
-      numFrames: 2,
-      frameDir: frameDir,
-      width: options.width,
-      height: options.height,
-      waveform: waveform
-    }, function(err){
-      test.error(err);
-      checkFrame(test, options);
-    });
-
-  });
+}
 
-});
+tape.test("Draw frame", tester({
+  width: 1280,
+  height: 720,
+  backgroundColor: "#f00",
+  foregroundColor: "#fff",
+  waveTop: 340,
+  waveBottom: 380
+}));
+
+tape.test("Default colors", tester({
+  width: 1280,
+  height: 720,
+  waveTop: 340,
+  waveBottom: 380
+}));
+
+tape.test("Square frame", tester({
+  width: 720,
+  height: 720,
+  backgroundColor: "#f00",
+  foregroundColor: "#fff",
+  waveTop: 340,
+  waveBottom: 380
+}));
 
 function checkFrame(test, options) {