Fix vows clobbering our custom asserts.

test/core/ascending-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.ascending");
 

test/core/bisect-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.bisect");
 

test/core/descending-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.descending");
 

test/core/dispatch-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.dispatch");
 

test/core/ease-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.ease");
 

test/core/entries-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.entries");
 

test/core/extent-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.extent");
 

test/core/format-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.format");
 

test/core/formatPrefix-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.formatPrefix");
 

test/core/functor-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.functor");
 

test/core/hcl-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.hcl");
 

test/core/hsl-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.hsl");
 

test/core/html-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.html");
 

test/core/interpolate-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.interpolate");
 

test/core/json-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.json");
 

test/core/keys-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.keys");
 

test/core/lab-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.lab");
 

test/core/map-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.map");
 

test/core/max-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.max");
 

test/core/mean-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.mean");
 

test/core/median-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.median");
 

test/core/merge-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.merge");
 

test/core/min-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.min");
 

test/core/nest-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.nest");
 

test/core/ns-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("ns");
 

test/core/permute-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.permute");
 

test/core/quantile-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.quantile");
 

test/core/random-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.random");
 

test/core/range-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.range");
 

test/core/rebind-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.rebind");
 

test/core/requote-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.requote");
 

test/core/rgb-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.rgb");
 

test/core/round-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.round");
 

test/core/select-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.select");
 

test/core/selectAll-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.selectAll");
 

test/core/selection-append-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("selection.append");
 

test/core/selection-attr-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("selection.attr");
 

test/core/selection-call-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("selection.call");
 

test/core/selection-classed-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("selection.call");
 

test/core/selection-data-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("selection.data");
 

test/core/selection-datum-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("selection.datum");
 

test/core/selection-each-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("selection.each");
 

test/core/selection-empty-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("selection.empty");
 

test/core/selection-enter-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("selection.enter");
 

test/core/selection-filter-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("selection.filter");
 

test/core/selection-html-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("selection.html");
 

test/core/selection-insert-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("selection.insert");
 

test/core/selection-node-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("selection.node");
 

test/core/selection-on-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("selection.on");
 

test/core/selection-order-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("selection.order");
 

test/core/selection-property-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("selection.property");
 

test/core/selection-remove-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("selection.remove");
 

test/core/selection-select-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("selection.select");
 

test/core/selection-selectAll-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("selection.selectAll");
 

test/core/selection-sort-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("selection.sort");
 

test/core/selection-style-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("selection.style");
 

test/core/selection-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.selection");
 

test/core/selection-text-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("selection.text");
 

test/core/sum-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.sum");
 

test/core/text-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.text");
 

test/core/timer-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.timer");
 

test/core/transition-test-attr.js

@@ -1,6 +1,6 @@
 require("../env");
 
