Mostly working w/ tests

test/frame-test.js

@@ -10,6 +10,8 @@ require("mkdirp").sync(path.join(__dirname, "tmp", "frames"));
 
 var frameDir = path.join(__dirname, "tmp", "frames");
 
+var waveform = [[0, 1, 0], [1, 0.1, 1]];
+
 tape.test("Draw frame", function(test){
 
   var options = {
@@ -18,8 +20,7 @@ tape.test("Draw frame", function(test){
     backgroundColor: "#f00",
     foregroundColor: "#fff",
     waveTop: 340,
-    waveBottom: 380,
-    waveform: [[0, 1, 0], [1, 0.1, 1]]
+    waveBottom: 380
   };
 
   initializeCanvas(options, function(err, renderer){
@@ -28,7 +29,10 @@ tape.test("Draw frame", function(test){
 
     drawFrames(renderer, {
       numFrames: 2,
-      frameDir: frameDir
+      frameDir: frameDir,
+      width: options.width,
+      height: options.height,
+      waveform: waveform
     }, function(err){
       test.error(err);
       checkFrame(test, options);
@@ -44,8 +48,7 @@ tape.test("Default colors", function(test){
     width: 1280,
     height: 720,
     waveTop: 340,
-    waveBottom: 380,
-    waveform: [[0, 1, 0], [1, 0.1, 1]]
+    waveBottom: 380
   };
 
   initializeCanvas(options, function(err, renderer){
@@ -54,7 +57,10 @@ tape.test("Default colors", function(test){
 
     drawFrames(renderer, {
       numFrames: 2,
-      frameDir: frameDir
+      frameDir: frameDir,
+      width: options.width,
+      height: options.height,
+      waveform: waveform
     }, function(err){
       test.error(err);
       checkFrame(test, options);
@@ -69,11 +75,10 @@ tape.test("Square frame", function(test){
   var options = {
     width: 720,
     height: 720,
-    backgroundColor: "#fc0",
+    backgroundColor: "#f00",
     foregroundColor: "#fff",
     waveTop: 340,
-    waveBottom: 380,
-    waveform: [[0, 1, 0], [1, 0.1, 1]]
+    waveBottom: 380
   };
 
   initializeCanvas(options, function(err, renderer){
@@ -82,7 +87,10 @@ tape.test("Square frame", function(test){
 
     drawFrames(renderer, {
       numFrames: 2,
-      frameDir: frameDir
+      frameDir: frameDir,
+      width: options.width,
+      height: options.height,
+      waveform: waveform
     }, function(err){
       test.error(err);
       checkFrame(test, options);

test/server-test.js

@@ -84,7 +84,7 @@ tape("Max size", function(test) {
   request(server)
     .post("/submit/")
     .attach("audio", longSample)
-    .field("settings", "{}")
+    .field("theme", "{}")
     .expect(500)
     .end(function(err, res){
       test.assert(res.text.match(/uploads are limited/i));
@@ -98,7 +98,7 @@ tape("Missing file", function(test) {
   request(server)
     .post("/submit/")
     .type("json")
-    .field("settings", "{}")
+    .field("theme", "{}")
     .expect(500)
     .end(function(err, res){
       test.assert(res.text.match(/audio/i));
@@ -112,7 +112,7 @@ tape("Broken settings", function(test) {
   request(server)
     .post("/submit/")
     .type("multipart/form-data")
-    .field("settings", "a")
+    .field("theme", "a")
     .expect(500)
     .end(function(err, res){
       test.assert(res.text.match(/settings/i));
@@ -128,7 +128,7 @@ tape("Successful submission", function(test) {
   request(server)
     .post("/submit/")
     .attach("audio", shortSample)
-    .field("settings", JSON.stringify({ test: true }))
+    .field("theme", JSON.stringify({ test: true }))
     .expect(200)
     .end(function(err, res){