From a3bb93a7492df517d870cb24de9296912671e95e Mon Sep 17 00:00:00 2001 From: Mike Bostock Date: Sat, 2 Mar 2013 15:09:02 -0800 Subject: [PATCH] Fix vows clobbering our custom asserts. --- test/core/ascending-test.js | 2 +- test/core/bisect-test.js | 2 +- test/core/descending-test.js | 2 +- test/core/dispatch-test.js | 2 +- test/core/ease-test.js | 2 +- test/core/entries-test.js | 2 +- test/core/extent-test.js | 2 +- test/core/format-test.js | 2 +- test/core/formatPrefix-test.js | 2 +- test/core/functor-test.js | 2 +- test/core/hcl-test.js | 2 +- test/core/hsl-test.js | 2 +- test/core/html-test.js | 2 +- test/core/interpolate-test.js | 2 +- test/core/json-test.js | 2 +- test/core/keys-test.js | 2 +- test/core/lab-test.js | 2 +- test/core/map-test.js | 2 +- test/core/max-test.js | 2 +- test/core/mean-test.js | 2 +- test/core/median-test.js | 2 +- test/core/merge-test.js | 2 +- test/core/min-test.js | 2 +- test/core/nest-test.js | 2 +- test/core/ns-test.js | 2 +- test/core/permute-test.js | 2 +- test/core/quantile-test.js | 2 +- test/core/random-test.js | 2 +- test/core/range-test.js | 2 +- test/core/rebind-test.js | 2 +- test/core/requote-test.js | 2 +- test/core/rgb-test.js | 2 +- test/core/round-test.js | 2 +- test/core/select-test.js | 2 +- test/core/selectAll-test.js | 2 +- test/core/selection-append-test.js | 2 +- test/core/selection-attr-test.js | 2 +- test/core/selection-call-test.js | 2 +- test/core/selection-classed-test.js | 2 +- test/core/selection-data-test.js | 2 +- test/core/selection-datum-test.js | 2 +- test/core/selection-each-test.js | 2 +- test/core/selection-empty-test.js | 2 +- test/core/selection-enter-test.js | 2 +- test/core/selection-filter-test.js | 2 +- test/core/selection-html-test.js | 2 +- test/core/selection-insert-test.js | 2 +- test/core/selection-node-test.js | 2 +- test/core/selection-on-test.js | 2 +- test/core/selection-order-test.js | 2 +- test/core/selection-property-test.js | 2 +- test/core/selection-remove-test.js | 2 +- test/core/selection-select-test.js | 2 +- test/core/selection-selectAll-test.js | 2 +- test/core/selection-sort-test.js | 2 +- test/core/selection-style-test.js | 2 +- test/core/selection-test.js | 2 +- test/core/selection-text-test.js | 2 +- test/core/sum-test.js | 2 +- test/core/text-test.js | 2 +- test/core/timer-test.js | 2 +- test/core/transition-test-attr.js | 2 +- test/core/transition-test-attrTween.js | 2 +- test/core/transition-test-call.js | 2 +- test/core/transition-test-delay.js | 2 +- test/core/transition-test-duration.js | 2 +- test/core/transition-test-each.js | 2 +- test/core/transition-test-filter.js | 2 +- test/core/transition-test-id.js | 2 +- test/core/transition-test-remove.js | 2 +- test/core/transition-test-select.js | 2 +- test/core/transition-test-selectAll.js | 2 +- test/core/transition-test-style.js | 2 +- test/core/transition-test-styleTween.js | 2 +- test/core/transition-test-text.js | 2 +- test/core/transition-test-time.js | 2 +- test/core/transition-test-transition.js | 2 +- test/core/transition-test-tween.js | 2 +- test/core/transition-test.js | 2 +- test/core/transpose-test.js | 2 +- test/core/values-test.js | 2 +- test/core/version-test.js | 2 +- test/core/xhr-test.js | 2 +- test/core/xml-test.js | 2 +- test/core/zip-test.js | 2 +- test/dsv/csv-test.js | 2 +- test/dsv/tsv-test.js | 2 +- test/env-assert.js | 2 ++ test/env.js | 1 - test/geo/albers-test.js | 2 +- test/geo/area-test.js | 2 +- test/geo/azimuthal-equal-area-test.js | 2 +- test/geo/azimuthal-equidistant-test.js | 2 +- test/geo/bounds-test.js | 2 +- test/geo/centroid-test.js | 2 +- test/geo/circle-test.js | 2 +- test/geo/equirectangular-test.js | 2 +- test/geo/gnomonic-test.js | 2 +- test/geo/graticule-test.js | 2 +- test/geo/greatArc-test.js | 2 +- test/geo/interpolate-test.js | 2 +- test/geo/mercator-test.js | 2 +- test/geo/orthographic-test.js | 2 +- test/geo/path-test.js | 2 +- test/geo/projection-test.js | 2 +- test/geo/stereographic-test.js | 2 +- test/geo/stream-test.js | 2 +- test/geom/polygon-test.js | 2 +- test/geom/quadtree-test.js | 2 +- test/geom/voronoi-test.js | 2 +- test/layout/cluster-test.js | 2 +- test/layout/force-test.js | 2 +- test/layout/hierarchy-test.js | 2 +- test/layout/histogram-test.js | 2 +- test/layout/pack-test.js | 2 +- test/layout/partition-test.js | 2 +- test/layout/pie-test.js | 2 +- test/layout/tree-test.js | 2 +- test/layout/treemap-test.js | 2 +- test/scale/category-test.js | 2 +- test/scale/identity-test.js | 2 +- test/scale/linear-test.js | 2 +- test/scale/log-test.js | 2 +- test/scale/ordinal-test.js | 2 +- test/scale/pow-test.js | 2 +- test/scale/quantile-test.js | 2 +- test/scale/quantize-test.js | 2 +- test/scale/sqrt-test.js | 2 +- test/scale/threshold-test.js | 2 +- test/svg/arc-test.js | 2 +- test/svg/area-radial-test.js | 2 +- test/svg/area-test.js | 2 +- test/svg/axis-test.js | 2 +- test/svg/brush-test.js | 2 +- test/svg/line-radial-test.js | 2 +- test/svg/line-test.js | 2 +- test/svg/symbol-test.js | 2 +- test/time/day-test.js | 2 +- test/time/dayOfYear-test.js | 2 +- test/time/days-test.js | 2 +- test/time/format-test.js | 2 +- test/time/hour-test.js | 2 +- test/time/hours-test.js | 2 +- test/time/minute-test.js | 2 +- test/time/minutes-test.js | 2 +- test/time/month-test.js | 2 +- test/time/months-test.js | 2 +- test/time/scale-test.js | 2 +- test/time/second-test.js | 2 +- test/time/seconds-test.js | 2 +- test/time/week-test.js | 2 +- test/time/weeks-test.js | 2 +- test/time/year-test.js | 2 +- test/time/years-test.js | 2 +- 154 files changed, 154 insertions(+), 153 deletions(-) diff --git a/test/core/ascending-test.js b/test/core/ascending-test.js index 20f16412..b1ddd89c 100644 --- a/test/core/ascending-test.js +++ b/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"); diff --git a/test/core/bisect-test.js b/test/core/bisect-test.js index 2619161d..745d6264 100644 --- a/test/core/bisect-test.js +++ b/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"); diff --git a/test/core/descending-test.js b/test/core/descending-test.js index 880936ec..1106aaf3 100644 --- a/test/core/descending-test.js +++ b/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"); diff --git a/test/core/dispatch-test.js b/test/core/dispatch-test.js index 4be37cc1..7fe5a273 100644 --- a/test/core/dispatch-test.js +++ b/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"); diff --git a/test/core/ease-test.js b/test/core/ease-test.js index dd92b97a..9f7409a2 100644 --- a/test/core/ease-test.js +++ b/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"); diff --git a/test/core/entries-test.js b/test/core/entries-test.js index 8570456d..128ddb7b 100644 --- a/test/core/entries-test.js +++ b/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"); diff --git a/test/core/extent-test.js b/test/core/extent-test.js index 53a5aab2..d0d17c71 100644 --- a/test/core/extent-test.js +++ b/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"); diff --git a/test/core/format-test.js b/test/core/format-test.js index 8f650fdb..e2dc34c8 100644 --- a/test/core/format-test.js +++ b/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"); diff --git a/test/core/formatPrefix-test.js b/test/core/formatPrefix-test.js index 97f0a68d..0337bbe5 100644 --- a/test/core/formatPrefix-test.js +++ b/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"); diff --git a/test/core/functor-test.js b/test/core/functor-test.js index 62b96a26..596a100c 100644 --- a/test/core/functor-test.js +++ b/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"); diff --git a/test/core/hcl-test.js b/test/core/hcl-test.js index 02b57593..e7958c74 100644 --- a/test/core/hcl-test.js +++ b/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"); diff --git a/test/core/hsl-test.js b/test/core/hsl-test.js index 28c597fd..004020e2 100644 --- a/test/core/hsl-test.js +++ b/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"); diff --git a/test/core/html-test.js b/test/core/html-test.js index fe5586b9..a7e4d443 100644 --- a/test/core/html-test.js +++ b/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"); diff --git a/test/core/interpolate-test.js b/test/core/interpolate-test.js index 81aae76a..3bd9c555 100644 --- a/test/core/interpolate-test.js +++ b/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"); diff --git a/test/core/json-test.js b/test/core/json-test.js index b2334860..f62f16bb 100644 --- a/test/core/json-test.js +++ b/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"); diff --git a/test/core/keys-test.js b/test/core/keys-test.js index 4576b85a..03654252 100644 --- a/test/core/keys-test.js +++ b/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"); diff --git a/test/core/lab-test.js b/test/core/lab-test.js index 32701396..5f4cdc32 100644 --- a/test/core/lab-test.js +++ b/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"); diff --git a/test/core/map-test.js b/test/core/map-test.js index aa729a6a..f4ba3d2e 100644 --- a/test/core/map-test.js +++ b/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"); diff --git a/test/core/max-test.js b/test/core/max-test.js index 4f3eaefa..d1605403 100644 --- a/test/core/max-test.js +++ b/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"); diff --git a/test/core/mean-test.js b/test/core/mean-test.js index 827e0bc7..29f54823 100644 --- a/test/core/mean-test.js +++ b/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"); diff --git a/test/core/median-test.js b/test/core/median-test.js index e543e304..2c067ed2 100644 --- a/test/core/median-test.js +++ b/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"); diff --git a/test/core/merge-test.js b/test/core/merge-test.js index 51768192..d4ca9020 100644 --- a/test/core/merge-test.js +++ b/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"); diff --git a/test/core/min-test.js b/test/core/min-test.js index fcf21127..2acdf1bc 100644 --- a/test/core/min-test.js +++ b/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"); diff --git a/test/core/nest-test.js b/test/core/nest-test.js index 59b8da9f..80cb26e6 100644 --- a/test/core/nest-test.js +++ b/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"); diff --git a/test/core/ns-test.js b/test/core/ns-test.js index 653990ab..58c3d133 100644 --- a/test/core/ns-test.js +++ b/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"); diff --git a/test/core/permute-test.js b/test/core/permute-test.js index 90ad5fd9..64c095d0 100644 --- a/test/core/permute-test.js +++ b/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"); diff --git a/test/core/quantile-test.js b/test/core/quantile-test.js index 7c969dbf..d8324e7b 100644 --- a/test/core/quantile-test.js +++ b/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"); diff --git a/test/core/random-test.js b/test/core/random-test.js index eeb63322..aeb0a012 100644 --- a/test/core/random-test.js +++ b/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"); diff --git a/test/core/range-test.js b/test/core/range-test.js index 18b4aa85..eb831505 100644 --- a/test/core/range-test.js +++ b/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"); diff --git a/test/core/rebind-test.js b/test/core/rebind-test.js index 81d4de54..ffa38a6d 100644 --- a/test/core/rebind-test.js +++ b/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"); diff --git a/test/core/requote-test.js b/test/core/requote-test.js index 86fdff65..6201a753 100644 --- a/test/core/requote-test.js +++ b/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"); diff --git a/test/core/rgb-test.js b/test/core/rgb-test.js index dbc32c24..89d3ca17 100644 --- a/test/core/rgb-test.js +++ b/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"); diff --git a/test/core/round-test.js b/test/core/round-test.js index 43d347c0..6ee6fac9 100644 --- a/test/core/round-test.js +++ b/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"); diff --git a/test/core/select-test.js b/test/core/select-test.js index 924ceac2..f9d9bb27 100644 --- a/test/core/select-test.js +++ b/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"); diff --git a/test/core/selectAll-test.js b/test/core/selectAll-test.js index 9ac4646d..03974eaf 100644 --- a/test/core/selectAll-test.js +++ b/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"); diff --git a/test/core/selection-append-test.js b/test/core/selection-append-test.js index 8565be43..f172d2d0 100644 --- a/test/core/selection-append-test.js +++ b/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"); diff --git a/test/core/selection-attr-test.js b/test/core/selection-attr-test.js index c08baea2..a5dbaabe 100644 --- a/test/core/selection-attr-test.js +++ b/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"); diff --git a/test/core/selection-call-test.js b/test/core/selection-call-test.js index e5fd2590..bd013705 100644 --- a/test/core/selection-call-test.js +++ b/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"); diff --git a/test/core/selection-classed-test.js b/test/core/selection-classed-test.js index 3317a41f..74368593 100644 --- a/test/core/selection-classed-test.js +++ b/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"); diff --git a/test/core/selection-data-test.js b/test/core/selection-data-test.js index 5d393211..67325f7b 100644 --- a/test/core/selection-data-test.js +++ b/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"); diff --git a/test/core/selection-datum-test.js b/test/core/selection-datum-test.js index 610f112a..0eab41dd 100644 --- a/test/core/selection-datum-test.js +++ b/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"); diff --git a/test/core/selection-each-test.js b/test/core/selection-each-test.js index 2d54e679..9b7cefe2 100644 --- a/test/core/selection-each-test.js +++ b/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"); diff --git a/test/core/selection-empty-test.js b/test/core/selection-empty-test.js index 57aba37a..8a9cb0fb 100644 --- a/test/core/selection-empty-test.js +++ b/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"); diff --git a/test/core/selection-enter-test.js b/test/core/selection-enter-test.js index 25758350..fd1212c6 100644 --- a/test/core/selection-enter-test.js +++ b/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"); diff --git a/test/core/selection-filter-test.js b/test/core/selection-filter-test.js index 3291f050..355b7ad8 100644 --- a/test/core/selection-filter-test.js +++ b/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"); diff --git a/test/core/selection-html-test.js b/test/core/selection-html-test.js index 9425273f..1ed2a14d 100644 --- a/test/core/selection-html-test.js +++ b/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"); diff --git a/test/core/selection-insert-test.js b/test/core/selection-insert-test.js index cf0c27a7..8a99003a 100644 --- a/test/core/selection-insert-test.js +++ b/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"); diff --git a/test/core/selection-node-test.js b/test/core/selection-node-test.js index da7ec618..f5e18e39 100644 --- a/test/core/selection-node-test.js +++ b/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"); diff --git a/test/core/selection-on-test.js b/test/core/selection-on-test.js index 6c114c6c..95e24a17 100644 --- a/test/core/selection-on-test.js +++ b/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"); diff --git a/test/core/selection-order-test.js b/test/core/selection-order-test.js index 7ef6ed30..407eaf45 100644 --- a/test/core/selection-order-test.js +++ b/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"); diff --git a/test/core/selection-property-test.js b/test/core/selection-property-test.js index 9a4eff6d..2da8fddd 100644 --- a/test/core/selection-property-test.js +++ b/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"); diff --git a/test/core/selection-remove-test.js b/test/core/selection-remove-test.js index 2d362ebd..fcb469b7 100644 --- a/test/core/selection-remove-test.js +++ b/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"); diff --git a/test/core/selection-select-test.js b/test/core/selection-select-test.js index 7b771432..2980e399 100644 --- a/test/core/selection-select-test.js +++ b/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"); diff --git a/test/core/selection-selectAll-test.js b/test/core/selection-selectAll-test.js index 90129c02..60830b95 100644 --- a/test/core/selection-selectAll-test.js +++ b/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"); diff --git a/test/core/selection-sort-test.js b/test/core/selection-sort-test.js index eda88a07..fbfcb258 100644 --- a/test/core/selection-sort-test.js +++ b/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"); diff --git a/test/core/selection-style-test.js b/test/core/selection-style-test.js index 73e20671..4c7fcf4b 100644 --- a/test/core/selection-style-test.js +++ b/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"); diff --git a/test/core/selection-test.js b/test/core/selection-test.js index 5a747e48..5b51737c 100644 --- a/test/core/selection-test.js +++ b/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"); diff --git a/test/core/selection-text-test.js b/test/core/selection-text-test.js index 687924ae..1df4ddbe 100644 --- a/test/core/selection-text-test.js +++ b/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"); diff --git a/test/core/sum-test.js b/test/core/sum-test.js index 2d358bce..e71bd6a1 100644 --- a/test/core/sum-test.js +++ b/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"); diff --git a/test/core/text-test.js b/test/core/text-test.js index b4323203..beeabdd2 100644 --- a/test/core/text-test.js +++ b/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"); diff --git a/test/core/timer-test.js b/test/core/timer-test.js index f191a975..8c8bd825 100644 --- a/test/core/timer-test.js +++ b/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"); diff --git a/test/core/transition-test-attr.js b/test/core/transition-test-attr.js index 1738b3e5..36c2e0eb 100644 --- a/test/core/transition-test-attr.js +++ b/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() { diff --git a/test/core/transition-test-attrTween.js b/test/core/transition-test-attrTween.js index 617c6013..b715970a 100644 --- a/test/core/transition-test-attrTween.js +++ b/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() { diff --git a/test/core/transition-test-call.js b/test/core/transition-test-call.js index 3bc8d416..c2b8f0cd 100644 --- a/test/core/transition-test-call.js +++ b/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() { diff --git a/test/core/transition-test-delay.js b/test/core/transition-test-delay.js index 34be6e00..cd753e43 100644 --- a/test/core/transition-test-delay.js +++ b/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() { diff --git a/test/core/transition-test-duration.js b/test/core/transition-test-duration.js index d6a9798a..e8be3e20 100644 --- a/test/core/transition-test-duration.js +++ b/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() { diff --git a/test/core/transition-test-each.js b/test/core/transition-test-each.js index a5b0c8d2..004d39bb 100644 --- a/test/core/transition-test-each.js +++ b/test/core/transition-test-each.js @@ -1,6 +1,6 @@ require("../env"); -var assert = require("assert"); +var assert = require("../env-assert"); module.exports = { "start": { diff --git a/test/core/transition-test-filter.js b/test/core/transition-test-filter.js index c18832a9..57ddddd3 100644 --- a/test/core/transition-test-filter.js +++ b/test/core/transition-test-filter.js @@ -1,6 +1,6 @@ require("../env"); -var assert = require("assert"); +var assert = require("../env-assert"); var datum = {}; diff --git a/test/core/transition-test-id.js b/test/core/transition-test-id.js index 100fbc75..3e4afb50 100644 --- a/test/core/transition-test-id.js +++ b/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() { diff --git a/test/core/transition-test-remove.js b/test/core/transition-test-remove.js index e283e55b..44687b6f 100644 --- a/test/core/transition-test-remove.js +++ b/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() { diff --git a/test/core/transition-test-select.js b/test/core/transition-test-select.js index fce5f151..121c2591 100644 --- a/test/core/transition-test-select.js +++ b/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() { diff --git a/test/core/transition-test-selectAll.js b/test/core/transition-test-selectAll.js index 3ea650bd..37e21298 100644 --- a/test/core/transition-test-selectAll.js +++ b/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() { diff --git a/test/core/transition-test-style.js b/test/core/transition-test-style.js index 78bdc33d..e8bcbad6 100644 --- a/test/core/transition-test-style.js +++ b/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() { diff --git a/test/core/transition-test-styleTween.js b/test/core/transition-test-styleTween.js index 80b97d26..e0147a61 100644 --- a/test/core/transition-test-styleTween.js +++ b/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() { diff --git a/test/core/transition-test-text.js b/test/core/transition-test-text.js index e0cc48f4..81c4a42d 100644 --- a/test/core/transition-test-text.js +++ b/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() { diff --git a/test/core/transition-test-time.js b/test/core/transition-test-time.js index b83b1fba..10213d58 100644 --- a/test/core/transition-test-time.js +++ b/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() { diff --git a/test/core/transition-test-transition.js b/test/core/transition-test-transition.js index eaf4be1e..32c27832 100644 --- a/test/core/transition-test-transition.js +++ b/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() { diff --git a/test/core/transition-test-tween.js b/test/core/transition-test-tween.js index 6ffc0b1f..df620b67 100644 --- a/test/core/transition-test-tween.js +++ b/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() { diff --git a/test/core/transition-test.js b/test/core/transition-test.js index 54ab3128..6929375d 100644 --- a/test/core/transition-test.js +++ b/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"); diff --git a/test/core/transpose-test.js b/test/core/transpose-test.js index 5ed83989..00f3cb0d 100644 --- a/test/core/transpose-test.js +++ b/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"); diff --git a/test/core/values-test.js b/test/core/values-test.js index ec0cc8e0..01af2ae9 100644 --- a/test/core/values-test.js +++ b/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"); diff --git a/test/core/version-test.js b/test/core/version-test.js index 3a152b5e..e0e60e83 100644 --- a/test/core/version-test.js +++ b/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"); diff --git a/test/core/xhr-test.js b/test/core/xhr-test.js index b6eb3ee1..56bd1b88 100644 --- a/test/core/xhr-test.js +++ b/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"); diff --git a/test/core/xml-test.js b/test/core/xml-test.js index 2e3e745d..97b02936 100644 --- a/test/core/xml-test.js +++ b/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"); diff --git a/test/core/zip-test.js b/test/core/zip-test.js index 5b852462..6584f9d6 100644 --- a/test/core/zip-test.js +++ b/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"); diff --git a/test/dsv/csv-test.js b/test/dsv/csv-test.js index b258ce74..218e4114 100644 --- a/test/dsv/csv-test.js +++ b/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"); diff --git a/test/dsv/tsv-test.js b/test/dsv/tsv-test.js index ea88691c..55eea9bc 100644 --- a/test/dsv/tsv-test.js +++ b/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"); diff --git a/test/env-assert.js b/test/env-assert.js index 3133fd78..4147c5ae 100644 --- a/test/env-assert.js +++ b/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); diff --git a/test/env.js b/test/env.js index 1d1eb29c..824b8b9d 100644 --- a/test/env.js +++ b/test/env.js @@ -2,7 +2,6 @@ process.env.TZ = "America/Los_Angeles"; require("../globals"); -require("./env-assert"); require("./env-xhr"); require("./env-fragment"); diff --git a/test/geo/albers-test.js b/test/geo/albers-test.js index 1f0aafb9..f32d4e46 100644 --- a/test/geo/albers-test.js +++ b/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"); diff --git a/test/geo/area-test.js b/test/geo/area-test.js index a5c26147..955db4ed 100644 --- a/test/geo/area-test.js +++ b/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"); diff --git a/test/geo/azimuthal-equal-area-test.js b/test/geo/azimuthal-equal-area-test.js index 9ddaed25..03079636 100644 --- a/test/geo/azimuthal-equal-area-test.js +++ b/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"); diff --git a/test/geo/azimuthal-equidistant-test.js b/test/geo/azimuthal-equidistant-test.js index fe75beb5..4e029743 100644 --- a/test/geo/azimuthal-equidistant-test.js +++ b/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"); diff --git a/test/geo/bounds-test.js b/test/geo/bounds-test.js index 3f6a027d..69095dee 100644 --- a/test/geo/bounds-test.js +++ b/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"); diff --git a/test/geo/centroid-test.js b/test/geo/centroid-test.js index 017a911b..a134c927 100644 --- a/test/geo/centroid-test.js +++ b/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"); diff --git a/test/geo/circle-test.js b/test/geo/circle-test.js index 1891bc4c..ac5edf57 100644 --- a/test/geo/circle-test.js +++ b/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"); diff --git a/test/geo/equirectangular-test.js b/test/geo/equirectangular-test.js index 42db10f6..17dabf71 100644 --- a/test/geo/equirectangular-test.js +++ b/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"); diff --git a/test/geo/gnomonic-test.js b/test/geo/gnomonic-test.js index b3214495..0adafaf7 100644 --- a/test/geo/gnomonic-test.js +++ b/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"); diff --git a/test/geo/graticule-test.js b/test/geo/graticule-test.js index b9f1455a..5b79e49a 100644 --- a/test/geo/graticule-test.js +++ b/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"); diff --git a/test/geo/greatArc-test.js b/test/geo/greatArc-test.js index 115446be..903c4f6f 100644 --- a/test/geo/greatArc-test.js +++ b/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"); diff --git a/test/geo/interpolate-test.js b/test/geo/interpolate-test.js index 265e99f1..24fb71f2 100644 --- a/test/geo/interpolate-test.js +++ b/test/geo/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.geo.interpolate"); diff --git a/test/geo/mercator-test.js b/test/geo/mercator-test.js index 05c8ee4b..6d31fcda 100644 --- a/test/geo/mercator-test.js +++ b/test/geo/mercator-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.mercator"); diff --git a/test/geo/orthographic-test.js b/test/geo/orthographic-test.js index d5b07b9e..520b2d5e 100644 --- a/test/geo/orthographic-test.js +++ b/test/geo/orthographic-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.orthographic"); diff --git a/test/geo/path-test.js b/test/geo/path-test.js index c546e555..d51544f6 100644 --- a/test/geo/path-test.js +++ b/test/geo/path-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.path"); diff --git a/test/geo/projection-test.js b/test/geo/projection-test.js index 3875d1a3..8fe9be75 100644 --- a/test/geo/projection-test.js +++ b/test/geo/projection-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.projection"); diff --git a/test/geo/stereographic-test.js b/test/geo/stereographic-test.js index 4fb17dd8..17cff4ae 100644 --- a/test/geo/stereographic-test.js +++ b/test/geo/stereographic-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.stereographic"); diff --git a/test/geo/stream-test.js b/test/geo/stream-test.js index d0db3fb5..5bdbc475 100644 --- a/test/geo/stream-test.js +++ b/test/geo/stream-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.stream"); diff --git a/test/geom/polygon-test.js b/test/geom/polygon-test.js index 2e5963f2..9da99c81 100644 --- a/test/geom/polygon-test.js +++ b/test/geom/polygon-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.geom.polygon"); diff --git a/test/geom/quadtree-test.js b/test/geom/quadtree-test.js index b76c8561..02643142 100644 --- a/test/geom/quadtree-test.js +++ b/test/geom/quadtree-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.geom.quadtree"); diff --git a/test/geom/voronoi-test.js b/test/geom/voronoi-test.js index 8aae1ad5..b3e8a1d2 100644 --- a/test/geom/voronoi-test.js +++ b/test/geom/voronoi-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.geom.voronoi"); diff --git a/test/layout/cluster-test.js b/test/layout/cluster-test.js index dd3d36a1..ac1f25ab 100644 --- a/test/layout/cluster-test.js +++ b/test/layout/cluster-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.layout.cluster"); diff --git a/test/layout/force-test.js b/test/layout/force-test.js index f911cc1b..0180e76a 100644 --- a/test/layout/force-test.js +++ b/test/layout/force-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.layout.force"); diff --git a/test/layout/hierarchy-test.js b/test/layout/hierarchy-test.js index 9680a81f..62fc185e 100644 --- a/test/layout/hierarchy-test.js +++ b/test/layout/hierarchy-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.layout.hierarchy"); diff --git a/test/layout/histogram-test.js b/test/layout/histogram-test.js index ee928556..a3415395 100644 --- a/test/layout/histogram-test.js +++ b/test/layout/histogram-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.layout.histogram"); diff --git a/test/layout/pack-test.js b/test/layout/pack-test.js index f30898e0..d362134b 100644 --- a/test/layout/pack-test.js +++ b/test/layout/pack-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.layout.pack"); diff --git a/test/layout/partition-test.js b/test/layout/partition-test.js index efdcccc5..b18d0e68 100644 --- a/test/layout/partition-test.js +++ b/test/layout/partition-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.layout.partition"); diff --git a/test/layout/pie-test.js b/test/layout/pie-test.js index b6de0694..b1403c22 100644 --- a/test/layout/pie-test.js +++ b/test/layout/pie-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.layout.pie"); diff --git a/test/layout/tree-test.js b/test/layout/tree-test.js index ad4c14b9..bdbadd76 100644 --- a/test/layout/tree-test.js +++ b/test/layout/tree-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.layout.tree"); diff --git a/test/layout/treemap-test.js b/test/layout/treemap-test.js index 01eadcfd..aed07b33 100644 --- a/test/layout/treemap-test.js +++ b/test/layout/treemap-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.layout.treemap"); diff --git a/test/scale/category-test.js b/test/scale/category-test.js index a07d5424..22c4fe80 100644 --- a/test/scale/category-test.js +++ b/test/scale/category-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.scale.category"); diff --git a/test/scale/identity-test.js b/test/scale/identity-test.js index 866cba14..c6eedb1b 100644 --- a/test/scale/identity-test.js +++ b/test/scale/identity-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.scale.identity"); diff --git a/test/scale/linear-test.js b/test/scale/linear-test.js index ef20aa5c..b29366a5 100644 --- a/test/scale/linear-test.js +++ b/test/scale/linear-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.scale.linear"); diff --git a/test/scale/log-test.js b/test/scale/log-test.js index ed877238..06466ae5 100644 --- a/test/scale/log-test.js +++ b/test/scale/log-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.scale.log"); diff --git a/test/scale/ordinal-test.js b/test/scale/ordinal-test.js index 8b1ddee3..0304cf60 100644 --- a/test/scale/ordinal-test.js +++ b/test/scale/ordinal-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.scale.ordinal"); diff --git a/test/scale/pow-test.js b/test/scale/pow-test.js index a39694f6..8852593c 100644 --- a/test/scale/pow-test.js +++ b/test/scale/pow-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.scale.pow"); diff --git a/test/scale/quantile-test.js b/test/scale/quantile-test.js index c4d94361..6bf1b0e4 100644 --- a/test/scale/quantile-test.js +++ b/test/scale/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.scale.quantile"); diff --git a/test/scale/quantize-test.js b/test/scale/quantize-test.js index 8ab71481..66f08717 100644 --- a/test/scale/quantize-test.js +++ b/test/scale/quantize-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.scale.quantize"); diff --git a/test/scale/sqrt-test.js b/test/scale/sqrt-test.js index d783921d..645ee4aa 100644 --- a/test/scale/sqrt-test.js +++ b/test/scale/sqrt-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.scale.sqrt"); diff --git a/test/scale/threshold-test.js b/test/scale/threshold-test.js index abc6df7f..8317a66b 100644 --- a/test/scale/threshold-test.js +++ b/test/scale/threshold-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.scale.threshold"); diff --git a/test/svg/arc-test.js b/test/svg/arc-test.js index 8fd725d0..dd94114f 100644 --- a/test/svg/arc-test.js +++ b/test/svg/arc-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.svg.arc"); diff --git a/test/svg/area-radial-test.js b/test/svg/area-radial-test.js index 479e4917..e9057a82 100644 --- a/test/svg/area-radial-test.js +++ b/test/svg/area-radial-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.svg.area.radial"); diff --git a/test/svg/area-test.js b/test/svg/area-test.js index d42d9daa..3b11d924 100644 --- a/test/svg/area-test.js +++ b/test/svg/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.svg.area"); diff --git a/test/svg/axis-test.js b/test/svg/axis-test.js index a83a50fe..170e48d7 100644 --- a/test/svg/axis-test.js +++ b/test/svg/axis-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.svg.axis"); diff --git a/test/svg/brush-test.js b/test/svg/brush-test.js index a5545a08..650d3871 100644 --- a/test/svg/brush-test.js +++ b/test/svg/brush-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.svg.brush"); diff --git a/test/svg/line-radial-test.js b/test/svg/line-radial-test.js index 28ceaaec..b9a6c877 100644 --- a/test/svg/line-radial-test.js +++ b/test/svg/line-radial-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.svg.line.radial"); diff --git a/test/svg/line-test.js b/test/svg/line-test.js index 706e22cd..bafd4f77 100644 --- a/test/svg/line-test.js +++ b/test/svg/line-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.svg.line"); diff --git a/test/svg/symbol-test.js b/test/svg/symbol-test.js index fd401b33..711f0b3f 100644 --- a/test/svg/symbol-test.js +++ b/test/svg/symbol-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.svg.symbol"); diff --git a/test/time/day-test.js b/test/time/day-test.js index 391ffdd2..825e493b 100644 --- a/test/time/day-test.js +++ b/test/time/day-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"), + assert = require("../env-assert"), time = require("./time"), local = time.local, utc = time.utc; diff --git a/test/time/dayOfYear-test.js b/test/time/dayOfYear-test.js index 4efaf44b..1e2ef02d 100644 --- a/test/time/dayOfYear-test.js +++ b/test/time/dayOfYear-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"), + assert = require("../env-assert"), time = require("./time"), local = time.local, utc = time.utc; diff --git a/test/time/days-test.js b/test/time/days-test.js index c084428a..8cb506dd 100644 --- a/test/time/days-test.js +++ b/test/time/days-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"), + assert = require("../env-assert"), time = require("./time"), local = time.local, utc = time.utc; diff --git a/test/time/format-test.js b/test/time/format-test.js index c1f26564..d239ab8f 100644 --- a/test/time/format-test.js +++ b/test/time/format-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"), + assert = require("../env-assert"), time = require("./time"), local = time.local, utc = time.utc; diff --git a/test/time/hour-test.js b/test/time/hour-test.js index 17474aba..6cad6838 100644 --- a/test/time/hour-test.js +++ b/test/time/hour-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"), + assert = require("../env-assert"), time = require("./time"), local = time.local, utc = time.utc; diff --git a/test/time/hours-test.js b/test/time/hours-test.js index f30105e6..b3fa6602 100644 --- a/test/time/hours-test.js +++ b/test/time/hours-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"), + assert = require("../env-assert"), time = require("./time"), local = time.local, utc = time.utc; diff --git a/test/time/minute-test.js b/test/time/minute-test.js index 25a532ee..0379b9f5 100644 --- a/test/time/minute-test.js +++ b/test/time/minute-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"), + assert = require("../env-assert"), time = require("./time"), local = time.local, utc = time.utc; diff --git a/test/time/minutes-test.js b/test/time/minutes-test.js index 153a3819..a91613ea 100644 --- a/test/time/minutes-test.js +++ b/test/time/minutes-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"), + assert = require("../env-assert"), time = require("./time"), local = time.local, utc = time.utc; diff --git a/test/time/month-test.js b/test/time/month-test.js index c3d8f5b1..50d9f4fb 100644 --- a/test/time/month-test.js +++ b/test/time/month-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"), + assert = require("../env-assert"), time = require("./time"), local = time.local, utc = time.utc; diff --git a/test/time/months-test.js b/test/time/months-test.js index 70c6f581..bddd8b9e 100644 --- a/test/time/months-test.js +++ b/test/time/months-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"), + assert = require("../env-assert"), time = require("./time"), local = time.local, utc = time.utc; diff --git a/test/time/scale-test.js b/test/time/scale-test.js index aad59799..aab6be24 100644 --- a/test/time/scale-test.js +++ b/test/time/scale-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"), + assert = require("../env-assert"), time = require("./time"), local = time.local, utc = time.utc; diff --git a/test/time/second-test.js b/test/time/second-test.js index 4c10edd5..4ee7d165 100644 --- a/test/time/second-test.js +++ b/test/time/second-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"), + assert = require("../env-assert"), time = require("./time"), local = time.local, utc = time.utc; diff --git a/test/time/seconds-test.js b/test/time/seconds-test.js index a5ba7c7b..5f4fe660 100644 --- a/test/time/seconds-test.js +++ b/test/time/seconds-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"), + assert = require("../env-assert"), time = require("./time"), local = time.local, utc = time.utc; diff --git a/test/time/week-test.js b/test/time/week-test.js index 1e9f5441..5440a94e 100644 --- a/test/time/week-test.js +++ b/test/time/week-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"), + assert = require("../env-assert"), time = require("./time"), local = time.local, utc = time.utc; diff --git a/test/time/weeks-test.js b/test/time/weeks-test.js index 2f9d6af4..ae040cca 100644 --- a/test/time/weeks-test.js +++ b/test/time/weeks-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"), + assert = require("../env-assert"), time = require("./time"), local = time.local, utc = time.utc; diff --git a/test/time/year-test.js b/test/time/year-test.js index 21c322bf..c9fcf21c 100644 --- a/test/time/year-test.js +++ b/test/time/year-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.time.year"); diff --git a/test/time/years-test.js b/test/time/years-test.js index 07303953..920b8622 100644 --- a/test/time/years-test.js +++ b/test/time/years-test.js @@ -1,7 +1,7 @@ require("../env"); var vows = require("vows"), - assert = require("assert"); + assert = require("../env-assert"); var suite = vows.describe("d3.time.years");