Fix tests. Fixes #6.

Author: mbostock

package.json

@@ -1,6 +1,6 @@
 {
   "name": "d3-request",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "A convenient alternative to XMLHttpRequest.",
   "keywords": [
     "d3",

test/csv-test.js

@@ -1,5 +1,6 @@
 var tape = require("tape"),
-    request = require("../");
+    request = require("../"),
+    table = require("./table");
 
 require("./XMLHttpRequest");
 
@@ -10,7 +11,7 @@ tape("csv(url, callback) makes an asynchronous GET request for a CSV file", func
     test.equal(XMLHttpRequest._last._info.method, "GET");
     test.equal(XMLHttpRequest._last._info.async, true);
     test.equal(XMLHttpRequest._last._info.mimeType, "text/csv");
-    test.deepEqual(data, [{Hello: "42", World: "\"fish\""}]);
+    test.deepEqual(data, table([{Hello: "42", World: "\"fish\""}], ["Hello", "World"]));
     test.end();
   });
 });
@@ -22,31 +23,31 @@ tape("csv(url, callback) is an alias csv(url).get(callback)", function(test) {
     test.equal(XMLHttpRequest._last._info.method, "GET");
     test.equal(XMLHttpRequest._last._info.async, true);
     test.equal(XMLHttpRequest._last._info.mimeType, "text/csv");
-    test.deepEqual(data, [{Hello: "42", World: "\"fish\""}]);
+    test.deepEqual(data, table([{Hello: "42", World: "\"fish\""}], ["Hello", "World"]));
     test.end();
   });
 });
 
 tape("csv(url, row, callback) observes the specified row conversion function", function(test) {
   request.csv("test/data/sample.csv", function(d) { d.Hello = -d.Hello; return d; }, function(error, data) {
     if (error) throw error;
-    test.deepEqual(data, [{Hello: -42, World: "\"fish\""}]);
+    test.deepEqual(data, table([{Hello: -42, World: "\"fish\""}], ["Hello", "World"]));
     test.end();
   });
 });
 
 tape("csv(url, row, callback) is an alias for csv(url).row(row).get(callback)", function(test) {
   request.csv("test/data/sample.csv").row(function(d) { d.Hello = -d.Hello; return d; }).get(function(error, data) {
     if (error) throw error;
-    test.deepEqual(data, [{Hello: -42, World: "\"fish\""}]);
+    test.deepEqual(data, table([{Hello: -42, World: "\"fish\""}], ["Hello", "World"]));
     test.end();
   });
 });
 
 tape("csv(url).mimeType(type).get(callback) observes the specified mime type", function(test) {
   request.csv("test/data/sample.csv").mimeType("text/plain").get(function(error, data) {
     if (error) throw error;
-    test.deepEqual(data, [{Hello: "42", World: "\"fish\""}]);
+    test.deepEqual(data, table([{Hello: "42", World: "\"fish\""}], ["Hello", "World"]));
     test.equal(XMLHttpRequest._last._info.mimeType, "text/plain");
     test.end();
   });

test/table.js

@@ -0,0 +1,4 @@
+module.exports = function(rows, columns) {
+  rows.columns = columns;
+  return rows;
+};

test/tsv-test.js

@@ -1,5 +1,6 @@
 var tape = require("tape"),
-    request = require("../");
+    request = require("../"),
+    table = require("./table");
 
 require("./XMLHttpRequest");
 
@@ -10,7 +11,7 @@ tape("tsv(url, callback) makes an asynchronous GET request for a TSV file", func
     test.equal(XMLHttpRequest._last._info.method, "GET");
     test.equal(XMLHttpRequest._last._info.async, true);
     test.equal(XMLHttpRequest._last._info.mimeType, "text/tab-separated-values");
-    test.deepEqual(data, [{Hello: "42", World: "\"fish\""}]);
+    test.deepEqual(data, table([{Hello: "42", World: "\"fish\""}], ["Hello", "World"]));
     test.end();
   });
 });
@@ -22,31 +23,31 @@ tape("tsv(url, callback) is an alias tsv(url).get(callback)", function(test) {
     test.equal(XMLHttpRequest._last._info.method, "GET");
     test.equal(XMLHttpRequest._last._info.async, true);
     test.equal(XMLHttpRequest._last._info.mimeType, "text/tab-separated-values");
-    test.deepEqual(data, [{Hello: "42", World: "\"fish\""}]);
+    test.deepEqual(data, table([{Hello: "42", World: "\"fish\""}], ["Hello", "World"]));
     test.end();
   });
 });
 
 tape("tsv(url, row, callback) observes the specified row conversion function", function(test) {
   request.tsv("test/data/sample.tsv", function(d) { d.Hello = -d.Hello; return d; }, function(error, data) {
     if (error) throw error;
-    test.deepEqual(data, [{Hello: -42, World: "\"fish\""}]);
+    test.deepEqual(data, table([{Hello: -42, World: "\"fish\""}], ["Hello", "World"]));
     test.end();
   });
 });
 
 tape("tsv(url, row, callback) is an alias for tsv(url).row(row).get(callback)", function(test) {
   request.tsv("test/data/sample.tsv").row(function(d) { d.Hello = -d.Hello; return d; }).get(function(error, data) {
     if (error) throw error;
-    test.deepEqual(data, [{Hello: -42, World: "\"fish\""}]);
+    test.deepEqual(data, table([{Hello: -42, World: "\"fish\""}], ["Hello", "World"]));
     test.end();
   });
 });
 
 tape("tsv(url).mimeType(type).get(callback) observes the specified mime type", function(test) {
   request.tsv("test/data/sample.tsv").mimeType("text/plain").get(function(error, data) {
     if (error) throw error;
-    test.deepEqual(data, [{Hello: "42", World: "\"fish\""}]);
+    test.deepEqual(data, table([{Hello: "42", World: "\"fish\""}], ["Hello", "World"]));
     test.equal(XMLHttpRequest._last._info.mimeType, "text/plain");
     test.end();
   });