From 6169111d84d630dc1d0e77cb7a7cad9e37b0fc62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Rivi=C3=A8re?= Date: Mon, 24 Aug 2020 00:35:18 +0200 Subject: [PATCH] d3 dependencies update tests (they assume a hyphen-minus, but d3-scale@2 can give a unicode minus) --- package.json | 10 ++++---- test/linear-test.js | 9 +++++++ test/log-test.js | 8 +++++++ test/pow-test.js | 9 +++++++ test/tickFormat-test.js | 11 ++++++++- yarn.lock | 52 ++++++++++++++++++++--------------------- 6 files changed, 67 insertions(+), 32 deletions(-) diff --git a/package.json b/package.json index dba20c7..6a397c6 100644 --- a/package.json +++ b/package.json @@ -35,13 +35,13 @@ "sideEffects": false, "dependencies": { "d3-array": "1.2.0 - 2", - "d3-format": "1", - "d3-interpolate": "^1.2.0", - "d3-time": "1", - "d3-time-format": "2" + "d3-format": "1 - 2", + "d3-interpolate": "1.2.0 - 2", + "d3-time": "1 - 2", + "d3-time-format": "2 - 3" }, "devDependencies": { - "d3-color": "1", + "d3-color": "1 - 2", "eslint": "6", "rollup": "1", "rollup-plugin-terser": "5", diff --git a/test/linear-test.js b/test/linear-test.js index 154760d..59b815f 100644 --- a/test/linear-test.js +++ b/test/linear-test.js @@ -1,7 +1,16 @@ var tape = require("tape"), scale = require("../"), + format = require("d3-format"), roundEpsilon = require("./roundEpsilon"); +format.formatDefaultLocale({ + decimal: ".", + thousands: ",", + grouping: [3], + currency: ["$", ""], + minus: "-" +}); + tape("scaleLinear() has the expected defaults", function(test) { var s = scale.scaleLinear(); test.deepEqual(s.domain(), [0, 1]); diff --git a/test/log-test.js b/test/log-test.js index 4f03e95..0e6fa16 100644 --- a/test/log-test.js +++ b/test/log-test.js @@ -6,6 +6,14 @@ var tape = require("tape"), require("./inDelta"); +format.formatDefaultLocale({ + decimal: ".", + thousands: ",", + grouping: [3], + currency: ["$", ""], + minus: "-" +}); + tape("scaleLog() has the expected defaults", function(test) { var x = scale.scaleLog(); test.deepEqual(x.domain(), [1, 10]); diff --git a/test/pow-test.js b/test/pow-test.js index 72f1317..180cd72 100644 --- a/test/pow-test.js +++ b/test/pow-test.js @@ -1,7 +1,16 @@ var tape = require("tape"), scale = require("../"), + format = require("d3-format"), roundEpsilon = require("./roundEpsilon"); +format.formatDefaultLocale({ + decimal: ".", + thousands: ",", + grouping: [3], + currency: ["$", ""], + minus: "-" +}); + require("./inDelta"); tape("scalePow() has the expected defaults", function(test) { diff --git a/test/tickFormat-test.js b/test/tickFormat-test.js index a21c278..5a6d398 100644 --- a/test/tickFormat-test.js +++ b/test/tickFormat-test.js @@ -1,5 +1,14 @@ var tape = require("tape"), - scale = require("../"); + scale = require("../"), + format = require("d3-format"); + +format.formatDefaultLocale({ + decimal: ".", + thousands: ",", + grouping: [3], + currency: ["$", ""], + minus: "-" +}); tape("d3.tickFormat(start, stop, count) returns a format suitable for the ticks", function(test) { test.equal(scale.tickFormat(0, 1, 10)(0.2), "0.2"); diff --git a/yarn.lock b/yarn.lock index d77043e..4eeca42 100644 --- a/yarn.lock +++ b/yarn.lock @@ -169,39 +169,39 @@ cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" -"d3-array@1.2.0 - 2": - version "2.4.0" - resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-2.4.0.tgz#87f8b9ad11088769c82b5ea846bcb1cc9393f242" - integrity sha512-KQ41bAF2BMakf/HdKT865ALd4cgND6VcIztVQZUTt0+BH3RWy6ZYnHghVXf6NFjt2ritLr8H1T8LreAAlfiNcw== +d3-array@2: + version "2.5.1" + resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-2.5.1.tgz#cc785e1c4b560a34b8c77af9e6709bdf3f2ee117" + integrity sha512-cKvAlQZUKhXInw5mosJMtAYsY3dDYwTess/WOFUQTGcr8xV04SZMJs6n6QznsqZC5vJTkvZuCgsH9fo981ysPA== -d3-color@1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.0.tgz#89c45a995ed773b13314f06460df26d60ba0ecaf" - integrity sha512-TzNPeJy2+iEepfiL92LAAB7fvnp/dV2YwANPVHdDWmYMm23qIJBYww3qT8I8C1wXrmrg4UWs7BKc2tKIgyjzHg== +"d3-color@1 - 2", d3-color@2: + version "2.0.0" + resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-2.0.0.tgz#8d625cab42ed9b8f601a1760a389f7ea9189d62e" + integrity sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ== -d3-format@1: - version "1.4.2" - resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.2.tgz#2a8c0ebf500f315981c2110eaaf70b82f472cb2b" - integrity sha512-gco1Ih54PgMsyIXgttLxEhNy/mXxq8+rLnCb5shQk+P5TsiySrwWU5gpB4zen626J4LIwBxHvDChyA8qDm57ww== +d3-format@2: + version "2.0.0" + resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-2.0.0.tgz#a10bcc0f986c372b729ba447382413aabf5b0767" + integrity sha512-Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA== -d3-interpolate@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.4.0.tgz#526e79e2d80daa383f9e0c1c1c7dcc0f0583e987" - integrity sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA== +d3-interpolate@2: + version "2.0.1" + resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-2.0.1.tgz#98be499cfb8a3b94d4ff616900501a64abc91163" + integrity sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ== dependencies: - d3-color "1" + d3-color "1 - 2" -d3-time-format@2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.2.2.tgz#187597ffc6a0f37cb36bb7a1d7167cdc887ecda0" - integrity sha512-pweL2Ri2wqMY+wlW/wpkl8T3CUzKAha8S9nmiQlMABab8r5MJN0PD1V4YyRNVaKQfeh4Z0+VO70TLw6ESVOYzw== +d3-time-format@3: + version "3.0.0" + resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-3.0.0.tgz#df8056c83659e01f20ac5da5fdeae7c08d5f1bb6" + integrity sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag== dependencies: - d3-time "1" + d3-time "1 - 2" -d3-time@1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.1.0.tgz#b1e19d307dae9c900b7e5b25ffc5dcc249a8a0f1" - integrity sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA== +"d3-time@1 - 2", d3-time@2: + version "2.0.0" + resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-2.0.0.tgz#ad7c127d17c67bd57a4c61f3eaecb81108b1e0ab" + integrity sha512-2mvhstTFcMvwStWd9Tj3e6CEqtOivtD8AUiHT8ido/xmzrI9ijrUUihZ6nHuf/vsScRBonagOdj0Vv+SEL5G3Q== debug@^4.0.1: version "4.1.1"