-var assert = require("assert");
+var assert = require("../env-assert");
 
 module.exports = {
   topic: function() {

test/core/transition-test-attrTween.js

@@ -1,6 +1,6 @@
 require("../env");
 
-var assert = require("assert");
+var assert = require("../env-assert");
 
 module.exports = {
   topic: function() {

test/core/transition-test-call.js

@@ -1,6 +1,6 @@
 require("../env");
 
-var assert = require("assert");
+var assert = require("../env-assert");
 
 module.exports = {
   topic: function() {

test/core/transition-test-delay.js

@@ -1,6 +1,6 @@
 require("../env");
 
-var assert = require("assert");
+var assert = require("../env-assert");
 
 module.exports = {
   topic: function() {

test/core/transition-test-duration.js

@@ -1,6 +1,6 @@
 require("../env");
 
-var assert = require("assert");
+var assert = require("../env-assert");
 
 module.exports = {
   topic: function() {

test/core/transition-test-each.js

@@ -1,6 +1,6 @@
 require("../env");
 
-var assert = require("assert");
+var assert = require("../env-assert");
 
 module.exports = {
   "start": {

test/core/transition-test-filter.js

@@ -1,6 +1,6 @@
 require("../env");
 
-var assert = require("assert");
+var assert = require("../env-assert");
 
 var datum = {};
 

test/core/transition-test-id.js

@@ -1,6 +1,6 @@
 require("../env");
 
-var assert = require("assert");
+var assert = require("../env-assert");
 
 module.exports = {
   topic: function() {

test/core/transition-test-remove.js

@@ -1,6 +1,6 @@
 require("../env");
 
-var assert = require("assert");
+var assert = require("../env-assert");
 
 module.exports = {
   topic: function() {

test/core/transition-test-select.js

@@ -1,6 +1,6 @@
 require("../env");
 
-var assert = require("assert");
+var assert = require("../env-assert");
 
 module.exports = {
   topic: function() {

test/core/transition-test-selectAll.js

@@ -1,6 +1,6 @@
 require("../env");
 
-var assert = require("assert");
+var assert = require("../env-assert");
 
 module.exports = {
   topic: function() {

test/core/transition-test-style.js

@@ -1,6 +1,6 @@
 require("../env");
 
-var assert = require("assert");
+var assert = require("../env-assert");
 
 module.exports = {
   topic: function() {

test/core/transition-test-styleTween.js

@@ -1,6 +1,6 @@
 require("../env");
 
-var assert = require("assert");
+var assert = require("../env-assert");
 
 module.exports = {
   topic: function() {

test/core/transition-test-text.js

@@ -1,6 +1,6 @@
 require("../env");
 
-var assert = require("assert");
+var assert = require("../env-assert");
 
 module.exports = {
   topic: function() {

test/core/transition-test-time.js

@@ -1,6 +1,6 @@
 require("../env");
 
-var assert = require("assert");
+var assert = require("../env-assert");
 
 module.exports = {
   topic: function() {

test/core/transition-test-transition.js

@@ -1,6 +1,6 @@
 require("../env");
 
-var assert = require("assert");
+var assert = require("../env-assert");
 
 module.exports = {
   topic: function() {

test/core/transition-test-tween.js

@@ -1,6 +1,6 @@
 require("../env");
 
-var assert = require("assert");
+var assert = require("../env-assert");
 
 module.exports = {
   topic: function() {

test/core/transition-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.transition");
 

test/core/transpose-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.transpose");
 

test/core/values-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.values");
 

test/core/version-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.version");
 

test/core/xhr-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.xhr");
 

test/core/xml-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.xml");
 

test/core/zip-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.zip");
 

test/dsv/csv-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.csv");
 

test/dsv/tsv-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.tsv");
 

test/env-assert.js

@@ -1,5 +1,7 @@
 var assert = require("assert");
 
+assert = module.exports = Object.create(assert);
+
 assert.inDelta = function(actual, expected, delta, message) {
   if (!inDelta(actual, expected, delta)) {
     assert.fail(actual, expected, message || "expected {actual} to be in within *" + delta + "* of {expected}", null, assert.inDelta);

test/env.js

@@ -2,7 +2,6 @@ process.env.TZ = "America/Los_Angeles";
 
 require("../globals");
 
-require("./env-assert");
 require("./env-xhr");
 require("./env-fragment");
 

test/geo/albers-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.geo.albers");
 

test/geo/area-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.geo.area");
 

test/geo/azimuthal-equal-area-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.geo.azimuthalEqualArea");
 

test/geo/azimuthal-equidistant-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.geo.azimuthalEquidistant");
 

test/geo/bounds-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.geo.bounds");
 

test/geo/centroid-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.geo.centroid");
 

test/geo/circle-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.geo.circle");
 

test/geo/equirectangular-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.geo.equirectangular");
 

test/geo/gnomonic-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.geo.gnomonic");
 

test/geo/graticule-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.geo.graticule");
 

test/geo/greatArc-test.js

@@ -1,7 +1,7 @@
 require("../env");
 
 var vows = require("vows"),
-    assert = require("assert");
+    assert = require("../env-assert");
 
 var suite = vows.describe("d3.geo.greatArc");