From 01916c805eccac0f1cdf16be3d9a765e4f09d7a6 Mon Sep 17 00:00:00 2001
From: apeltier <26309854+a-peltier@users.noreply.github.com>
Date: Thu, 28 May 2020 22:45:39 +0200
Subject: [PATCH 1/6] Add eslint-plugin-jest and enforce recommended rules
---
.eslintrc | 4 +-
packages/react-vis/package.json | 1 +
.../tests/components/treemap-tests.js | 8 ---
packages/react-vis/tests/test-utils.js | 1 +
yarn.lock | 56 ++++++++++++++++++-
5 files changed, 60 insertions(+), 10 deletions(-)
diff --git a/.eslintrc b/.eslintrc
index c3f618247..64bf74a38 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -2,6 +2,7 @@
"extends": [
"eslint:recommended",
"plugin:react/recommended",
+ "plugin:jest/recommended",
"prettier",
"prettier/react"
],
@@ -10,7 +11,8 @@
"react",
"prettier",
"babel",
- "no-only-tests"
+ "no-only-tests",
+ "jest"
],
"ignorePatterns": [
"node_modules",
diff --git a/packages/react-vis/package.json b/packages/react-vis/package.json
index 2d5d7c789..99af88d90 100644
--- a/packages/react-vis/package.json
+++ b/packages/react-vis/package.json
@@ -70,6 +70,7 @@
"canvas-prebuilt": "^1.6.11",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
+ "eslint-plugin-jest":"^23.13.2",
"jest":"^25.5.4",
"jsdom": "^9.9.1",
"node-sass": "^4.9.3",
diff --git a/packages/react-vis/tests/components/treemap-tests.js b/packages/react-vis/tests/components/treemap-tests.js
index aee52dc40..6c15cd42c 100644
--- a/packages/react-vis/tests/components/treemap-tests.js
+++ b/packages/react-vis/tests/components/treemap-tests.js
@@ -155,14 +155,6 @@ test('Treemap: Hide Root Node', () => {
});
});
-test('Treemap: Empty treemap', () => {
- const $ = mount();
- // 1 is the empty root node
- expect($.find('.rv-treemap__leaf').length).toBe(1);
- expect($.find('.rv-treemap').text()).toBe('');
- expect($.find('div.little-nested-tree-example').length).toBe(1);
-});
-
test('Treemap: SimpleTreemap', () => {
const $ = mount();
[
diff --git a/packages/react-vis/tests/test-utils.js b/packages/react-vis/tests/test-utils.js
index 544077ef8..806953abb 100644
--- a/packages/react-vis/tests/test-utils.js
+++ b/packages/react-vis/tests/test-utils.js
@@ -1,3 +1,4 @@
+/* eslint-disable jest/no-export */
import React from 'react';
import {mount} from 'enzyme';
diff --git a/yarn.lock b/yarn.lock
index 306dc8a9d..8ebf76a63 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1847,6 +1847,11 @@
"@types/istanbul-lib-coverage" "*"
"@types/istanbul-lib-report" "*"
+"@types/json-schema@^7.0.3":
+ version "7.0.4"
+ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
+ integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==
+
"@types/minimatch@*":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@types%2fminimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
@@ -1984,6 +1989,29 @@
dependencies:
"@types/yargs-parser" "*"
+"@typescript-eslint/experimental-utils@^2.5.0":
+ version "2.34.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz#d3524b644cdb40eebceca67f8cf3e4cc9c8f980f"
+ integrity sha512-eS6FTkq+wuMJ+sgtuNTtcqavWXqsflWcfBnlYhg/nS4aZ1leewkXGbvBhaapn1q6qf4M71bsR1tez5JTRMuqwA==
+ dependencies:
+ "@types/json-schema" "^7.0.3"
+ "@typescript-eslint/typescript-estree" "2.34.0"
+ eslint-scope "^5.0.0"
+ eslint-utils "^2.0.0"
+
+"@typescript-eslint/typescript-estree@2.34.0":
+ version "2.34.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz#14aeb6353b39ef0732cc7f1b8285294937cf37d5"
+ integrity sha512-OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg==
+ dependencies:
+ debug "^4.1.1"
+ eslint-visitor-keys "^1.1.0"
+ glob "^7.1.6"
+ is-glob "^4.0.1"
+ lodash "^4.17.15"
+ semver "^7.3.2"
+ tsutils "^3.17.1"
+
"@webassemblyjs/ast@1.9.0":
version "1.9.0"
resolved "https://registry.yarnpkg.com/@webassemblyjs%2fast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
@@ -6553,6 +6581,13 @@ eslint-plugin-babel@^5.3.0:
dependencies:
eslint-rule-composer "^0.3.0"
+eslint-plugin-jest@^23.13.2:
+ version "23.13.2"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.13.2.tgz#7b7993b4e09be708c696b02555083ddefd7e4cc7"
+ integrity sha512-qZit+moTXTyZFNDqSIR88/L3rdBlTU7CuW6XmyErD2FfHEkdoLgThkRbiQjzgYnX6rfgLx3Ci4eJmF4Ui5v1Cw==
+ dependencies:
+ "@typescript-eslint/experimental-utils" "^2.5.0"
+
eslint-plugin-no-only-tests@^2.4.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-no-only-tests/-/eslint-plugin-no-only-tests-2.4.0.tgz#7d565434aa7d16ccc7eea957c391d98f827332ca"
@@ -6629,6 +6664,13 @@ eslint-utils@^1.4.3:
dependencies:
eslint-visitor-keys "^1.1.0"
+eslint-utils@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz#7be1cc70f27a72a76cd14aa698bcabed6890e1cd"
+ integrity sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==
+ dependencies:
+ eslint-visitor-keys "^1.1.0"
+
eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
@@ -13856,6 +13898,11 @@ semver@^6.0.0, semver@^6.1.2, semver@^6.3.0:
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
integrity sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0=
+semver@^7.3.2:
+ version "7.3.2"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
+ integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
+
semver@~5.3.0:
version "5.3.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -15420,11 +15467,18 @@ ts-pnp@^1.1.2:
resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
integrity sha1-pQCtCEsHmPHDBxrzkeZZEshrypI=
-tslib@^1.10.0, tslib@^1.9.0, tslib@^1.9.3:
+tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
version "1.13.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
integrity sha1-yIHhPMcBWJTtkUhi0nZDb6mkcEM=
+tsutils@^3.17.1:
+ version "3.17.1"
+ resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"
+ integrity sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==
+ dependencies:
+ tslib "^1.8.1"
+
tty-browserify@0.0.0:
version "0.0.0"
resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
From cf674b64bb4c85ab7feac32ba7b1769255499b14 Mon Sep 17 00:00:00 2001
From: apeltier <26309854+a-peltier@users.noreply.github.com>
Date: Thu, 28 May 2020 23:24:05 +0200
Subject: [PATCH 2/6] Add top-level describe block to all tests and enforce
related lint rule
---
.eslintrc | 1 +
.../tests/components/animation-tests.js | 32 +-
.../tests/components/arc-series-tests.js | 14 +-
.../tests/components/area-series-tests.js | 54 +-
.../react-vis/tests/components/axes-tests.js | 212 ++--
.../components/axis-tick-format-tests.js | 88 +-
.../tests/components/axis-title-tests.js | 68 +-
.../tests/components/bar-series-tests.js | 169 ++--
.../tests/components/borders-tests.js | 10 +-
.../components/circular-grid-lines-tests.js | 12 +-
.../tests/components/color-article-tests.js | 166 ++--
.../tests/components/contour-series-tests.js | 14 +-
.../tests/components/crosshair-tests.js | 40 +-
.../components/custom-svg-series-tests.js | 66 +-
.../tests/components/data-article-tests.js | 8 +-
.../tests/components/decorative-axis-tests.js | 36 +-
.../tests/components/gradient-tests.js | 26 +-
.../tests/components/grid-lines-tests.js | 56 +-
.../tests/components/heatmap-tests.js | 66 +-
.../tests/components/hexbin-series-tests.js | 118 +--
.../tests/components/highlight-tests.js | 230 ++---
.../react-vis/tests/components/hints-tests.js | 20 +-
.../components/interaction-article-tests.js | 32 +-
.../tests/components/label-series-tests.js | 38 +-
.../tests/components/legends-tests.js | 232 ++---
.../components/line-series-canvas-test.js | 88 +-
.../tests/components/line-series-tests.js | 332 ++++---
.../components/make-vis-flexible-tests.js | 26 +-
.../tests/components/mark-series-tests.js | 103 +-
.../components/parallel-coordinates-tests.js | 131 +--
.../tests/components/polygon-series-tests.js | 12 +-
.../tests/components/radar-chart-tests.js | 159 +--
.../tests/components/radial-tests.js | 127 +--
.../tests/components/rect-series-tests.js | 31 +-
.../tests/components/sankey-tests.js | 202 ++--
.../tests/components/sunburst-tests.js | 118 +--
.../tests/components/treemap-tests.js | 290 +++---
.../tests/components/voronoi-tests.js | 72 +-
.../tests/components/whisker-series-tests.js | 14 +-
.../tests/components/xy-plot-tests.js | 508 +++++-----
packages/react-vis/tests/test-utils.js | 1 +
.../react-vis/tests/utils/axis-utils-tests.js | 250 ++---
.../tests/utils/chart-utils-tests.js | 38 +-
.../react-vis/tests/utils/data-utils-tests.js | 34 +-
.../tests/utils/react-utils-tests.js | 6 +-
.../tests/utils/scales-utils-tests.js | 939 +++++++++---------
.../tests/utils/series-utils-tests.js | 470 ++++-----
.../tests/utils/styling-utils-tests.js | 54 +-
48 files changed, 2966 insertions(+), 2847 deletions(-)
diff --git a/.eslintrc b/.eslintrc
index 64bf74a38..3adc4006a 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -37,6 +37,7 @@
"object-curly-spacing": 0,
"babel/object-curly-spacing": 2,
"no-only-tests/no-only-tests": 2,
+ "jest/require-top-level-describe":"error",
"react/prop-types": "off",
"prettier/prettier": "warn"
}
diff --git a/packages/react-vis/tests/components/animation-tests.js b/packages/react-vis/tests/components/animation-tests.js
index c9b7302bb..d5a82623c 100644
--- a/packages/react-vis/tests/components/animation-tests.js
+++ b/packages/react-vis/tests/components/animation-tests.js
@@ -27,21 +27,23 @@ import AxisTicks from 'plot/axis/axis-ticks';
import VerticalBarSeries from 'plot/series/vertical-bar-series';
import XYPlot from 'plot/xy-plot';
-test('Animation interpolates xDomain when specified', () => {
- const wrapper = mount(
-
-
-
-
- );
+describe('Animation', () => {
+ test('interpolates xDomain when specified', () => {
+ const wrapper = mount(
+
+
+
+
+ );
- const renderedAnimationWrapper = wrapper.find(Animation);
+ const renderedAnimationWrapper = wrapper.find(Animation);
- expect(renderedAnimationWrapper.find(AxisTicks).prop('xDomain')).toEqual([
- 'Black'
- ]);
+ expect(renderedAnimationWrapper.find(AxisTicks).prop('xDomain')).toEqual([
+ 'Black'
+ ]);
+ });
});
diff --git a/packages/react-vis/tests/components/arc-series-tests.js b/packages/react-vis/tests/components/arc-series-tests.js
index 2953eb721..26cbc3c0b 100644
--- a/packages/react-vis/tests/components/arc-series-tests.js
+++ b/packages/react-vis/tests/components/arc-series-tests.js
@@ -6,10 +6,12 @@ import ArcSeriesExample from '../../../showcase/radial-chart/arc-series-example'
testRenderWithProps(ArcSeries, GENERIC_XYPLOT_SERIES_PROPS);
-test('ArcSeries: Showcase Example - ArcSeriesExample', () => {
- const $ = mount();
- expect($.text()).toBe('UPDATE-4-2024-4-2024');
- // multiplied by two to account for shadow listeners
- expect($.find('.rv-xy-plot__series--arc').length).toBe(4);
- expect($.find('.rv-xy-plot__series--arc path').length).toBe(2 * 8);
+describe('ArcSeries', () => {
+ test('Showcase Example - ArcSeriesExample', () => {
+ const $ = mount();
+ expect($.text()).toBe('UPDATE-4-2024-4-2024');
+ // multiplied by two to account for shadow listeners
+ expect($.find('.rv-xy-plot__series--arc').length).toBe(4);
+ expect($.find('.rv-xy-plot__series--arc path').length).toBe(2 * 8);
+ });
});
diff --git a/packages/react-vis/tests/components/area-series-tests.js b/packages/react-vis/tests/components/area-series-tests.js
index 076eeacf5..993d488e3 100644
--- a/packages/react-vis/tests/components/area-series-tests.js
+++ b/packages/react-vis/tests/components/area-series-tests.js
@@ -19,33 +19,35 @@ const AREA_PROPS = {
]
};
-test('AreaSeries: basic rendering', () => {
- const $ = mount(
-
-
-
- );
- expect($.find('.rv-xy-plot__series').length).toBe(1);
- expect($.find('path.rv-xy-plot__series').length).toBe(1);
- expect($.find('path.area-chart-example').length).toBe(1);
+describe('AreaSeries', () => {
+ test('basic rendering', () => {
+ const $ = mount(
+
+
+
+ );
+ expect($.find('.rv-xy-plot__series').length).toBe(1);
+ expect($.find('path.rv-xy-plot__series').length).toBe(1);
+ expect($.find('path.area-chart-example').length).toBe(1);
- $.setProps({children: });
- expect($.find('.rv-xy-plot__series').length).toBe(0);
- expect($.find('.rv-xy-plot__series path').length).toBe(0);
- expect($.find('.area-chart-example').length).toBe(0);
-});
+ $.setProps({children: });
+ expect($.find('.rv-xy-plot__series').length).toBe(0);
+ expect($.find('.rv-xy-plot__series path').length).toBe(0);
+ expect($.find('.area-chart-example').length).toBe(0);
+ });
-test('AreaSeries: Showcase Example - AreaChart', () => {
- const $ = mount();
- expect($.find('.rv-xy-plot__series').length).toBe(1);
- expect($.find('path.rv-xy-plot__series').length).toBe(1);
- expect($.find('path.area-series-example').length).toBe(1);
-});
+ test('AreaSeries: Showcase Example - AreaChart', () => {
+ const $ = mount();
+ expect($.find('.rv-xy-plot__series').length).toBe(1);
+ expect($.find('path.rv-xy-plot__series').length).toBe(1);
+ expect($.find('path.area-series-example').length).toBe(1);
+ });
-test('AreaSeries: Showcase Example - AreaChartElevated', () => {
- const $ = mount();
- expect($.find('.rv-xy-plot__series').length).toBe(5);
- expect($.find('path.rv-xy-plot__series').length).toBe(3);
- expect($.find('path.area-elevated-series-1').length).toBe(1);
- expect($.find('path.area-elevated-series-2').length).toBe(1);
+ test('AreaSeries: Showcase Example - AreaChartElevated', () => {
+ const $ = mount();
+ expect($.find('.rv-xy-plot__series').length).toBe(5);
+ expect($.find('path.rv-xy-plot__series').length).toBe(3);
+ expect($.find('path.area-elevated-series-1').length).toBe(1);
+ expect($.find('path.area-elevated-series-2').length).toBe(1);
+ });
});
diff --git a/packages/react-vis/tests/components/axes-tests.js b/packages/react-vis/tests/components/axes-tests.js
index 90fc4cbe4..8b1787c5d 100644
--- a/packages/react-vis/tests/components/axes-tests.js
+++ b/packages/react-vis/tests/components/axes-tests.js
@@ -8,110 +8,114 @@ import CustomAxesOrientation from '../../../showcase/axes/custom-axes-orientatio
import AxisWithTurnedLabels from '../../../showcase/plot/axis-with-turned-labels';
import AxisOn0 from '../../../showcase/axes/axis-on-0';
-test('Axis: Showcase Example - CustomAxesOrientation', () => {
- const $ = mount();
- expect($.text()).toBe('1.01.52.02.53.03.54.0X Axis246810Y Axis');
- expect($.find('.rv-xy-plot__series--line').length).toBe(2);
- expect($.find('line').length).toBe(26);
-});
-
-test('Axis: Showcase Example - Custom axis', () => {
- const $ = mount();
- expect($.text()).toBe('1.01.52.03.0X');
- expect($.find('.rv-xy-plot__series--line').length).toBe(1);
- expect($.find('line').length).toBe(15);
-
- const titleStyle = $.find('.rv-xy-plot__axis__title text').prop('style');
- expect(titleStyle.fontSize).toBe('16px');
-});
-
-test('Axis: Showcase Example - Even more Custom axes', () => {
- const $ = mount();
- expect($.text()).toBe(
- '01345XValue is 0Value is 1Value is 2Value is 3Value is 4Value is 501491625cooldogskateboardwowsuchMultilinedogs'
- );
- expect($.find('line').length).toBe(26);
-});
-
-test('Axis: Showcase Example - AxisWithTurnedLabels', () => {
- const $ = mount();
- expect($.text()).toBe('ApplesBananasCranberries02468101214');
- expect($.find('rect').length).toBe(6);
- expect($.find('line').length).toBe(24);
-});
-
-test('Axis: Showcase Example - Padded', () => {
- const $ = mount();
- expect($.find('.rv-xy-plot__series--line').length).toBe(4);
- expect($.find('line').length > 30).toBeTruthy();
-});
-
-test('Axis: axis crosses on 0', () => {
- // vertical axes
- const $0 = mount(
-
- ).render();
-
- const xOfGridlines0 = $0.find('.rv-xy-plot__grid-lines line')[0].attribs.x1;
- const xOfAxisSetOn0 = translateToXY(
- $0.find('.rv-xy-plot__axis.rv-xy-plot__axis--vertical')[0].attribs.transform
- )[0];
-
- expect(xOfGridlines0).toBe(xOfAxisSetOn0);
-
- const $1 = mount(
-
- ).render();
-
- const xOfAxisNotSetOn0 = $1
- .find('.rv-xy-plot__axis.rv-xy-plot__axis--vertical')[0]
- .attribs.transform.replace('translate(', '')
- .split(',')[0];
-
- expect(xOfGridlines0 !== xOfAxisNotSetOn0).toBeTruthy();
-
- // horizontal axes
- const $2 = mount(
-
- ).render();
- const gridlinesY = Number(
- translateToXY($2.find('.rv-xy-plot__grid-lines')[0].attribs.transform)[1]
- );
- const yOfGridlines0 = String(
- gridlinesY + Number($2.find('.rv-xy-plot__grid-lines__line')[0].attribs.y1)
- );
- const yOfAxisSetOn0 = translateToXY(
- $2.find('.rv-xy-plot__axis.rv-xy-plot__axis--horizontal')[0].attribs
- .transform
- )[1];
-
- expect(yOfAxisSetOn0).toBe(yOfGridlines0);
-
- const $3 = mount(
-
- ).render();
-
- const yOfAxisNotSetOn0 = translateToXY(
- $3.find('.rv-xy-plot__axis.rv-xy-plot__axis--horizontal')[0].attribs
- .transform
- )[1];
- expect(yOfAxisNotSetOn0 !== yOfGridlines0).toBeTruthy();
+describe('Axis', () => {
+ test('Showcase Example - CustomAxesOrientation', () => {
+ const $ = mount();
+ expect($.text()).toBe('1.01.52.02.53.03.54.0X Axis246810Y Axis');
+ expect($.find('.rv-xy-plot__series--line').length).toBe(2);
+ expect($.find('line').length).toBe(26);
+ });
+
+ test('Showcase Example - Custom axis', () => {
+ const $ = mount();
+ expect($.text()).toBe('1.01.52.03.0X');
+ expect($.find('.rv-xy-plot__series--line').length).toBe(1);
+ expect($.find('line').length).toBe(15);
+
+ const titleStyle = $.find('.rv-xy-plot__axis__title text').prop('style');
+ expect(titleStyle.fontSize).toBe('16px');
+ });
+
+ test('Showcase Example - Even more Custom axes', () => {
+ const $ = mount();
+ expect($.text()).toBe(
+ '01345XValue is 0Value is 1Value is 2Value is 3Value is 4Value is 501491625cooldogskateboardwowsuchMultilinedogs'
+ );
+ expect($.find('line').length).toBe(26);
+ });
+
+ test('Showcase Example - AxisWithTurnedLabels', () => {
+ const $ = mount();
+ expect($.text()).toBe('ApplesBananasCranberries02468101214');
+ expect($.find('rect').length).toBe(6);
+ expect($.find('line').length).toBe(24);
+ });
+
+ test('Showcase Example - Padded', () => {
+ const $ = mount();
+ expect($.find('.rv-xy-plot__series--line').length).toBe(4);
+ expect($.find('line').length > 30).toBeTruthy();
+ });
+
+ test('axis crosses on 0', () => {
+ // vertical axes
+ const $0 = mount(
+
+ ).render();
+
+ const xOfGridlines0 = $0.find('.rv-xy-plot__grid-lines line')[0].attribs.x1;
+ const xOfAxisSetOn0 = translateToXY(
+ $0.find('.rv-xy-plot__axis.rv-xy-plot__axis--vertical')[0].attribs
+ .transform
+ )[0];
+
+ expect(xOfGridlines0).toBe(xOfAxisSetOn0);
+
+ const $1 = mount(
+
+ ).render();
+
+ const xOfAxisNotSetOn0 = $1
+ .find('.rv-xy-plot__axis.rv-xy-plot__axis--vertical')[0]
+ .attribs.transform.replace('translate(', '')
+ .split(',')[0];
+
+ expect(xOfGridlines0 !== xOfAxisNotSetOn0).toBeTruthy();
+
+ // horizontal axes
+ const $2 = mount(
+
+ ).render();
+ const gridlinesY = Number(
+ translateToXY($2.find('.rv-xy-plot__grid-lines')[0].attribs.transform)[1]
+ );
+ const yOfGridlines0 = String(
+ gridlinesY +
+ Number($2.find('.rv-xy-plot__grid-lines__line')[0].attribs.y1)
+ );
+ const yOfAxisSetOn0 = translateToXY(
+ $2.find('.rv-xy-plot__axis.rv-xy-plot__axis--horizontal')[0].attribs
+ .transform
+ )[1];
+
+ expect(yOfAxisSetOn0).toBe(yOfGridlines0);
+
+ const $3 = mount(
+
+ ).render();
+
+ const yOfAxisNotSetOn0 = translateToXY(
+ $3.find('.rv-xy-plot__axis.rv-xy-plot__axis--horizontal')[0].attribs
+ .transform
+ )[1];
+ expect(yOfAxisNotSetOn0 !== yOfGridlines0).toBeTruthy();
+ });
});
function translateToXY(translate) {
diff --git a/packages/react-vis/tests/components/axis-tick-format-tests.js b/packages/react-vis/tests/components/axis-tick-format-tests.js
index 08ccd72ba..131c8f1be 100644
--- a/packages/react-vis/tests/components/axis-tick-format-tests.js
+++ b/packages/react-vis/tests/components/axis-tick-format-tests.js
@@ -3,46 +3,54 @@ import {mount} from 'enzyme';
import CustomAxisTickElement from '../../../showcase/axes/custom-axis-tick-element';
-test('Axis Format: correctly renders return values from tickFormat', () => {
- const element = mount();
- const ticks = element.find(
- '.rv-xy-plot__axis--horizontal .rv-xy-plot__axis__tick'
- );
- expect(ticks.map(tick => tick.find('text').length)).toEqual([0, 0, 1, 0, 1]);
- expect(
- ticks
- .at(2)
- .find('text')
- .find('tspan').length
- ).toBe(1);
- expect(
- ticks
- .at(4)
- .find('text')
- .text()
- ).toBe('Label');
-});
-
-test('Axis Format: passes props to custom element', () => {
- const CustomLabel = props => {
- expect(Object.keys(props).sort()).toEqual([
- 'containerWidth',
- 'dy',
- 'textAnchor',
- 'tickCount',
- 'transform'
+describe('Axis Format', () => {
+ test('correctly renders return values from tickFormat', () => {
+ const element = mount();
+ const ticks = element.find(
+ '.rv-xy-plot__axis--horizontal .rv-xy-plot__axis__tick'
+ );
+ expect(ticks.map(tick => tick.find('text').length)).toEqual([
+ 0,
+ 0,
+ 1,
+ 0,
+ 1
]);
- return Custom Label;
- };
- const element = mount();
- element.setState({
- data: [...element.state().data, {x: 5, y: 600, label: }]
+ expect(
+ ticks
+ .at(2)
+ .find('text')
+ .find('tspan').length
+ ).toBe(1);
+ expect(
+ ticks
+ .at(4)
+ .find('text')
+ .text()
+ ).toBe('Label');
+ });
+
+ test('passes props to custom element', () => {
+ const CustomLabel = props => {
+ expect(Object.keys(props).sort()).toEqual([
+ 'containerWidth',
+ 'dy',
+ 'textAnchor',
+ 'tickCount',
+ 'transform'
+ ]);
+ return Custom Label;
+ };
+ const element = mount();
+ element.setState({
+ data: [...element.state().data, {x: 5, y: 600, label: }]
+ });
+ expect(
+ element
+ .find('.rv-xy-plot__axis--horizontal .rv-xy-plot__axis__tick')
+ .at(5)
+ .find('text')
+ .text()
+ ).toBe('Custom Label');
});
- expect(
- element
- .find('.rv-xy-plot__axis--horizontal .rv-xy-plot__axis__tick')
- .at(5)
- .find('text')
- .text()
- ).toBe('Custom Label');
});
diff --git a/packages/react-vis/tests/components/axis-title-tests.js b/packages/react-vis/tests/components/axis-title-tests.js
index b36afcf51..6b83119ec 100644
--- a/packages/react-vis/tests/components/axis-title-tests.js
+++ b/packages/react-vis/tests/components/axis-title-tests.js
@@ -11,44 +11,46 @@ const baseProps = {
title: 'Title'
};
-test('AxisTitle: horizontal bottom axis title', () => {
- const props = Object.assign({}, baseProps, {
- orientation: BOTTOM
+describe('AxisTitle', () => {
+ test('horizontal bottom axis title', () => {
+ const props = Object.assign({}, baseProps, {
+ orientation: BOTTOM
+ });
+ const $ = mount();
+ const innerGroupHtml = $.find('g > g').html();
+ expect(innerGroupHtml.includes('text-anchor: end')).toBeTruthy();
+ expect($.find('text').text()).toBe(baseProps.title);
});
- const $ = mount();
- const innerGroupHtml = $.find('g > g').html();
- expect(innerGroupHtml.includes('text-anchor: end')).toBeTruthy();
- expect($.find('text').text()).toBe(baseProps.title);
-});
-test('AxisTitle: horizontal top axis title', () => {
- const props = Object.assign({}, baseProps, {
- orientation: TOP,
- position: 'start'
+ test('horizontal top axis title', () => {
+ const props = Object.assign({}, baseProps, {
+ orientation: TOP,
+ position: 'start'
+ });
+ const $ = mount();
+ const innerGroupHtml = $.find('g > g').html();
+ expect(innerGroupHtml.includes('text-anchor: start')).toBeTruthy();
+ expect($.find('text').text()).toBe(baseProps.title);
});
- const $ = mount();
- const innerGroupHtml = $.find('g > g').html();
- expect(innerGroupHtml.includes('text-anchor: start')).toBeTruthy();
- expect($.find('text').text()).toBe(baseProps.title);
-});
-test('AxisTitle: vertical left title', () => {
- const props = Object.assign({}, baseProps, {
- orientation: LEFT
+ test('vertical left title', () => {
+ const props = Object.assign({}, baseProps, {
+ orientation: LEFT
+ });
+ const $ = mount();
+ const innerGroupHtml = $.find('g > g').html();
+ expect(innerGroupHtml.includes('text-anchor: end')).toBeTruthy();
+ expect($.find('text').text()).toBe(baseProps.title);
});
- const $ = mount();
- const innerGroupHtml = $.find('g > g').html();
- expect(innerGroupHtml.includes('text-anchor: end')).toBeTruthy();
- expect($.find('text').text()).toBe(baseProps.title);
-});
-test('AxisTitle: vertical right title', () => {
- const props = Object.assign({}, baseProps, {
- orientation: RIGHT,
- position: 'start'
+ test('vertical right title', () => {
+ const props = Object.assign({}, baseProps, {
+ orientation: RIGHT,
+ position: 'start'
+ });
+ const $ = mount();
+ const innerGroupHtml = $.find('g > g').html();
+ expect(innerGroupHtml.includes('text-anchor: start')).toBeTruthy();
+ expect($.find('text').text()).toBe(baseProps.title);
});
- const $ = mount();
- const innerGroupHtml = $.find('g > g').html();
- expect(innerGroupHtml.includes('text-anchor: start')).toBeTruthy();
- expect($.find('text').text()).toBe(baseProps.title);
});
diff --git a/packages/react-vis/tests/components/bar-series-tests.js b/packages/react-vis/tests/components/bar-series-tests.js
index 965b34160..319a51ce8 100644
--- a/packages/react-vis/tests/components/bar-series-tests.js
+++ b/packages/react-vis/tests/components/bar-series-tests.js
@@ -11,98 +11,101 @@ import BigBaseBarChart from '../../../showcase/plot/big-base-bar-chart';
import ClusteredStackedVerticalBarChart from '../../../showcase/plot/clustered-stacked-bar-chart';
import DifferenceChart from '../../../showcase/plot/difference-chart';
-testRenderWithProps(HorizontalBarSeries, GENERIC_XYPLOT_SERIES_PROPS);
-testRenderWithProps(VerticalBarSeries, GENERIC_XYPLOT_SERIES_PROPS);
+describe('BarSeries', () => {
+ testRenderWithProps(HorizontalBarSeries, GENERIC_XYPLOT_SERIES_PROPS);
-test('BarSeries: Showcase Example - BarChart', () => {
- const $ = mount();
- expect($.text()).toBe('TOGGLE TO CANVASABC02468101214ABC');
- expect($.find('.rv-xy-plot__series--bar rect').length).toBe(6);
- expect($.find('g.vertical-bar-series-example').length).toBe(1);
+ testRenderWithProps(VerticalBarSeries, GENERIC_XYPLOT_SERIES_PROPS);
- $.find('.showcase-button').simulate('click');
- expect($.find('rect.rv-xy-plot__series--bar').length).toBe(0);
- expect($.find('.rv-xy-canvas canvas').length).toBe(1);
-});
+ test('Showcase Example - BarChart', () => {
+ const $ = mount();
+ expect($.text()).toBe('TOGGLE TO CANVASABC02468101214ABC');
+ expect($.find('.rv-xy-plot__series--bar rect').length).toBe(6);
+ expect($.find('g.vertical-bar-series-example').length).toBe(1);
-test('BarSeries: Showcase Example - StackedHorizontalBarChart & StackedVerticalBarChart', () => {
- [StackedHorizontalBarChart, StackedVerticalBarChart].forEach(
- (Component, i) => {
- const $ = mount();
- const textContent = ['0510152025', '12345'];
- const expectedContent = `TOGGLE TO CANVAS${(i === 1
- ? textContent.reverse()
- : textContent
- ).join('')}`;
- expect($.text()).toBe(expectedContent);
- expect($.find('.rv-xy-plot__series--bar rect').length).toBe(6);
- $.find('.showcase-button').simulate('click');
- expect($.find('.rv-xy-plot__series--bar rect').length).toBe(0);
- expect($.find('.rv-xy-canvas canvas').length).toBe(1);
- }
- );
-});
+ $.find('.showcase-button').simulate('click');
+ expect($.find('rect.rv-xy-plot__series--bar').length).toBe(0);
+ expect($.find('.rv-xy-canvas canvas').length).toBe(1);
+ });
-test('BarSeries: Ordinal Y-Axis HorizontalBarSeries', () => {
- const $ = mount(
-
-
-
- );
- expect($.find('.rv-xy-plot__series--bar rect').length).toBe(3);
- expect(
- $.find('.rv-xy-plot__series--bar rect')
- .at(0)
- .prop('height') > 0
- ).toBe(true);
-});
+ test('Showcase Example - StackedHorizontalBarChart & StackedVerticalBarChart', () => {
+ [StackedHorizontalBarChart, StackedVerticalBarChart].forEach(
+ (Component, i) => {
+ const $ = mount();
+ const textContent = ['0510152025', '12345'];
+ const expectedContent = `TOGGLE TO CANVAS${(i === 1
+ ? textContent.reverse()
+ : textContent
+ ).join('')}`;
+ expect($.text()).toBe(expectedContent);
+ expect($.find('.rv-xy-plot__series--bar rect').length).toBe(6);
+ $.find('.showcase-button').simulate('click');
+ expect($.find('.rv-xy-plot__series--bar rect').length).toBe(0);
+ expect($.find('.rv-xy-canvas canvas').length).toBe(1);
+ }
+ );
+ });
-test('BarSeries: No data', () => {
- const $ = mount(
-
-
-
- );
- expect($.find('.rv-xy-plot__series--bar rect').length).toBe(0);
-});
+ test('Ordinal Y-Axis HorizontalBarSeries', () => {
+ const $ = mount(
+
+
+
+ );
+ expect($.find('.rv-xy-plot__series--bar rect').length).toBe(3);
+ expect(
+ $.find('.rv-xy-plot__series--bar rect')
+ .at(0)
+ .prop('height') > 0
+ ).toBe(true);
+ });
-test('BarSeries: Showcase Example - ClusteredStackedVerticalBarChart', () => {
- const $ = mount();
- expect($.text()).toBe('TOGGLE TO CANVASQ1Q2Q3Q40102030ApplesOranges');
- expect($.find('.rv-xy-plot__series--bar rect').length).toBe(16);
- expect($.find('.rv-xy-plot__series').length).toBe(4);
+ test('No data', () => {
+ const $ = mount(
+
+
+
+ );
+ expect($.find('.rv-xy-plot__series--bar rect').length).toBe(0);
+ });
- $.find('.showcase-button').simulate('click');
- expect($.find('.rv-xy-plot__series--bar rect').length).toBe(0);
- expect($.find('.rv-xy-canvas canvas').length).toBe(1);
-});
+ test('Showcase Example - ClusteredStackedVerticalBarChart', () => {
+ const $ = mount();
+ expect($.text()).toBe('TOGGLE TO CANVASQ1Q2Q3Q40102030ApplesOranges');
+ expect($.find('.rv-xy-plot__series--bar rect').length).toBe(16);
+ expect($.find('.rv-xy-plot__series').length).toBe(4);
-test('BarSeries: Showcase Example - BigBaseBarChart', () => {
- const $ = mount();
- expect($.text()).toBe(
- 'TOGGLE TO CANVAS:38:39:40:41199,800199,900200,000200,100200,200200,300200,400'
- );
- expect($.find('.rv-xy-plot__series--bar rect').length).toBe(15);
- expect($.find('.rv-xy-plot__series').length).toBe(1);
+ $.find('.showcase-button').simulate('click');
+ expect($.find('.rv-xy-plot__series--bar rect').length).toBe(0);
+ expect($.find('.rv-xy-canvas canvas').length).toBe(1);
+ });
- $.find('.showcase-button').simulate('click');
- expect($.find('.rv-xy-plot__series--bar rect').length).toBe(0);
- expect($.find('.rv-xy-canvas canvas').length).toBe(1);
-});
+ test('Showcase Example - BigBaseBarChart', () => {
+ const $ = mount();
+ expect($.text()).toBe(
+ 'TOGGLE TO CANVAS:38:39:40:41199,800199,900200,000200,100200,200200,300200,400'
+ );
+ expect($.find('.rv-xy-plot__series--bar rect').length).toBe(15);
+ expect($.find('.rv-xy-plot__series').length).toBe(1);
+
+ $.find('.showcase-button').simulate('click');
+ expect($.find('.rv-xy-plot__series--bar rect').length).toBe(0);
+ expect($.find('.rv-xy-canvas canvas').length).toBe(1);
+ });
-test('BarSeries: Showcase Example - DifferenceChart', () => {
- const $ = mount();
- expect($.text()).toBe('TOGGLE TO CANVAS02468101214-4-20246810');
- expect($.find('.rv-xy-plot__series--bar rect').length).toBe(15);
- expect($.find('.rv-xy-plot__series').length).toBe(1);
+ test('Showcase Example - DifferenceChart', () => {
+ const $ = mount();
+ expect($.text()).toBe('TOGGLE TO CANVAS02468101214-4-20246810');
+ expect($.find('.rv-xy-plot__series--bar rect').length).toBe(15);
+ expect($.find('.rv-xy-plot__series').length).toBe(1);
- $.find('.showcase-button').simulate('click');
- expect($.find('.rv-xy-plot__series--bar rect').length).toBe(0);
- expect($.find('.rv-xy-canvas canvas').length).toBe(1);
+ $.find('.showcase-button').simulate('click');
+ expect($.find('.rv-xy-plot__series--bar rect').length).toBe(0);
+ expect($.find('.rv-xy-canvas canvas').length).toBe(1);
+ });
});
diff --git a/packages/react-vis/tests/components/borders-tests.js b/packages/react-vis/tests/components/borders-tests.js
index 3ce956826..5572886af 100644
--- a/packages/react-vis/tests/components/borders-tests.js
+++ b/packages/react-vis/tests/components/borders-tests.js
@@ -6,8 +6,10 @@ import GradientExample from '../../../showcase/misc/gradient-example';
testRenderWithProps(Borders, GENERIC_XYPLOT_SERIES_PROPS);
-test('Borders: GradientExample', () => {
- const $ = mount();
- expect($.find('.rv-xy-plot__borders').length).toBe(1);
- expect($.find('.rv-xy-plot__borders rect').length).toBe(4);
+describe('Borders', () => {
+ test('GradientExample', () => {
+ const $ = mount();
+ expect($.find('.rv-xy-plot__borders').length).toBe(1);
+ expect($.find('.rv-xy-plot__borders rect').length).toBe(4);
+ });
});
diff --git a/packages/react-vis/tests/components/circular-grid-lines-tests.js b/packages/react-vis/tests/components/circular-grid-lines-tests.js
index 60fd060d8..7af6c1af2 100644
--- a/packages/react-vis/tests/components/circular-grid-lines-tests.js
+++ b/packages/react-vis/tests/components/circular-grid-lines-tests.js
@@ -4,10 +4,12 @@ import CircularGridLines from 'plot/circular-grid-lines';
import {testRenderWithProps, GENERIC_XYPLOT_SERIES_PROPS} from '../test-utils';
import FauxRadialScatterplot from '../../../showcase/plot/faux-radial-scatterplot';
-testRenderWithProps(CircularGridLines, GENERIC_XYPLOT_SERIES_PROPS);
+describe('CircularGridLines', () => {
+ testRenderWithProps(CircularGridLines, GENERIC_XYPLOT_SERIES_PROPS);
-test('CircularGridLines: Showcase Example - FauxRadialScatterplot', () => {
- const $ = mount();
- expect($.text()).toBe('-3-2-10123-3-2-10123');
- expect($.find('.rv-xy-plot__circular-grid-lines__line').length).toBe(7);
+ test('Showcase Example - FauxRadialScatterplot', () => {
+ const $ = mount();
+ expect($.text()).toBe('-3-2-10123-3-2-10123');
+ expect($.find('.rv-xy-plot__circular-grid-lines__line').length).toBe(7);
+ });
});
diff --git a/packages/react-vis/tests/components/color-article-tests.js b/packages/react-vis/tests/components/color-article-tests.js
index a061452e6..2ffb93e20 100644
--- a/packages/react-vis/tests/components/color-article-tests.js
+++ b/packages/react-vis/tests/components/color-article-tests.js
@@ -22,94 +22,96 @@ import {
CustomPalette
} from '../../../showcase/color/mini-color-examples';
-test('Color Article Test: #generateCharts', () => {
- [
- {name: 'SensibleDefaults', Item: SensibleDefaults},
- {name: 'ColorInXYPlot', Item: ColorInXYPlot},
- {name: 'LiteralColorAtSeriesLevel', Item: LiteralColorAtSeriesLevel},
- {name: 'LinearColorAtSeriesLevel', Item: LinearColorAtSeriesLevel},
- {name: 'CategoryColorAtSeriesLevel', Item: CategoryColorAtSeriesLevel},
- {name: 'LiteralColorAtMarkLevel', Item: LiteralColorAtMarkLevel},
- {name: 'CategoryColorAtMarkLevel', Item: CategoryColorAtMarkLevel},
- {
- name: 'CategoryColorAtMarkLevelCustomPalette',
- Item: CategoryColorAtMarkLevelCustomPalette
- },
- {
- name: 'CategoryColorAtMarkLevelFixedStroke',
- Item: CategoryColorAtMarkLevelFixedStroke
- },
- {
- name: 'LinearColorAtMarkLevelNoPalette',
- Item: LinearColorAtMarkLevelNoPalette
- },
- {name: 'LinearColorAtMarkLevel', Item: LinearColorAtMarkLevel}
- ].forEach(obj => {
- const {Item} = obj;
- const $ = mount(stateless
;
- };
- const $ = mount(
-
-
-
-
-
-
- );
-
- const clonedChilds = $.instance()._getClonedChildComponents();
- const horizontalGridLinesChild = clonedChilds.find(
- element => element.type === HorizontalGridLines
- );
- const axisChild = clonedChilds.find(element => element.type === XAxis);
- const lineSeriesChild = clonedChilds.find(
- element => element.type === LineSeries
- );
- const statelessChild = clonedChilds.find(
- element => element.type === Stateless
- );
- expect(horizontalGridLinesChild.ref === null).toBeTruthy();
- expect(axisChild.ref === null).toBeTruthy();
- expect(typeof lineSeriesChild.ref === 'function').toBeTruthy();
- expect(statelessChild.ref === null).toBeTruthy();
-});
+ test('attach ref only to series components', () => {
+ const Stateless = () => {
+ return stateless
;
+ };
+ const $ = mount(
+
+
+
+
+
+
+ );
+
+ const clonedChilds = $.instance()._getClonedChildComponents();
+ const horizontalGridLinesChild = clonedChilds.find(
+ element => element.type === HorizontalGridLines
+ );
+ const axisChild = clonedChilds.find(element => element.type === XAxis);
+ const lineSeriesChild = clonedChilds.find(
+ element => element.type === LineSeries
+ );
+ const statelessChild = clonedChilds.find(
+ element => element.type === Stateless
+ );
+ expect(horizontalGridLinesChild.ref === null).toBeTruthy();
+ expect(axisChild.ref === null).toBeTruthy();
+ expect(typeof lineSeriesChild.ref === 'function').toBeTruthy();
+ expect(statelessChild.ref === null).toBeTruthy();
+ });
-test('XYPlot with wheel event callback', () => {
- const onWheel = jest.fn();
-
- const $ = mount(
-
-
-
- );
-
- $.find('svg')
- .at(0)
- .simulate('wheel');
-
- expect(onWheel).toHaveBeenCalledTimes(1);
+ test('with wheel event callback', () => {
+ const onWheel = jest.fn();
+
+ const $ = mount(
+
+
+
+ );
+
+ $.find('svg')
+ .at(0)
+ .simulate('wheel');
+
+ expect(onWheel).toHaveBeenCalledTimes(1);
+ });
});
diff --git a/packages/react-vis/tests/test-utils.js b/packages/react-vis/tests/test-utils.js
index 806953abb..79076bf9e 100644
--- a/packages/react-vis/tests/test-utils.js
+++ b/packages/react-vis/tests/test-utils.js
@@ -34,6 +34,7 @@ export const GENERIC_XYPLOT_SERIES_PROPS = {
};
export const testRenderWithProps = (Component, props) =>
+ // eslint-disable-next-line jest/require-top-level-describe
test(`Rendering ${Component.displayName}`, () => {
const wrapper = mount();
const wrapperProps = wrapper.props();
diff --git a/packages/react-vis/tests/utils/axis-utils-tests.js b/packages/react-vis/tests/utils/axis-utils-tests.js
index 54abe3240..5ec53d752 100644
--- a/packages/react-vis/tests/utils/axis-utils-tests.js
+++ b/packages/react-vis/tests/utils/axis-utils-tests.js
@@ -29,135 +29,137 @@ import {
generatePoints
} from 'utils/axis-utils';
-test('axis-utils #getTicksTotalFromSize', () => {
- expect(getTicksTotalFromSize(0) === 5).toBeTruthy();
- expect(getTicksTotalFromSize(301) === 10).toBeTruthy();
- expect(getTicksTotalFromSize(701) === 20).toBeTruthy();
-});
-
-test('axis-utils #getTickValues', () => {
- const scale = scaleLinear()
- .domain([0, 1])
- .range(['red', 'blue']);
- expect(
- getTickValues(scale, 10, false).map(d => Math.round(d * 1000) / 1000)
- ).toEqual([0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1]);
-
- const predefinedVals = ['got dang', 1, undefined, 'lolz'];
- expect(getTickValues(scale, 10, predefinedVals)).toEqual(predefinedVals);
-});
+describe('axis-utils', () => {
+ test('getTicksTotalFromSize', () => {
+ expect(getTicksTotalFromSize(0) === 5).toBeTruthy();
+ expect(getTicksTotalFromSize(301) === 10).toBeTruthy();
+ expect(getTicksTotalFromSize(701) === 20).toBeTruthy();
+ });
-test('axis-utils #getAxisAngle', () => {
- expect(getAxisAngle({x: 0, y: 0}, {x: 1, y: 1})).toBe(Math.PI / 4);
- expect(getAxisAngle({x: 0, y: 0}, {x: 0, y: 1})).toBe(Math.PI / 2);
- expect(getAxisAngle({x: 0, y: 0}, {x: 0, y: -1})).toBe((3 * Math.PI) / 2);
-});
+ test('getTickValues', () => {
+ const scale = scaleLinear()
+ .domain([0, 1])
+ .range(['red', 'blue']);
+ expect(
+ getTickValues(scale, 10, false).map(d => Math.round(d * 1000) / 1000)
+ ).toEqual([0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1]);
-test('axis-utils #generateFit', () => {
- expect(generateFit({x: 0, y: 0}, {x: 1, y: 1})).toEqual({
- left: 0,
- offset: 0,
- right: 1,
- slope: 1
- });
- expect(generateFit({x: 0, y: 0}, {x: 0, y: 1})).toEqual({
- left: 0,
- offset: 0,
- right: 1,
- slope: 0
+ const predefinedVals = ['got dang', 1, undefined, 'lolz'];
+ expect(getTickValues(scale, 10, predefinedVals)).toEqual(predefinedVals);
});
- expect(generateFit({x: 0, y: 0}, {x: 0, y: -1})).toEqual({
- left: 0,
- offset: 0,
- right: -1,
- slope: 0
- });
- const result = generateFit(
- {x: 175, y: 125},
- {x: 17.33044811707665, y: 179.23546738969475}
- );
- const numberOfTicks = 5;
- const left = result.left;
- const right = result.right;
- const pointSlope = (right - left) / numberOfTicks;
- const lengthOfGeneratedPoints = range(left, right + pointSlope, pointSlope)
- .length;
- expect(lengthOfGeneratedPoints).toBe(7);
-});
-test('axis-utils #generatePoints', () => {
- const result = generatePoints({
- axisStart: {x: 0, y: 1},
- axisEnd: {x: 1, y: 1},
- numberOfTicks: 5,
- axisDomain: [10, 100]
- });
- const expectedResult = {
- points: [
- {text: 10, y: 1, x: 0},
- {text: 28, y: 1, x: 0.2},
- {text: 46, y: 1, x: 0.4},
- {text: 64, y: 1, x: 0.6000000000000001},
- {text: 82, y: 1, x: 0.8},
- {text: 100, y: 1, x: 1}
- ],
- slope: -0
- };
- // const result2 = generatePoints({
- // axisStart: {x: 175, y: 125},
- // axisEnd: {x: 17.33044811707665, y: 179.23546738969475},
- // numberOfTicks: 5,
- // axisDomain: [0, 100]
- // });
- const expectedResult2 = {
- points: [
- {text: 0, y: 125.00000000000001, x: 175},
- {text: 20, y: 135.84709347793896, x: 143.46608962341534},
- {text: 40, y: 146.6941869558779, x: 111.93217924683066},
- {text: 59.99999999999999, y: 157.54128043381687, x: 80.398268870246},
- {text: 80, y: 168.38837391175582, x: 48.86435849366133},
- {text: 100, y: 179.23546738969478, x: 17.330448117076656}
- ],
- slope: -0.34398187057680607
- };
- const result3 = generatePoints({
- axisStart: {x: 175, y: 125},
- axisEnd: {x: 175, y: 250},
- numberOfTicks: 5,
- axisDomain: [0, 100]
+ test('getAxisAngle', () => {
+ expect(getAxisAngle({x: 0, y: 0}, {x: 1, y: 1})).toBe(Math.PI / 4);
+ expect(getAxisAngle({x: 0, y: 0}, {x: 0, y: 1})).toBe(Math.PI / 2);
+ expect(getAxisAngle({x: 0, y: 0}, {x: 0, y: -1})).toBe((3 * Math.PI) / 2);
});
- const expectedResult3 = {
- points: [
- {text: 0, y: 125, x: 175},
- {text: 20, y: 150, x: 175},
- {text: 40, y: 175, x: 175},
- {text: 60, y: 200, x: 175},
- {text: 80, y: 225, x: 175},
- {text: 100, y: 250, x: 175}
- ],
- slope: Infinity
- };
- const result4 = generatePoints({
- axisStart: {x: 175, y: 125},
- axisEnd: {x: 174.99999999999997, y: 250},
- numberOfTicks: 5,
- axisDomain: [0, 100]
+
+ test('generateFit', () => {
+ expect(generateFit({x: 0, y: 0}, {x: 1, y: 1})).toEqual({
+ left: 0,
+ offset: 0,
+ right: 1,
+ slope: 1
+ });
+ expect(generateFit({x: 0, y: 0}, {x: 0, y: 1})).toEqual({
+ left: 0,
+ offset: 0,
+ right: 1,
+ slope: 0
+ });
+ expect(generateFit({x: 0, y: 0}, {x: 0, y: -1})).toEqual({
+ left: 0,
+ offset: 0,
+ right: -1,
+ slope: 0
+ });
+ const result = generateFit(
+ {x: 175, y: 125},
+ {x: 17.33044811707665, y: 179.23546738969475}
+ );
+ const numberOfTicks = 5;
+ const left = result.left;
+ const right = result.right;
+ const pointSlope = (right - left) / numberOfTicks;
+ const lengthOfGeneratedPoints = range(left, right + pointSlope, pointSlope)
+ .length;
+ expect(lengthOfGeneratedPoints).toBe(7);
});
- const expectedResult4 = {
- points: [
- {text: 0, y: 128, x: 175},
- {text: 0, y: 128, x: 175},
- {text: 0, y: 128, x: 175},
- {text: 100, y: 256, x: 174.99999999999997},
- {text: 100, y: 256, x: 174.99999999999997}
- ],
- slope: -4398046511104000
- };
- expect(result).toEqual(expectedResult);
- // Relies on testing library to handle differences in floating point numbers.
- // t.deepEqual(result2, expectedResult2);
- expect(expectedResult2.points.length).toBe(6);
- expect(result3).toEqual(expectedResult3);
- expect(result4).toEqual(expectedResult4);
+ test('generatePoints', () => {
+ const result = generatePoints({
+ axisStart: {x: 0, y: 1},
+ axisEnd: {x: 1, y: 1},
+ numberOfTicks: 5,
+ axisDomain: [10, 100]
+ });
+ const expectedResult = {
+ points: [
+ {text: 10, y: 1, x: 0},
+ {text: 28, y: 1, x: 0.2},
+ {text: 46, y: 1, x: 0.4},
+ {text: 64, y: 1, x: 0.6000000000000001},
+ {text: 82, y: 1, x: 0.8},
+ {text: 100, y: 1, x: 1}
+ ],
+ slope: -0
+ };
+ // const result2 = generatePoints({
+ // axisStart: {x: 175, y: 125},
+ // axisEnd: {x: 17.33044811707665, y: 179.23546738969475},
+ // numberOfTicks: 5,
+ // axisDomain: [0, 100]
+ // });
+ const expectedResult2 = {
+ points: [
+ {text: 0, y: 125.00000000000001, x: 175},
+ {text: 20, y: 135.84709347793896, x: 143.46608962341534},
+ {text: 40, y: 146.6941869558779, x: 111.93217924683066},
+ {text: 59.99999999999999, y: 157.54128043381687, x: 80.398268870246},
+ {text: 80, y: 168.38837391175582, x: 48.86435849366133},
+ {text: 100, y: 179.23546738969478, x: 17.330448117076656}
+ ],
+ slope: -0.34398187057680607
+ };
+ const result3 = generatePoints({
+ axisStart: {x: 175, y: 125},
+ axisEnd: {x: 175, y: 250},
+ numberOfTicks: 5,
+ axisDomain: [0, 100]
+ });
+ const expectedResult3 = {
+ points: [
+ {text: 0, y: 125, x: 175},
+ {text: 20, y: 150, x: 175},
+ {text: 40, y: 175, x: 175},
+ {text: 60, y: 200, x: 175},
+ {text: 80, y: 225, x: 175},
+ {text: 100, y: 250, x: 175}
+ ],
+ slope: Infinity
+ };
+ const result4 = generatePoints({
+ axisStart: {x: 175, y: 125},
+ axisEnd: {x: 174.99999999999997, y: 250},
+ numberOfTicks: 5,
+ axisDomain: [0, 100]
+ });
+ const expectedResult4 = {
+ points: [
+ {text: 0, y: 128, x: 175},
+ {text: 0, y: 128, x: 175},
+ {text: 0, y: 128, x: 175},
+ {text: 100, y: 256, x: 174.99999999999997},
+ {text: 100, y: 256, x: 174.99999999999997}
+ ],
+ slope: -4398046511104000
+ };
+ expect(result).toEqual(expectedResult);
+
+ // Relies on testing library to handle differences in floating point numbers.
+ // t.deepEqual(result2, expectedResult2);
+ expect(expectedResult2.points.length).toBe(6);
+ expect(result3).toEqual(expectedResult3);
+ expect(result4).toEqual(expectedResult4);
+ });
});
diff --git a/packages/react-vis/tests/utils/chart-utils-tests.js b/packages/react-vis/tests/utils/chart-utils-tests.js
index f98770e5e..9f74f6a56 100644
--- a/packages/react-vis/tests/utils/chart-utils-tests.js
+++ b/packages/react-vis/tests/utils/chart-utils-tests.js
@@ -20,25 +20,27 @@
import {getRadialLayoutMargin} from 'utils/chart-utils';
-test('chart-utils #getRadialLayoutMargin', () => {
- expect(getRadialLayoutMargin(500, 300, 120)).toEqual({
- bottom: 30,
- left: 130,
- right: 130,
- top: 30
- });
+describe('chart-utils', () => {
+ test('getRadialLayoutMargin', () => {
+ expect(getRadialLayoutMargin(500, 300, 120)).toEqual({
+ bottom: 30,
+ left: 130,
+ right: 130,
+ top: 30
+ });
- expect(getRadialLayoutMargin(300, 500, 120)).toEqual({
- bottom: 130,
- left: 30,
- right: 30,
- top: 130
- });
+ expect(getRadialLayoutMargin(300, 500, 120)).toEqual({
+ bottom: 130,
+ left: 30,
+ right: 30,
+ top: 130
+ });
- expect(getRadialLayoutMargin(300, 300, 120)).toEqual({
- bottom: 30,
- left: 30,
- right: 30,
- top: 30
+ expect(getRadialLayoutMargin(300, 300, 120)).toEqual({
+ bottom: 30,
+ left: 30,
+ right: 30,
+ top: 30
+ });
});
});
diff --git a/packages/react-vis/tests/utils/data-utils-tests.js b/packages/react-vis/tests/utils/data-utils-tests.js
index 01b647abf..6e6747b28 100644
--- a/packages/react-vis/tests/utils/data-utils-tests.js
+++ b/packages/react-vis/tests/utils/data-utils-tests.js
@@ -26,22 +26,26 @@ import {
const arr = [{a: 1}, {b: 3, a: 2}, {a: 2}];
-test('data-utils #getUniquePropertyValues', () => {
- const result = getUniquePropertyValues(arr, d => d.a);
- expect(result.length === 2).toBeTruthy();
- expect(result.indexOf(1) !== -1 && result.indexOf(2) !== -1).toBeTruthy();
-});
+describe('data-utils', () => {
+ test('getUniquePropertyValues', () => {
+ const result = getUniquePropertyValues(arr, d => d.a);
+ expect(result.length === 2).toBeTruthy();
+ expect(result.indexOf(1) !== -1 && result.indexOf(2) !== -1).toBeTruthy();
+ });
-test('data-utils #addValueToArray', () => {
- expect(addValueToArray([-10, 10], 1)).toEqual([-10, 10]);
- expect(addValueToArray([-10, 0], 1)).toEqual([-10, 1]);
- expect(addValueToArray([0, 10], -1)).toEqual([-1, 10]);
-});
+ test('addValueToArray', () => {
+ expect(addValueToArray([-10, 10], 1)).toEqual([-10, 10]);
+ expect(addValueToArray([-10, 0], 1)).toEqual([-10, 1]);
+ expect(addValueToArray([0, 10], -1)).toEqual([-1, 10]);
+ });
-test('data-utils #transformValueToString', () => {
- expect(transformValueToString(0)).toEqual(0);
+ test('transformValueToString', () => {
+ expect(transformValueToString(0)).toEqual(0);
- // 43200000 - this is the timestamp for 12PM on 1970-01-01
- // This plays much nicer when running tests locally for different timezones.
- expect(transformValueToString(new Date(43200000))).toEqual('Thu Jan 01 1970');
+ // 43200000 - this is the timestamp for 12PM on 1970-01-01
+ // This plays much nicer when running tests locally for different timezones.
+ expect(transformValueToString(new Date(43200000))).toEqual(
+ 'Thu Jan 01 1970'
+ );
+ });
});
diff --git a/packages/react-vis/tests/utils/react-utils-tests.js b/packages/react-vis/tests/utils/react-utils-tests.js
index 1f9d7a156..845cafb27 100644
--- a/packages/react-vis/tests/utils/react-utils-tests.js
+++ b/packages/react-vis/tests/utils/react-utils-tests.js
@@ -1,5 +1,7 @@
import {isReactDOMSupported} from 'utils/react-utils';
-test('react-utils #isReactDOMSupported', () => {
- expect(isReactDOMSupported()).toBeTruthy();
+describe('react-utils', () => {
+ test('isReactDOMSupported', () => {
+ expect(isReactDOMSupported()).toBeTruthy();
+ });
});
diff --git a/packages/react-vis/tests/utils/scales-utils-tests.js b/packages/react-vis/tests/utils/scales-utils-tests.js
index e1af64b69..670b02a50 100644
--- a/packages/react-vis/tests/utils/scales-utils-tests.js
+++ b/packages/react-vis/tests/utils/scales-utils-tests.js
@@ -54,513 +54,520 @@ const xDomain = [1, 5];
const xType = 'ordinal';
const xDistance = 10;
-test('scales-utils #getScaleObjectFromProps ', () => {
- // with empty props
- const nullResult = getScaleObjectFromProps({}, 'x');
- expect(nullResult).toBe(null);
- // with empty domain
- const noRangeResult = getScaleObjectFromProps({xDomain}, 'x');
- expect(noRangeResult).toBe(null);
- // with empty range
- const noDomainResult = getScaleObjectFromProps({xRange}, 'x');
- expect(noDomainResult).toBe(null);
-
- // with all props
- const completeResult = getScaleObjectFromProps(
- {xRange, _allData, xDomain, xType, xDistance},
- 'x'
- );
- expect(isScaleConsistent(completeResult, 'x')).toBeTruthy();
- expect(completeResult.type).toBe(xType);
- // does not mutate passed domain
- const tXDomain = [1, 5];
- const scaleObj = getScaleObjectFromProps(
- {
- xRange,
- _adjustBy: ['x'],
- _adjustWhat: [0],
- _allData,
- xDomain: tXDomain,
- xDistance
- },
- 'x'
- );
+describe('scales-utils', () => {
+ test('getScaleObjectFromProps ', () => {
+ // with empty props
+ const nullResult = getScaleObjectFromProps({}, 'x');
+ expect(nullResult).toBe(null);
+ // with empty domain
+ const noRangeResult = getScaleObjectFromProps({xDomain}, 'x');
+ expect(noRangeResult).toBe(null);
+ // with empty range
+ const noDomainResult = getScaleObjectFromProps({xRange}, 'x');
+ expect(noDomainResult).toBe(null);
+
+ // with all props
+ const completeResult = getScaleObjectFromProps(
+ {xRange, _allData, xDomain, xType, xDistance},
+ 'x'
+ );
+ expect(isScaleConsistent(completeResult, 'x')).toBeTruthy();
+ expect(completeResult.type).toBe(xType);
+ // does not mutate passed domain
+ const tXDomain = [1, 5];
+ const scaleObj = getScaleObjectFromProps(
+ {
+ xRange,
+ _adjustBy: ['x'],
+ _adjustWhat: [0],
+ _allData,
+ xDomain: tXDomain,
+ xDistance
+ },
+ 'x'
+ );
- expect(scaleObj.domain).toEqual([0.5, 5.5]);
- expect(tXDomain).toEqual([1, 5]);
+ expect(scaleObj.domain).toEqual([0.5, 5.5]);
+ expect(tXDomain).toEqual([1, 5]);
- // with the value that overrides props
- const valueResult = getScaleObjectFromProps({x: 10, _allData}, 'x');
- expect(isScaleConsistent(valueResult, 'x')).toBeTruthy();
- expect(valueResult.isValue).toBe(true);
-});
+ // with the value that overrides props
+ const valueResult = getScaleObjectFromProps({x: 10, _allData}, 'x');
+ expect(isScaleConsistent(valueResult, 'x')).toBeTruthy();
+ expect(valueResult.isValue).toBe(true);
+ });
-test('scales-utils #getScalePropTypesByAttribute', () => {
- const result = Object.keys(getScalePropTypesByAttribute('size'));
- const expectedResult = [
- '_sizeValue',
- 'sizeDomain',
- 'getSize',
- 'getSize0',
- 'sizeRange',
- 'sizeType',
- 'sizeDistance',
- 'sizeBaseValue'
- ];
- expect(result).toEqual(expectedResult);
-});
+ test('getScalePropTypesByAttribute', () => {
+ const result = Object.keys(getScalePropTypesByAttribute('size'));
+ const expectedResult = [
+ '_sizeValue',
+ 'sizeDomain',
+ 'getSize',
+ 'getSize0',
+ 'sizeRange',
+ 'sizeType',
+ 'sizeDistance',
+ 'sizeBaseValue'
+ ];
+ expect(result).toEqual(expectedResult);
+ });
-test('scales-utils #getAttributeFunctor', () => {
- // without props
- let result = getAttributeFunctor({_xValue}, 'x');
- expect(result({x: Math.random()}) === _xValue).toBeTruthy();
- expect(result({})).toBe(_xValue);
- // with props
- result = getAttributeFunctor({xRange, xDomain}, 'x');
- const isFunction = typeof result === 'function';
- expect(isFunction).toBeTruthy();
- expect(result(_allData[0][0])).toBe(xRange[0]);
+ test('getAttributeFunctor', () => {
+ // without props
+ let result = getAttributeFunctor({_xValue}, 'x');
+ expect(result({x: Math.random()}) === _xValue).toBeTruthy();
+ expect(result({})).toBe(_xValue);
+ // with props
+ result = getAttributeFunctor({xRange, xDomain}, 'x');
+ const isFunction = typeof result === 'function';
+ expect(isFunction).toBeTruthy();
+ expect(result(_allData[0][0])).toBe(xRange[0]);
- expect(result({data: {x: 10}})).toBe(225);
+ expect(result({data: {x: 10}})).toBe(225);
- // with custom accessor
- result = getAttributeFunctor({xRange, xDomain, getX: d => d.value}, 'x');
- expect(typeof result === 'function').toBeTruthy();
+ // with custom accessor
+ result = getAttributeFunctor({xRange, xDomain, getX: d => d.value}, 'x');
+ expect(typeof result === 'function').toBeTruthy();
- expect(result({data: {x: 10, value: 1}})).toBe(0);
-});
+ expect(result({data: {x: 10, value: 1}})).toBe(0);
+ });
-test('scales-utils #getAttr0Functor', () => {
- // without props
- let result = getAttr0Functor({}, 'x');
- expect(null).toBe(null);
-
- // using a literal scale to check that the fall back is working correctly
- const exNaughtData = [[{x: 1, x0: 1}, {x: 0}, {x: 3, x0: 3}, {x: 2, x0: 4}]];
- result = getAttr0Functor(
- {
- xRange,
- _allData: exNaughtData,
- xDomain,
- xType: 'literal',
- xDistance
- },
- 'x'
- );
- expect(typeof result === 'function').toBeTruthy();
- expect(result(exNaughtData[0][0])).toBe(1);
- expect(result(exNaughtData[0][1])).toBe(1);
-
- expect(result({data: {x: 10, x0: 5}})).toBe(5);
-
- // with custom accessor
- result = getAttr0Functor(
- {
- xRange,
- _allData: exNaughtData,
- getX0: d => d.z,
- xDomain,
- xType: 'literal',
- xDistance
- },
- 'x'
- );
- expect(typeof result === 'function').toBeTruthy();
- expect(result({data: {x: 10, x0: 5, z: 1}})).toBe(1);
-
- // now with a linear scale
- result = getAttr0Functor(
- {
- xRange,
- _allData: exNaughtData,
- xDomain,
- xType: 'linear',
- xDistance
- },
- 'x'
- );
+ test('getAttr0Functor', () => {
+ // without props
+ let result = getAttr0Functor({}, 'x');
+ expect(null).toBe(null);
- expect(typeof result === 'function').toBeTruthy();
- expect(result(exNaughtData[0][0])).toBe(xRange[0]);
- expect(result(exNaughtData[0][1])).toBe(0);
+ // using a literal scale to check that the fall back is working correctly
+ const exNaughtData = [
+ [{x: 1, x0: 1}, {x: 0}, {x: 3, x0: 3}, {x: 2, x0: 4}]
+ ];
+ result = getAttr0Functor(
+ {
+ xRange,
+ _allData: exNaughtData,
+ xDomain,
+ xType: 'literal',
+ xDistance
+ },
+ 'x'
+ );
+ expect(typeof result === 'function').toBeTruthy();
+ expect(result(exNaughtData[0][0])).toBe(1);
+ expect(result(exNaughtData[0][1])).toBe(1);
- expect(result({data: {x: 10, x0: 5}})).toBe(100);
-});
+ expect(result({data: {x: 10, x0: 5}})).toBe(5);
-test('scales-utils #getAttributeScale', () => {
- // without props
- let result = getAttributeScale({}, 'x');
- expect(result === null).toBeTruthy();
- // with props
- result = getAttributeScale({xRange, xDomain}, 'x');
- const isFunction = typeof result === 'function';
- expect(isFunction).toBeTruthy();
- expect(result(_allData[0][0].x)).toBe(xRange[0]);
-});
+ // with custom accessor
+ result = getAttr0Functor(
+ {
+ xRange,
+ _allData: exNaughtData,
+ getX0: d => d.z,
+ xDomain,
+ xType: 'literal',
+ xDistance
+ },
+ 'x'
+ );
+ expect(typeof result === 'function').toBeTruthy();
+ expect(result({data: {x: 10, x0: 5, z: 1}})).toBe(1);
-test('scales-utils #getAttributeValue ', () => {
- // without props
- let result = getAttributeValue({_xValue}, 'x');
- expect(result === _xValue).toBeTruthy();
- // with props
- result = getAttributeValue({x: 10}, 'x');
- expect(result).toBe(10);
- // with props including a scale type
- result = getAttributeValue({opacity: 0.5, opacityType: 'literal'}, 'opacity');
- expect(result).toBe(0.5);
-});
+ // now with a linear scale
+ result = getAttr0Functor(
+ {
+ xRange,
+ _allData: exNaughtData,
+ xDomain,
+ xType: 'linear',
+ xDistance
+ },
+ 'x'
+ );
-test('scales-utils #_getSmallestDistanceIndex', () => {
- const scaleObj = {type: 'linear', domain: [0, 1], range: [0, 1]};
- const runTest = arg => _getSmallestDistanceIndex(arg, scaleObj);
+ expect(typeof result === 'function').toBeTruthy();
+ expect(result(exNaughtData[0][0])).toBe(xRange[0]);
+ expect(result(exNaughtData[0][1])).toBe(0);
- expect(runTest([0, 0, 2])).toBe(1);
- expect(runTest([0, 1, 2])).toBe(1);
- expect(runTest([0, 2, 2])).toBe(2);
- expect(runTest([0, 2, 2])).toBe(2);
- expect(runTest([1, 2, 2])).toBe(2);
- expect(runTest([2, 2, 2])).toBe(1);
-});
+ expect(result({data: {x: 10, x0: 5}})).toBe(100);
+ });
-test('scales-utils #extractScalePropsFromProps', () => {
- expect(
- Object.keys(extractScalePropsFromProps({}, [])).length === 0
- ).toBeTruthy();
-
- const props = {
- aType: 'linear',
- aRange: [1, 2],
- _aValue: 10,
- somethingElse: [],
- bDomain: [1, 2, 3],
- getA: d => d.a
- };
-
- const result = extractScalePropsFromProps(props, ['a', 'b']);
- expect(
- Object.keys(result).length === 5 &&
- result.aType === props.aType &&
- result.aRange === props.aRange &&
- result._aValue === props._aValue &&
- result.bDomain === props.bDomain &&
- result.getA === props.getA
- ).toBeTruthy();
-});
+ test('getAttributeScale', () => {
+ // without props
+ let result = getAttributeScale({}, 'x');
+ expect(result === null).toBeTruthy();
+ // with props
+ result = getAttributeScale({xRange, xDomain}, 'x');
+ const isFunction = typeof result === 'function';
+ expect(isFunction).toBeTruthy();
+ expect(result(_allData[0][0].x)).toBe(xRange[0]);
+ });
-test('scales-utils #getMissingScaleProps', () => {
- const fakeDataInteger = [
- {x: 10, y: 10},
- {x: 15, y: 15},
- {x: 20, y: 20}
- ];
- const fakeDataIntegerDomain = [9, 21];
- const fakeDataString = [{x: 'React'}, {x: 'Vis'}];
- const fakeDataStringDomain = ['React', 'Vis'];
- const dayOne = 971136000;
- const dayTen = 972000000;
- const fakeDomain = [0, 100];
- const fakeDataUnixTime = [{x: dayOne}, {x: dayTen}];
- const paddedDayOne = dayOne - (dayTen - dayOne) * 0.1;
- const paddedDayTen = dayTen + (dayTen - dayOne) * 0.1;
- const fakePadding = 10;
-
- expect(Object.keys(getMissingScaleProps({}, [], [])).length).toBe(0);
- const result = getMissingScaleProps({}, _allData[0], ['x']);
- expect(
- Boolean(result.xDomain) &&
- result.xDomain.length === 2 &&
- result.xDomain[0] === 1 &&
- result.xDomain[1] === 3
- ).toBeTruthy();
-
- expect(
- getMissingScaleProps(
- {
- xPadding: fakePadding
- },
- fakeDataInteger,
- ['x']
- ).xDomain
- ).toEqual(fakeDataIntegerDomain);
- // need to use json stringify to peel off the functions
- expect(
- JSON.stringify(
+ test('getAttributeValue ', () => {
+ // without props
+ let result = getAttributeValue({_xValue}, 'x');
+ expect(result === _xValue).toBeTruthy();
+ // with props
+ result = getAttributeValue({x: 10}, 'x');
+ expect(result).toBe(10);
+ // with props including a scale type
+ result = getAttributeValue(
+ {opacity: 0.5, opacityType: 'literal'},
+ 'opacity'
+ );
+ expect(result).toBe(0.5);
+ });
+
+ test('_getSmallestDistanceIndex', () => {
+ const scaleObj = {type: 'linear', domain: [0, 1], range: [0, 1]};
+ const runTest = arg => _getSmallestDistanceIndex(arg, scaleObj);
+
+ expect(runTest([0, 0, 2])).toBe(1);
+ expect(runTest([0, 1, 2])).toBe(1);
+ expect(runTest([0, 2, 2])).toBe(2);
+ expect(runTest([0, 2, 2])).toBe(2);
+ expect(runTest([1, 2, 2])).toBe(2);
+ expect(runTest([2, 2, 2])).toBe(1);
+ });
+
+ test('extractScalePropsFromProps', () => {
+ expect(
+ Object.keys(extractScalePropsFromProps({}, [])).length === 0
+ ).toBeTruthy();
+
+ const props = {
+ aType: 'linear',
+ aRange: [1, 2],
+ _aValue: 10,
+ somethingElse: [],
+ bDomain: [1, 2, 3],
+ getA: d => d.a
+ };
+
+ const result = extractScalePropsFromProps(props, ['a', 'b']);
+ expect(
+ Object.keys(result).length === 5 &&
+ result.aType === props.aType &&
+ result.aRange === props.aRange &&
+ result._aValue === props._aValue &&
+ result.bDomain === props.bDomain &&
+ result.getA === props.getA
+ ).toBeTruthy();
+ });
+
+ test('getMissingScaleProps', () => {
+ const fakeDataInteger = [
+ {x: 10, y: 10},
+ {x: 15, y: 15},
+ {x: 20, y: 20}
+ ];
+ const fakeDataIntegerDomain = [9, 21];
+ const fakeDataString = [{x: 'React'}, {x: 'Vis'}];
+ const fakeDataStringDomain = ['React', 'Vis'];
+ const dayOne = 971136000;
+ const dayTen = 972000000;
+ const fakeDomain = [0, 100];
+ const fakeDataUnixTime = [{x: dayOne}, {x: dayTen}];
+ const paddedDayOne = dayOne - (dayTen - dayOne) * 0.1;
+ const paddedDayTen = dayTen + (dayTen - dayOne) * 0.1;
+ const fakePadding = 10;
+
+ expect(Object.keys(getMissingScaleProps({}, [], [])).length).toBe(0);
+ const result = getMissingScaleProps({}, _allData[0], ['x']);
+ expect(
+ Boolean(result.xDomain) &&
+ result.xDomain.length === 2 &&
+ result.xDomain[0] === 1 &&
+ result.xDomain[1] === 3
+ ).toBeTruthy();
+
+ expect(
getMissingScaleProps(
{
- xPadding: fakePadding,
- xDomain: fakeDomain
+ xPadding: fakePadding
},
fakeDataInteger,
['x']
+ ).xDomain
+ ).toEqual(fakeDataIntegerDomain);
+ // need to use json stringify to peel off the functions
+ expect(
+ JSON.stringify(
+ getMissingScaleProps(
+ {
+ xPadding: fakePadding,
+ xDomain: fakeDomain
+ },
+ fakeDataInteger,
+ ['x']
+ )
)
- )
- ).toEqual('{}');
- expect(
- Object.keys(
+ ).toEqual('{}');
+ expect(
+ Object.keys(
+ getMissingScaleProps(
+ {
+ xPadding: fakePadding,
+ xDomain: fakeDomain
+ },
+ fakeDataInteger,
+ ['x']
+ )
+ )
+ ).toEqual(['getX', 'getX0']);
+ expect(
getMissingScaleProps(
{
- xPadding: fakePadding,
- xDomain: fakeDomain
+ yPadding: fakePadding
},
fakeDataInteger,
+ ['y']
+ ).yDomain
+ ).toEqual(fakeDataIntegerDomain);
+ expect(
+ getMissingScaleProps(
+ {
+ xPadding: fakePadding
+ },
+ fakeDataString,
['x']
- )
- )
- ).toEqual(['getX', 'getX0']);
- expect(
- getMissingScaleProps(
- {
- yPadding: fakePadding
- },
- fakeDataInteger,
- ['y']
- ).yDomain
- ).toEqual(fakeDataIntegerDomain);
- expect(
- getMissingScaleProps(
- {
- xPadding: fakePadding
- },
- fakeDataString,
- ['x']
- ).xDomain
- ).toEqual(fakeDataStringDomain);
- expect(
- getMissingScaleProps(
- {
- xPadding: fakePadding
- },
- fakeDataUnixTime,
- ['x']
- ).xDomain
- ).toEqual([paddedDayOne, paddedDayTen]);
-});
-
-test('scales-utils #literalScale', () => {
- const s = literalScale(5);
-
- expect(s(0.5)).toBe(0.5);
- expect(s(1)).toBe(1);
- expect(s(1.5)).toBe(1.5);
- expect(s(2)).toBe(2);
- expect(s(2.5)).toBe(2.5);
- expect(s()).toBe(5);
- expect(s('2')).toBe('2');
-});
-
-test('scales-utils #getFontColorFromBackground', () => {
- expect(getFontColorFromBackground('#fff')).toBe('#222');
- expect(getFontColorFromBackground('#000')).toBe('#fff');
- expect(getFontColorFromBackground(null)).toBe(null);
-});
-
-test('scales-utils #getScaleFnFromScaleObject', () => {
- expect(getScaleFnFromScaleObject()).toBe(null);
- const linearScale = getScaleFnFromScaleObject({
- type: 'linear',
- domain: [0, 1],
- range: [1, 0]
- });
-
- const literalScaleWithDefaultValue = getScaleFnFromScaleObject({
- type: 'literal',
- domain: [],
- range: [5]
+ ).xDomain
+ ).toEqual(fakeDataStringDomain);
+ expect(
+ getMissingScaleProps(
+ {
+ xPadding: fakePadding
+ },
+ fakeDataUnixTime,
+ ['x']
+ ).xDomain
+ ).toEqual([paddedDayOne, paddedDayTen]);
});
- expect(linearScale.domain()).toEqual([0, 1]);
- expect(linearScale.range()).toEqual([1, 0]);
-
- expect(literalScaleWithDefaultValue()).toEqual(5);
- expect(literalScaleWithDefaultValue(2)).toEqual(2);
+ test('literalScale', () => {
+ const s = literalScale(5);
- const modScaleWithZero = getScaleFnFromScaleObject({
- type: 'linear',
- domain: [0, 0],
- range: [1, 0]
+ expect(s(0.5)).toBe(0.5);
+ expect(s(1)).toBe(1);
+ expect(s(1.5)).toBe(1.5);
+ expect(s(2)).toBe(2);
+ expect(s(2.5)).toBe(2.5);
+ expect(s()).toBe(5);
+ expect(s('2')).toBe('2');
});
- expect(modScaleWithZero.domain()).toEqual([-1, 0]);
- const modScale = getScaleFnFromScaleObject({
- type: 'linear',
- domain: [1, 1],
- range: [1, 0]
+ test('getFontColorFromBackground', () => {
+ expect(getFontColorFromBackground('#fff')).toBe('#222');
+ expect(getFontColorFromBackground('#000')).toBe('#fff');
+ expect(getFontColorFromBackground(null)).toBe(null);
});
- expect(modScale.domain()).toEqual([-1, 1]);
- const ordinalScale = getScaleFnFromScaleObject({
- type: 'ordinal',
- domain: ['a', 'b', 'c', 'd', 'e'],
- range: [20, 120]
+ test('getScaleFnFromScaleObject', () => {
+ expect(getScaleFnFromScaleObject()).toBe(null);
+ const linearScale = getScaleFnFromScaleObject({
+ type: 'linear',
+ domain: [0, 1],
+ range: [1, 0]
+ });
+
+ const literalScaleWithDefaultValue = getScaleFnFromScaleObject({
+ type: 'literal',
+ domain: [],
+ range: [5]
+ });
+
+ expect(linearScale.domain()).toEqual([0, 1]);
+ expect(linearScale.range()).toEqual([1, 0]);
+
+ expect(literalScaleWithDefaultValue()).toEqual(5);
+ expect(literalScaleWithDefaultValue(2)).toEqual(2);
+
+ const modScaleWithZero = getScaleFnFromScaleObject({
+ type: 'linear',
+ domain: [0, 0],
+ range: [1, 0]
+ });
+ expect(modScaleWithZero.domain()).toEqual([-1, 0]);
+
+ const modScale = getScaleFnFromScaleObject({
+ type: 'linear',
+ domain: [1, 1],
+ range: [1, 0]
+ });
+ expect(modScale.domain()).toEqual([-1, 1]);
+
+ const ordinalScale = getScaleFnFromScaleObject({
+ type: 'ordinal',
+ domain: ['a', 'b', 'c', 'd', 'e'],
+ range: [20, 120]
+ });
+
+ expect(ordinalScale.invert(-10)).toBe('a');
+ expect(ordinalScale.invert(25)).toBe('a');
+ expect(ordinalScale.invert(40)).toBe('a');
+ expect(ordinalScale.invert(60)).toBe('b');
+ expect(ordinalScale.invert(80)).toBe('c');
+ expect(ordinalScale.invert(100)).toBe('d');
+ expect(ordinalScale.invert(115)).toBe('e');
+ expect(ordinalScale.invert(130)).toBe('e');
});
- expect(ordinalScale.invert(-10)).toBe('a');
- expect(ordinalScale.invert(25)).toBe('a');
- expect(ordinalScale.invert(40)).toBe('a');
- expect(ordinalScale.invert(60)).toBe('b');
- expect(ordinalScale.invert(80)).toBe('c');
- expect(ordinalScale.invert(100)).toBe('d');
- expect(ordinalScale.invert(115)).toBe('e');
- expect(ordinalScale.invert(130)).toBe('e');
-});
-
-function generateFakeData() {
- return new Array(100).fill(0).map((zero, i) => ({xxxx: i}));
-}
-
-test('scales-utils #_getScaleDistanceAndAdjustedDomain', () => {
- const FAKE_DATA = generateFakeData();
- const scaleObject = {
- attr: 'x',
- domain: [0, 100],
- range: [0, 1],
- type: 'linear',
- // the extra x's are here to test the accessor behaviour
- accessor: d => d.xxxx
- };
- const resultObject = _getScaleDistanceAndAdjustedDomain(
- FAKE_DATA,
- scaleObject
- );
- const expectedResults = {
- distance: 0.009900990099009799,
- domain0: -0.5,
- domainN: 100.5
- };
- expect(resultObject).toEqual(expectedResults);
-
- const FAKE_TIME_DATA_WITH_ONE_VALUE_AND_X0 = [
- {
- x: 1422774000000,
- x0: 1420095600000,
- y: 16
- }
- ];
-
- const FAKE_TIME_DATA_WITH_ONE_VALUE_AND_Y0 = [
- {
- x: 16,
- y0: 1420095600000,
- y: 1422774000000
- }
- ];
-
- const timeScaleObjectX = {
- attr: 'x',
- domain: [1417546800000, 1430420400000],
- range: [0, 550],
- type: 'time',
- accessor: d => d.x,
- accessor0: d => d.x0
- };
- const timeResultWithOneValueAndX0 = _getScaleDistanceAndAdjustedDomain(
- FAKE_TIME_DATA_WITH_ONE_VALUE_AND_X0,
- timeScaleObjectX
- );
- const expectedTimeResultsWithOneValueAndX0 = {
- distance: 94.72222222222223,
- domain0: 1416207600000,
- domainN: 1431759600000
- };
- expect(timeResultWithOneValueAndX0).toEqual(
- expectedTimeResultsWithOneValueAndX0
- );
-
- const timeScaleObjectY = {
- attr: 'y',
- domain: [1417546800000, 1430420400000],
- range: [0, 550],
- type: 'time',
- accessor: d => d.y,
- accessor0: d => d.y0
- };
- const timeResultWithOneValueAndY0 = _getScaleDistanceAndAdjustedDomain(
- FAKE_TIME_DATA_WITH_ONE_VALUE_AND_Y0,
- timeScaleObjectY
- );
- const expectedTimeResultsWithOneValueAndY0 = {
- distance: 94.72222222222223,
- domain0: 1416207600000,
- domainN: 1431759600000
- };
- expect(timeResultWithOneValueAndY0).toEqual(
- expectedTimeResultsWithOneValueAndY0
- );
+ function generateFakeData() {
+ return new Array(100).fill(0).map((zero, i) => ({xxxx: i}));
+ }
+
+ test('_getScaleDistanceAndAdjustedDomain', () => {
+ const FAKE_DATA = generateFakeData();
+ const scaleObject = {
+ attr: 'x',
+ domain: [0, 100],
+ range: [0, 1],
+ type: 'linear',
+ // the extra x's are here to test the accessor behaviour
+ accessor: d => d.xxxx
+ };
+ const resultObject = _getScaleDistanceAndAdjustedDomain(
+ FAKE_DATA,
+ scaleObject
+ );
+ const expectedResults = {
+ distance: 0.009900990099009799,
+ domain0: -0.5,
+ domainN: 100.5
+ };
+ expect(resultObject).toEqual(expectedResults);
+
+ const FAKE_TIME_DATA_WITH_ONE_VALUE_AND_X0 = [
+ {
+ x: 1422774000000,
+ x0: 1420095600000,
+ y: 16
+ }
+ ];
- const timeResult = _getScaleDistanceAndAdjustedDomain(FAKE_DATA, {
- ...timeScaleObjectX,
- accessor: d => d.xxxx
+ const FAKE_TIME_DATA_WITH_ONE_VALUE_AND_Y0 = [
+ {
+ x: 16,
+ y0: 1420095600000,
+ y: 1422774000000
+ }
+ ];
+
+ const timeScaleObjectX = {
+ attr: 'x',
+ domain: [1417546800000, 1430420400000],
+ range: [0, 550],
+ type: 'time',
+ accessor: d => d.x,
+ accessor0: d => d.x0
+ };
+ const timeResultWithOneValueAndX0 = _getScaleDistanceAndAdjustedDomain(
+ FAKE_TIME_DATA_WITH_ONE_VALUE_AND_X0,
+ timeScaleObjectX
+ );
+ const expectedTimeResultsWithOneValueAndX0 = {
+ distance: 94.72222222222223,
+ domain0: 1416207600000,
+ domainN: 1431759600000
+ };
+ expect(timeResultWithOneValueAndX0).toEqual(
+ expectedTimeResultsWithOneValueAndX0
+ );
+
+ const timeScaleObjectY = {
+ attr: 'y',
+ domain: [1417546800000, 1430420400000],
+ range: [0, 550],
+ type: 'time',
+ accessor: d => d.y,
+ accessor0: d => d.y0
+ };
+ const timeResultWithOneValueAndY0 = _getScaleDistanceAndAdjustedDomain(
+ FAKE_TIME_DATA_WITH_ONE_VALUE_AND_Y0,
+ timeScaleObjectY
+ );
+ const expectedTimeResultsWithOneValueAndY0 = {
+ distance: 94.72222222222223,
+ domain0: 1416207600000,
+ domainN: 1431759600000
+ };
+ expect(timeResultWithOneValueAndY0).toEqual(
+ expectedTimeResultsWithOneValueAndY0
+ );
+
+ const timeResult = _getScaleDistanceAndAdjustedDomain(FAKE_DATA, {
+ ...timeScaleObjectX,
+ accessor: d => d.xxxx
+ });
+ const expectedTimeResults = {
+ distance: 4.272442311048508e-8,
+ domain0: 1417546799999.5,
+ domainN: 1430420400000.5
+ };
+ expect(timeResult).toEqual(expectedTimeResults);
+
+ const logScaleObject = {
+ attr: 'x',
+ domain: [-0.5, 1],
+ range: [1, 10],
+ type: 'log',
+ accessor: d => d.xxxx
+ };
+ const logResult = _getScaleDistanceAndAdjustedDomain(
+ FAKE_DATA,
+ logScaleObject
+ );
+ const expectedLogResults = {distance: NaN, domain0: 0.1, domainN: 1.5};
+ expect(logResult).toEqual(expectedLogResults);
});
- const expectedTimeResults = {
- distance: 4.272442311048508e-8,
- domain0: 1417546799999.5,
- domainN: 1430420400000.5
- };
- expect(timeResult).toEqual(expectedTimeResults);
-
- const logScaleObject = {
- attr: 'x',
- domain: [-0.5, 1],
- range: [1, 10],
- type: 'log',
- accessor: d => d.xxxx
- };
- const logResult = _getScaleDistanceAndAdjustedDomain(
- FAKE_DATA,
- logScaleObject
- );
- const expectedLogResults = {distance: NaN, domain0: 0.1, domainN: 1.5};
- expect(logResult).toEqual(expectedLogResults);
-});
-
-test('scales-utils getXYPlotValues', () => {
- const XYPlotProps = {
- colorType: 'linear',
- colorRange: ['#000', '#fff'],
- colorDomain: [0, 1]
- };
- const children = [
- {props: {color: 0}},
- {props: {color: 0.5, opacity: '0.5'}},
- {props: {color: 1}}
- ];
- const result = getXYPlotValues(XYPlotProps, children);
- expect(result[2]._colorValue).toBe('rgb(255, 255, 255)');
- expect(result[1]._opacityValue).toBe('0.5');
-});
-test('scales-utils #_adjustCategoricalScale', () => {
- [
- {
- scale: {type: 'category', domain: ['a', 'b', 'c'], range: [0, 10]},
- distance: 10
- },
- {
- scale: {type: 'category', domain: ['a'], range: [1, 10]},
- distance: 9
- },
- {
- scale: {type: 'ordinal', domain: ['a', 'b', 'c', 'd'], range: [10, 0]},
- distance: 2.5
- },
- {
- scale: {type: 'ordinal', domain: ['a'], range: [10, 1]},
- distance: 9
- }
- ].forEach(({scale, distance}) => {
- expect(_adjustCategoricalScale(scale)).toEqual({...scale, distance});
+ test('getXYPlotValues', () => {
+ const XYPlotProps = {
+ colorType: 'linear',
+ colorRange: ['#000', '#fff'],
+ colorDomain: [0, 1]
+ };
+ const children = [
+ {props: {color: 0}},
+ {props: {color: 0.5, opacity: '0.5'}},
+ {props: {color: 1}}
+ ];
+ const result = getXYPlotValues(XYPlotProps, children);
+ expect(result[2]._colorValue).toBe('rgb(255, 255, 255)');
+ expect(result[1]._opacityValue).toBe('0.5');
});
-});
-test('scale-utils #getOptionalScaleProps', () => {
- const foundProps = getOptionalScaleProps({node: 1, x: 2, margins: 4});
- expect(foundProps).toEqual({});
+ test('_adjustCategoricalScale', () => {
+ [
+ {
+ scale: {type: 'category', domain: ['a', 'b', 'c'], range: [0, 10]},
+ distance: 10
+ },
+ {
+ scale: {type: 'category', domain: ['a'], range: [1, 10]},
+ distance: 9
+ },
+ {
+ scale: {type: 'ordinal', domain: ['a', 'b', 'c', 'd'], range: [10, 0]},
+ distance: 2.5
+ },
+ {
+ scale: {type: 'ordinal', domain: ['a'], range: [10, 1]},
+ distance: 9
+ }
+ ].forEach(({scale, distance}) => {
+ expect(_adjustCategoricalScale(scale)).toEqual({...scale, distance});
+ });
+ });
- const paddingProps = getOptionalScaleProps({
- node: 1,
- x: 2,
- margins: 4,
- coolDogExplosionPadding: 10
+ test('getOptionalScaleProps', () => {
+ const foundProps = getOptionalScaleProps({node: 1, x: 2, margins: 4});
+ expect(foundProps).toEqual({});
+
+ const paddingProps = getOptionalScaleProps({
+ node: 1,
+ x: 2,
+ margins: 4,
+ coolDogExplosionPadding: 10
+ });
+ expect(paddingProps).toEqual({coolDogExplosionPadding: 10});
});
- expect(paddingProps).toEqual({coolDogExplosionPadding: 10});
});
diff --git a/packages/react-vis/tests/utils/series-utils-tests.js b/packages/react-vis/tests/utils/series-utils-tests.js
index 343c36eb4..ede450c40 100644
--- a/packages/react-vis/tests/utils/series-utils-tests.js
+++ b/packages/react-vis/tests/utils/series-utils-tests.js
@@ -33,264 +33,266 @@ import HorizontalBarSeries from 'plot/series/horizontal-rect-series';
import VerticalBarSeries from 'plot/series/vertical-rect-series';
import LabelSeries from 'plot/series/label-series';
-test('series-utils #isSeriesChild', () => {
- const series = ;
- expect(isSeriesChild(series)).toBeTruthy();
- const axis = (
-
- );
- expect(isSeriesChild(axis)).toBeFalsy();
-});
+describe('series-utils', () => {
+ test('isSeriesChild', () => {
+ const series = ;
+ expect(isSeriesChild(series)).toBeTruthy();
+ const axis = (
+
+ );
+ expect(isSeriesChild(axis)).toBeFalsy();
+ });
-test('series-utils #getSeriesChildren', () => {
- const children = [
- This squid is heavy ,
- ,
-
- ];
- const $ = mount(
-
- {children}
-
- );
- const expectedChildren = [{...children[2], key: '.$woah'}];
- expect(getSeriesChildren($.props().children)).toEqual(expectedChildren);
-});
+ test('getSeriesChildren', () => {
+ const children = [
+ This squid is heavy ,
+ ,
+
+ ];
+ const $ = mount(
+
+ {children}
+
+ );
+ const expectedChildren = [{...children[2], key: '.$woah'}];
+ expect(getSeriesChildren($.props().children)).toEqual(expectedChildren);
+ });
-const arePropsValid = seriesProps => {
- return (
- typeof seriesProps._colorValue !== 'undefined' &&
- typeof seriesProps._opacityValue !== 'undefined' &&
- typeof seriesProps.sameTypeIndex === 'number' &&
- typeof seriesProps.sameTypeTotal === 'number' &&
- typeof seriesProps.seriesIndex === 'number'
- );
-};
+ const arePropsValid = seriesProps => {
+ return (
+ typeof seriesProps._colorValue !== 'undefined' &&
+ typeof seriesProps._opacityValue !== 'undefined' &&
+ typeof seriesProps.sameTypeIndex === 'number' &&
+ typeof seriesProps.sameTypeTotal === 'number' &&
+ typeof seriesProps.seriesIndex === 'number'
+ );
+ };
-test('series-utils #collectSeriesTypesInfo', () => {
- const result = getSeriesPropsFromChildren([
- ,
-
- ]);
- expect(result.length === 2).toBeTruthy();
- result.forEach(props => expect(arePropsValid(props)).toBeTruthy());
-});
+ test('collectSeriesTypesInfo', () => {
+ const result = getSeriesPropsFromChildren([
+ ,
+
+ ]);
+ expect(result.length === 2).toBeTruthy();
+ result.forEach(props => expect(arePropsValid(props)).toBeTruthy());
+ });
-test('series-utils #seriesClusterProps', () => {
- const result = getSeriesPropsFromChildren([
- ,
- ,
- ,
-
- ]);
- const expectedClusters = ['alpha', 'beta', 'gamma'];
- expect(result.length === 4).toBeTruthy();
- result.forEach(props => {
- expect(
- props.sameTypeIndex === expectedClusters.indexOf(props.cluster)
- ).toBeTruthy();
- expect(props.sameTypeTotal === props.clusters.length).toBeTruthy();
- expect(props.clusters.length === 3).toBeTruthy();
+ test('seriesClusterProps', () => {
+ const result = getSeriesPropsFromChildren([
+ ,
+ ,
+ ,
+
+ ]);
+ const expectedClusters = ['alpha', 'beta', 'gamma'];
+ expect(result.length === 4).toBeTruthy();
+ result.forEach(props => {
+ expect(
+ props.sameTypeIndex === expectedClusters.indexOf(props.cluster)
+ ).toBeTruthy();
+ expect(props.sameTypeTotal === props.clusters.length).toBeTruthy();
+ expect(props.clusters.length === 3).toBeTruthy();
+ });
});
-});
-// eslint-disable-next-line max-statements
-test('series-utils #getStackedData', () => {
- const yData = [
- [
- {y: 2, x: 10},
- {y: 4, x: 5},
- {y: 5, x: 15}
- ],
- [
- {y: 2, x: 12},
- {y: 4, x: 2},
- {y: 5, x: 11}
- ]
- ];
+ // eslint-disable-next-line max-statements
+ test('getStackedData', () => {
+ const yData = [
+ [
+ {y: 2, x: 10},
+ {y: 4, x: 5},
+ {y: 5, x: 15}
+ ],
+ [
+ {y: 2, x: 12},
+ {y: 4, x: 2},
+ {y: 5, x: 11}
+ ]
+ ];
- const stackByYExpected = [
- [
- {x: 2, y: 10},
- {x: 4, y: 5},
- {x: 5, y: 15}
- ],
- [
- {x: 2, y: 22, y0: 10},
- {x: 4, y: 7, y0: 5},
- {x: 5, y: 26, y0: 15}
- ],
- undefined
- ];
+ const stackByYExpected = [
+ [
+ {x: 2, y: 10},
+ {x: 4, y: 5},
+ {x: 5, y: 15}
+ ],
+ [
+ {x: 2, y: 22, y0: 10},
+ {x: 4, y: 7, y0: 5},
+ {x: 5, y: 26, y0: 15}
+ ],
+ undefined
+ ];
- const stackByXExpected = [
- [
- {y: 2, x: 10},
- {y: 4, x: 5},
- {y: 5, x: 15}
- ],
- [
- {y: 2, x: 22, x0: 10},
- {y: 4, x: 7, x0: 5},
- {y: 5, x: 26, x0: 15}
- ],
- null
- ];
+ const stackByXExpected = [
+ [
+ {y: 2, x: 10},
+ {y: 4, x: 5},
+ {y: 5, x: 15}
+ ],
+ [
+ {y: 2, x: 22, x0: 10},
+ {y: 4, x: 7, x0: 5},
+ {y: 5, x: 26, x0: 15}
+ ],
+ null
+ ];
- const stackByYExpectedPartial = [
- [
- {x: 2, y: 10},
- {x: 4, y: 5}
- ],
- [
- {x: 4, y: 7, y0: 5},
- {x: 5, y: 11}
- ]
- ];
+ const stackByYExpectedPartial = [
+ [
+ {x: 2, y: 10},
+ {x: 4, y: 5}
+ ],
+ [
+ {x: 4, y: 7, y0: 5},
+ {x: 5, y: 11}
+ ]
+ ];
- const stackByXExpectedPartial = [
- [
- {y: 2, x: 10},
- {y: 4, x: 5}
- ],
- [
- {y: 4, x: 7, x0: 5},
- {y: 5, x: 11}
- ]
- ];
+ const stackByXExpectedPartial = [
+ [
+ {y: 2, x: 10},
+ {y: 4, x: 5}
+ ],
+ [
+ {y: 4, x: 7, x0: 5},
+ {y: 5, x: 11}
+ ]
+ ];
- // Transpose data to flip stacking
- const xData = yData.map(arr => arr.map(d => ({x: d.y, y: d.x})));
+ // Transpose data to flip stacking
+ const xData = yData.map(arr => arr.map(d => ({x: d.y, y: d.x})));
- const partialYData = [yData[0].slice(0, 2), yData[1].slice(1)];
- const partialXData = partialYData.map(arr =>
- arr.map(d => ({x: d.y, y: d.x}))
- );
+ const partialYData = [yData[0].slice(0, 2), yData[1].slice(1)];
+ const partialXData = partialYData.map(arr =>
+ arr.map(d => ({x: d.y, y: d.x}))
+ );
- let children = [
- ,
- ,
- i think i will by that lamp
- ];
+ let children = [
+ ,
+ ,
+ i think i will by that lamp
+ ];
- let results = getStackedData(children, 'y');
- expect(results).toEqual(stackByYExpected);
+ let results = getStackedData(children, 'y');
+ expect(results).toEqual(stackByYExpected);
- children = [
- ,
- ,
- null
- ];
- results = getStackedData(children, 'x');
+ children = [
+ ,
+ ,
+ null
+ ];
+ results = getStackedData(children, 'x');
- expect(results).toEqual(stackByXExpected);
+ expect(results).toEqual(stackByXExpected);
- children = [
- ,
- ,
- ,
-
- ];
- results = getStackedData(children, 'x');
- let expectedResults = [
- ...stackByXExpected.slice(0, 2),
- ...stackByXExpected.slice(0, 2)
- ];
+ children = [
+ ,
+ ,
+ ,
+
+ ];
+ results = getStackedData(children, 'x');
+ let expectedResults = [
+ ...stackByXExpected.slice(0, 2),
+ ...stackByXExpected.slice(0, 2)
+ ];
- expect(results).toEqual(expectedResults);
+ expect(results).toEqual(expectedResults);
- children = [
- ,
- ,
- ,
-
- ];
- results = getStackedData(children, 'y');
- expectedResults = [
- ...stackByYExpected.slice(0, 2),
- ...stackByYExpected.slice(0, 2)
- ];
- expect(results).toEqual(expectedResults);
+ children = [
+ ,
+ ,
+ ,
+
+ ];
+ results = getStackedData(children, 'y');
+ expectedResults = [
+ ...stackByYExpected.slice(0, 2),
+ ...stackByYExpected.slice(0, 2)
+ ];
+ expect(results).toEqual(expectedResults);
- children = [
- ,
- ,
- ,
-
- ];
- results = getStackedData(children, 'x');
- expectedResults = [...stackByXExpectedPartial, ...stackByXExpectedPartial];
- expect(results).toEqual(expectedResults);
+ children = [
+ ,
+ ,
+ ,
+
+ ];
+ results = getStackedData(children, 'x');
+ expectedResults = [...stackByXExpectedPartial, ...stackByXExpectedPartial];
+ expect(results).toEqual(expectedResults);
- children = [
- ,
- ,
- ,
-
- ];
- results = getStackedData(children, 'y');
- expectedResults = [...stackByYExpectedPartial, ...stackByYExpectedPartial];
+ children = [
+ ,
+ ,
+ ,
+
+ ];
+ results = getStackedData(children, 'y');
+ expectedResults = [...stackByYExpectedPartial, ...stackByYExpectedPartial];
- expect(results).toEqual(expectedResults);
+ expect(results).toEqual(expectedResults);
- children = [
- ,
- ,
-
- ];
- results = getStackedData(children, 'y');
- expectedResults = [
- yData[0],
- [
- {x: 10, y: 5, y0: 2},
- {x: 5, y: 10, y0: 4},
- {x: 15, y: 12, y0: 5}
- ],
- yData[1]
- ];
- expect(results).toEqual(expectedResults);
+ children = [
+ ,
+ ,
+
+ ];
+ results = getStackedData(children, 'y');
+ expectedResults = [
+ yData[0],
+ [
+ {x: 10, y: 5, y0: 2},
+ {x: 5, y: 10, y0: 4},
+ {x: 15, y: 12, y0: 5}
+ ],
+ yData[1]
+ ];
+ expect(results).toEqual(expectedResults);
- children = [
- ,
- ,
- ,
- ,
-
- ];
- results = getStackedData(children, 'y');
- expectedResults = [
- ...stackByYExpected.slice(0, 2),
- ...stackByYExpected.slice(0, 2),
- xData[1]
- ];
- expect(results).toEqual(expectedResults);
+ children = [
+ ,
+ ,
+ ,
+ ,
+
+ ];
+ results = getStackedData(children, 'y');
+ expectedResults = [
+ ...stackByYExpected.slice(0, 2),
+ ...stackByYExpected.slice(0, 2),
+ xData[1]
+ ];
+ expect(results).toEqual(expectedResults);
- children = [
- ,
- ,
- ,
-
- ];
- results = getStackedData(children, 'y');
- expectedResults = [
- ...stackByYExpected.slice(0, 2),
- ...stackByYExpected.slice(0, 2)
- ];
+ children = [
+ ,
+ ,
+ ,
+
+ ];
+ results = getStackedData(children, 'y');
+ expectedResults = [
+ ...stackByYExpected.slice(0, 2),
+ ...stackByYExpected.slice(0, 2)
+ ];
- expect(results).toEqual(expectedResults);
+ expect(results).toEqual(expectedResults);
+ });
});
diff --git a/packages/react-vis/tests/utils/styling-utils-tests.js b/packages/react-vis/tests/utils/styling-utils-tests.js
index 6f3e74172..ee089de6e 100644
--- a/packages/react-vis/tests/utils/styling-utils-tests.js
+++ b/packages/react-vis/tests/utils/styling-utils-tests.js
@@ -20,33 +20,35 @@
import {getCombinedClassName} from 'utils/styling-utils';
-test('styling-utils #getCombinedClassName', () => {
- const allValidStringParams = [
- 'test_class--1',
- 'test_class--2',
- 'test_class--3'
- ];
- const expectedAllValidStringParamsCombined =
- 'test_class--1 test_class--2 test_class--3';
- const falsyValues = [null, undefined, false, '', 0, NaN];
- const nonStringValues = [
- ['invalid_class--1', 'invalid_class--2'],
- {foo: 'bar'},
- 123,
- () => {
- return 'invalid_class--3';
- }
- ];
+describe('styling-utils', () => {
+ test('getCombinedClassName', () => {
+ const allValidStringParams = [
+ 'test_class--1',
+ 'test_class--2',
+ 'test_class--3'
+ ];
+ const expectedAllValidStringParamsCombined =
+ 'test_class--1 test_class--2 test_class--3';
+ const falsyValues = [null, undefined, false, '', 0, NaN];
+ const nonStringValues = [
+ ['invalid_class--1', 'invalid_class--2'],
+ {foo: 'bar'},
+ 123,
+ () => {
+ return 'invalid_class--3';
+ }
+ ];
- expect(getCombinedClassName(...allValidStringParams)).toBe(
- expectedAllValidStringParamsCombined
- );
+ expect(getCombinedClassName(...allValidStringParams)).toBe(
+ expectedAllValidStringParamsCombined
+ );
- expect(getCombinedClassName(...allValidStringParams, ...falsyValues)).toBe(
- expectedAllValidStringParamsCombined
- );
+ expect(getCombinedClassName(...allValidStringParams, ...falsyValues)).toBe(
+ expectedAllValidStringParamsCombined
+ );
- expect(
- getCombinedClassName(...allValidStringParams, ...nonStringValues)
- ).toBe(expectedAllValidStringParamsCombined);
+ expect(
+ getCombinedClassName(...allValidStringParams, ...nonStringValues)
+ ).toBe(expectedAllValidStringParamsCombined);
+ });
});
From 99586179e6a2958e6343428d1f7f16e74fadaa33 Mon Sep 17 00:00:00 2001
From: apeltier <26309854+a-peltier@users.noreply.github.com>
Date: Thu, 28 May 2020 23:34:36 +0200
Subject: [PATCH 3/6] Remove eslint-plugin-no-only-tests
---
.eslintrc | 1 -
package.json | 1 -
yarn.lock | 5 -----
3 files changed, 7 deletions(-)
diff --git a/.eslintrc b/.eslintrc
index 3adc4006a..8a9f4cd3b 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -36,7 +36,6 @@
"max-params": ["error", 6],
"object-curly-spacing": 0,
"babel/object-curly-spacing": 2,
- "no-only-tests/no-only-tests": 2,
"jest/require-top-level-describe":"error",
"react/prop-types": "off",
"prettier/prettier": "warn"
diff --git a/package.json b/package.json
index 9e8b97300..725d4ba5f 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,6 @@
"eslint": "6.8.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-babel": "^5.3.0",
- "eslint-plugin-no-only-tests": "^2.4.0",
"eslint-plugin-prettier": "^3.1.3",
"eslint-plugin-react": "^7.20.0",
"husky": "^1.1.2"
diff --git a/yarn.lock b/yarn.lock
index 8ebf76a63..dd358d7d2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6588,11 +6588,6 @@ eslint-plugin-jest@^23.13.2:
dependencies:
"@typescript-eslint/experimental-utils" "^2.5.0"
-eslint-plugin-no-only-tests@^2.4.0:
- version "2.4.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-no-only-tests/-/eslint-plugin-no-only-tests-2.4.0.tgz#7d565434aa7d16ccc7eea957c391d98f827332ca"
- integrity sha1-fVZUNKp9FszH7qlXw5HZj4JzMso=
-
eslint-plugin-prettier@^3.1.3:
version "3.1.3"
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.3.tgz#ae116a0fc0e598fdae48743a4430903de5b4e6ca"
From f4c707979a8daf1d091b8c1bf71fdc2690285d32 Mon Sep 17 00:00:00 2001
From: apeltier <26309854+a-peltier@users.noreply.github.com>
Date: Fri, 29 May 2020 10:10:47 +0200
Subject: [PATCH 4/6] fixup! Remove eslint-plugin-no-only-tests
---
.eslintrc | 1 -
1 file changed, 1 deletion(-)
diff --git a/.eslintrc b/.eslintrc
index 8a9f4cd3b..be727efd6 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -11,7 +11,6 @@
"react",
"prettier",
"babel",
- "no-only-tests",
"jest"
],
"ignorePatterns": [
From 2111b19c6039515aa025ca3e5f535891d5c41ae8 Mon Sep 17 00:00:00 2001
From: apeltier <26309854+a-peltier@users.noreply.github.com>
Date: Fri, 29 May 2020 00:01:16 +0200
Subject: [PATCH 5/6] Rename all test files as *.test.js
---
packages/react-vis/jest.config.js | 1 -
.../tests/components/{animation-tests.js => animation.test.js} | 0
.../tests/components/{arc-series-tests.js => arc-series.test.js} | 0
.../components/{area-series-tests.js => area-series.test.js} | 0
.../react-vis/tests/components/{axes-tests.js => axes.test.js} | 0
.../{axis-tick-format-tests.js => axis-tick-format.test.js} | 0
.../tests/components/{axis-title-tests.js => axis-title.test.js} | 0
.../tests/components/{bar-series-tests.js => bar-series.test.js} | 0
.../tests/components/{borders-tests.js => borders.test.js} | 0
.../{canvas-component-tests.js => canvas-component.test.js} | 0
...{circular-grid-lines-tests.js => circular-grid-lines.test.js} | 0
.../components/{color-article-tests.js => color-article.test.js} | 0
.../{contour-series-tests.js => contour-series.test.js} | 0
.../tests/components/{crosshair-tests.js => crosshair.test.js} | 0
.../{custom-svg-series-tests.js => custom-svg-series.test.js} | 0
.../components/{data-article-tests.js => data-article.test.js} | 0
.../{decorative-axis-tests.js => decorative-axis.test.js} | 0
.../tests/components/{gradient-tests.js => gradient.test.js} | 0
.../tests/components/{grid-lines-tests.js => grid-lines.test.js} | 0
.../tests/components/{heatmap-tests.js => heatmap.test.js} | 0
.../components/{hexbin-series-tests.js => hexbin-series.test.js} | 0
.../tests/components/{highlight-tests.js => highlight.test.js} | 0
.../react-vis/tests/components/{hints-tests.js => hints.test.js} | 0
...{interaction-article-tests.js => interaction-article.test.js} | 0
.../components/{label-series-tests.js => label-series.test.js} | 0
.../tests/components/{legends-tests.js => legends.test.js} | 0
.../{line-series-canvas-test.js => line-series-canvas.test.js} | 0
.../components/{line-series-tests.js => line-series.test.js} | 0
.../{make-vis-flexible-tests.js => make-vis-flexible.test.js} | 0
.../components/{mark-series-tests.js => mark-series.test.js} | 0
...arallel-coordinates-tests.js => parallel-coordinates.test.js} | 0
.../{polygon-series-tests.js => polygon-series.test.js} | 0
.../components/{radar-chart-tests.js => radar-chart.test.js} | 0
.../tests/components/{radial-tests.js => radial.test.js} | 0
.../components/{rect-series-tests.js => rect-series.test.js} | 0
.../tests/components/{sankey-tests.js => sankey.test.js} | 0
.../tests/components/{sunburst-tests.js => sunburst.test.js} | 0
.../tests/components/{treemap-tests.js => treemap.test.js} | 0
.../tests/components/{voronoi-tests.js => voronoi.test.js} | 0
.../{whisker-series-tests.js => whisker-series.test.js} | 0
.../tests/components/{xy-plot-tests.js => xy-plot.test.js} | 0
.../tests/utils/{axis-utils-tests.js => axis-utils.test.js} | 0
.../tests/utils/{chart-utils-tests.js => chart-utils.test.js} | 0
.../tests/utils/{data-utils-tests.js => data-utils.test.js} | 0
.../tests/utils/{react-utils-tests.js => react-utils.test.js} | 0
.../tests/utils/{scales-utils-tests.js => scales-utils.test.js} | 0
.../tests/utils/{series-utils-tests.js => series-utils.test.js} | 0
.../utils/{styling-utils-tests.js => styling-utils.test.js} | 0
48 files changed, 1 deletion(-)
rename packages/react-vis/tests/components/{animation-tests.js => animation.test.js} (100%)
rename packages/react-vis/tests/components/{arc-series-tests.js => arc-series.test.js} (100%)
rename packages/react-vis/tests/components/{area-series-tests.js => area-series.test.js} (100%)
rename packages/react-vis/tests/components/{axes-tests.js => axes.test.js} (100%)
rename packages/react-vis/tests/components/{axis-tick-format-tests.js => axis-tick-format.test.js} (100%)
rename packages/react-vis/tests/components/{axis-title-tests.js => axis-title.test.js} (100%)
rename packages/react-vis/tests/components/{bar-series-tests.js => bar-series.test.js} (100%)
rename packages/react-vis/tests/components/{borders-tests.js => borders.test.js} (100%)
rename packages/react-vis/tests/components/{canvas-component-tests.js => canvas-component.test.js} (100%)
rename packages/react-vis/tests/components/{circular-grid-lines-tests.js => circular-grid-lines.test.js} (100%)
rename packages/react-vis/tests/components/{color-article-tests.js => color-article.test.js} (100%)
rename packages/react-vis/tests/components/{contour-series-tests.js => contour-series.test.js} (100%)
rename packages/react-vis/tests/components/{crosshair-tests.js => crosshair.test.js} (100%)
rename packages/react-vis/tests/components/{custom-svg-series-tests.js => custom-svg-series.test.js} (100%)
rename packages/react-vis/tests/components/{data-article-tests.js => data-article.test.js} (100%)
rename packages/react-vis/tests/components/{decorative-axis-tests.js => decorative-axis.test.js} (100%)
rename packages/react-vis/tests/components/{gradient-tests.js => gradient.test.js} (100%)
rename packages/react-vis/tests/components/{grid-lines-tests.js => grid-lines.test.js} (100%)
rename packages/react-vis/tests/components/{heatmap-tests.js => heatmap.test.js} (100%)
rename packages/react-vis/tests/components/{hexbin-series-tests.js => hexbin-series.test.js} (100%)
rename packages/react-vis/tests/components/{highlight-tests.js => highlight.test.js} (100%)
rename packages/react-vis/tests/components/{hints-tests.js => hints.test.js} (100%)
rename packages/react-vis/tests/components/{interaction-article-tests.js => interaction-article.test.js} (100%)
rename packages/react-vis/tests/components/{label-series-tests.js => label-series.test.js} (100%)
rename packages/react-vis/tests/components/{legends-tests.js => legends.test.js} (100%)
rename packages/react-vis/tests/components/{line-series-canvas-test.js => line-series-canvas.test.js} (100%)
rename packages/react-vis/tests/components/{line-series-tests.js => line-series.test.js} (100%)
rename packages/react-vis/tests/components/{make-vis-flexible-tests.js => make-vis-flexible.test.js} (100%)
rename packages/react-vis/tests/components/{mark-series-tests.js => mark-series.test.js} (100%)
rename packages/react-vis/tests/components/{parallel-coordinates-tests.js => parallel-coordinates.test.js} (100%)
rename packages/react-vis/tests/components/{polygon-series-tests.js => polygon-series.test.js} (100%)
rename packages/react-vis/tests/components/{radar-chart-tests.js => radar-chart.test.js} (100%)
rename packages/react-vis/tests/components/{radial-tests.js => radial.test.js} (100%)
rename packages/react-vis/tests/components/{rect-series-tests.js => rect-series.test.js} (100%)
rename packages/react-vis/tests/components/{sankey-tests.js => sankey.test.js} (100%)
rename packages/react-vis/tests/components/{sunburst-tests.js => sunburst.test.js} (100%)
rename packages/react-vis/tests/components/{treemap-tests.js => treemap.test.js} (100%)
rename packages/react-vis/tests/components/{voronoi-tests.js => voronoi.test.js} (100%)
rename packages/react-vis/tests/components/{whisker-series-tests.js => whisker-series.test.js} (100%)
rename packages/react-vis/tests/components/{xy-plot-tests.js => xy-plot.test.js} (100%)
rename packages/react-vis/tests/utils/{axis-utils-tests.js => axis-utils.test.js} (100%)
rename packages/react-vis/tests/utils/{chart-utils-tests.js => chart-utils.test.js} (100%)
rename packages/react-vis/tests/utils/{data-utils-tests.js => data-utils.test.js} (100%)
rename packages/react-vis/tests/utils/{react-utils-tests.js => react-utils.test.js} (100%)
rename packages/react-vis/tests/utils/{scales-utils-tests.js => scales-utils.test.js} (100%)
rename packages/react-vis/tests/utils/{series-utils-tests.js => series-utils.test.js} (100%)
rename packages/react-vis/tests/utils/{styling-utils-tests.js => styling-utils.test.js} (100%)
diff --git a/packages/react-vis/jest.config.js b/packages/react-vis/jest.config.js
index f7529c1e2..46a594b3f 100644
--- a/packages/react-vis/jest.config.js
+++ b/packages/react-vis/jest.config.js
@@ -2,7 +2,6 @@
const path = require('path');
module.exports = {
- testMatch: ['**/?(*-)+(test|tests).[tj]s?(x)'],
transform: {
'^.+\\.js$': path.resolve(__dirname, './jestBabelTransform.js')
},
diff --git a/packages/react-vis/tests/components/animation-tests.js b/packages/react-vis/tests/components/animation.test.js
similarity index 100%
rename from packages/react-vis/tests/components/animation-tests.js
rename to packages/react-vis/tests/components/animation.test.js
diff --git a/packages/react-vis/tests/components/arc-series-tests.js b/packages/react-vis/tests/components/arc-series.test.js
similarity index 100%
rename from packages/react-vis/tests/components/arc-series-tests.js
rename to packages/react-vis/tests/components/arc-series.test.js
diff --git a/packages/react-vis/tests/components/area-series-tests.js b/packages/react-vis/tests/components/area-series.test.js
similarity index 100%
rename from packages/react-vis/tests/components/area-series-tests.js
rename to packages/react-vis/tests/components/area-series.test.js
diff --git a/packages/react-vis/tests/components/axes-tests.js b/packages/react-vis/tests/components/axes.test.js
similarity index 100%
rename from packages/react-vis/tests/components/axes-tests.js
rename to packages/react-vis/tests/components/axes.test.js
diff --git a/packages/react-vis/tests/components/axis-tick-format-tests.js b/packages/react-vis/tests/components/axis-tick-format.test.js
similarity index 100%
rename from packages/react-vis/tests/components/axis-tick-format-tests.js
rename to packages/react-vis/tests/components/axis-tick-format.test.js
diff --git a/packages/react-vis/tests/components/axis-title-tests.js b/packages/react-vis/tests/components/axis-title.test.js
similarity index 100%
rename from packages/react-vis/tests/components/axis-title-tests.js
rename to packages/react-vis/tests/components/axis-title.test.js
diff --git a/packages/react-vis/tests/components/bar-series-tests.js b/packages/react-vis/tests/components/bar-series.test.js
similarity index 100%
rename from packages/react-vis/tests/components/bar-series-tests.js
rename to packages/react-vis/tests/components/bar-series.test.js
diff --git a/packages/react-vis/tests/components/borders-tests.js b/packages/react-vis/tests/components/borders.test.js
similarity index 100%
rename from packages/react-vis/tests/components/borders-tests.js
rename to packages/react-vis/tests/components/borders.test.js
diff --git a/packages/react-vis/tests/components/canvas-component-tests.js b/packages/react-vis/tests/components/canvas-component.test.js
similarity index 100%
rename from packages/react-vis/tests/components/canvas-component-tests.js
rename to packages/react-vis/tests/components/canvas-component.test.js
diff --git a/packages/react-vis/tests/components/circular-grid-lines-tests.js b/packages/react-vis/tests/components/circular-grid-lines.test.js
similarity index 100%
rename from packages/react-vis/tests/components/circular-grid-lines-tests.js
rename to packages/react-vis/tests/components/circular-grid-lines.test.js
diff --git a/packages/react-vis/tests/components/color-article-tests.js b/packages/react-vis/tests/components/color-article.test.js
similarity index 100%
rename from packages/react-vis/tests/components/color-article-tests.js
rename to packages/react-vis/tests/components/color-article.test.js
diff --git a/packages/react-vis/tests/components/contour-series-tests.js b/packages/react-vis/tests/components/contour-series.test.js
similarity index 100%
rename from packages/react-vis/tests/components/contour-series-tests.js
rename to packages/react-vis/tests/components/contour-series.test.js
diff --git a/packages/react-vis/tests/components/crosshair-tests.js b/packages/react-vis/tests/components/crosshair.test.js
similarity index 100%
rename from packages/react-vis/tests/components/crosshair-tests.js
rename to packages/react-vis/tests/components/crosshair.test.js
diff --git a/packages/react-vis/tests/components/custom-svg-series-tests.js b/packages/react-vis/tests/components/custom-svg-series.test.js
similarity index 100%
rename from packages/react-vis/tests/components/custom-svg-series-tests.js
rename to packages/react-vis/tests/components/custom-svg-series.test.js
diff --git a/packages/react-vis/tests/components/data-article-tests.js b/packages/react-vis/tests/components/data-article.test.js
similarity index 100%
rename from packages/react-vis/tests/components/data-article-tests.js
rename to packages/react-vis/tests/components/data-article.test.js
diff --git a/packages/react-vis/tests/components/decorative-axis-tests.js b/packages/react-vis/tests/components/decorative-axis.test.js
similarity index 100%
rename from packages/react-vis/tests/components/decorative-axis-tests.js
rename to packages/react-vis/tests/components/decorative-axis.test.js
diff --git a/packages/react-vis/tests/components/gradient-tests.js b/packages/react-vis/tests/components/gradient.test.js
similarity index 100%
rename from packages/react-vis/tests/components/gradient-tests.js
rename to packages/react-vis/tests/components/gradient.test.js
diff --git a/packages/react-vis/tests/components/grid-lines-tests.js b/packages/react-vis/tests/components/grid-lines.test.js
similarity index 100%
rename from packages/react-vis/tests/components/grid-lines-tests.js
rename to packages/react-vis/tests/components/grid-lines.test.js
diff --git a/packages/react-vis/tests/components/heatmap-tests.js b/packages/react-vis/tests/components/heatmap.test.js
similarity index 100%
rename from packages/react-vis/tests/components/heatmap-tests.js
rename to packages/react-vis/tests/components/heatmap.test.js
diff --git a/packages/react-vis/tests/components/hexbin-series-tests.js b/packages/react-vis/tests/components/hexbin-series.test.js
similarity index 100%
rename from packages/react-vis/tests/components/hexbin-series-tests.js
rename to packages/react-vis/tests/components/hexbin-series.test.js
diff --git a/packages/react-vis/tests/components/highlight-tests.js b/packages/react-vis/tests/components/highlight.test.js
similarity index 100%
rename from packages/react-vis/tests/components/highlight-tests.js
rename to packages/react-vis/tests/components/highlight.test.js
diff --git a/packages/react-vis/tests/components/hints-tests.js b/packages/react-vis/tests/components/hints.test.js
similarity index 100%
rename from packages/react-vis/tests/components/hints-tests.js
rename to packages/react-vis/tests/components/hints.test.js
diff --git a/packages/react-vis/tests/components/interaction-article-tests.js b/packages/react-vis/tests/components/interaction-article.test.js
similarity index 100%
rename from packages/react-vis/tests/components/interaction-article-tests.js
rename to packages/react-vis/tests/components/interaction-article.test.js
diff --git a/packages/react-vis/tests/components/label-series-tests.js b/packages/react-vis/tests/components/label-series.test.js
similarity index 100%
rename from packages/react-vis/tests/components/label-series-tests.js
rename to packages/react-vis/tests/components/label-series.test.js
diff --git a/packages/react-vis/tests/components/legends-tests.js b/packages/react-vis/tests/components/legends.test.js
similarity index 100%
rename from packages/react-vis/tests/components/legends-tests.js
rename to packages/react-vis/tests/components/legends.test.js
diff --git a/packages/react-vis/tests/components/line-series-canvas-test.js b/packages/react-vis/tests/components/line-series-canvas.test.js
similarity index 100%
rename from packages/react-vis/tests/components/line-series-canvas-test.js
rename to packages/react-vis/tests/components/line-series-canvas.test.js
diff --git a/packages/react-vis/tests/components/line-series-tests.js b/packages/react-vis/tests/components/line-series.test.js
similarity index 100%
rename from packages/react-vis/tests/components/line-series-tests.js
rename to packages/react-vis/tests/components/line-series.test.js
diff --git a/packages/react-vis/tests/components/make-vis-flexible-tests.js b/packages/react-vis/tests/components/make-vis-flexible.test.js
similarity index 100%
rename from packages/react-vis/tests/components/make-vis-flexible-tests.js
rename to packages/react-vis/tests/components/make-vis-flexible.test.js
diff --git a/packages/react-vis/tests/components/mark-series-tests.js b/packages/react-vis/tests/components/mark-series.test.js
similarity index 100%
rename from packages/react-vis/tests/components/mark-series-tests.js
rename to packages/react-vis/tests/components/mark-series.test.js
diff --git a/packages/react-vis/tests/components/parallel-coordinates-tests.js b/packages/react-vis/tests/components/parallel-coordinates.test.js
similarity index 100%
rename from packages/react-vis/tests/components/parallel-coordinates-tests.js
rename to packages/react-vis/tests/components/parallel-coordinates.test.js
diff --git a/packages/react-vis/tests/components/polygon-series-tests.js b/packages/react-vis/tests/components/polygon-series.test.js
similarity index 100%
rename from packages/react-vis/tests/components/polygon-series-tests.js
rename to packages/react-vis/tests/components/polygon-series.test.js
diff --git a/packages/react-vis/tests/components/radar-chart-tests.js b/packages/react-vis/tests/components/radar-chart.test.js
similarity index 100%
rename from packages/react-vis/tests/components/radar-chart-tests.js
rename to packages/react-vis/tests/components/radar-chart.test.js
diff --git a/packages/react-vis/tests/components/radial-tests.js b/packages/react-vis/tests/components/radial.test.js
similarity index 100%
rename from packages/react-vis/tests/components/radial-tests.js
rename to packages/react-vis/tests/components/radial.test.js
diff --git a/packages/react-vis/tests/components/rect-series-tests.js b/packages/react-vis/tests/components/rect-series.test.js
similarity index 100%
rename from packages/react-vis/tests/components/rect-series-tests.js
rename to packages/react-vis/tests/components/rect-series.test.js
diff --git a/packages/react-vis/tests/components/sankey-tests.js b/packages/react-vis/tests/components/sankey.test.js
similarity index 100%
rename from packages/react-vis/tests/components/sankey-tests.js
rename to packages/react-vis/tests/components/sankey.test.js
diff --git a/packages/react-vis/tests/components/sunburst-tests.js b/packages/react-vis/tests/components/sunburst.test.js
similarity index 100%
rename from packages/react-vis/tests/components/sunburst-tests.js
rename to packages/react-vis/tests/components/sunburst.test.js
diff --git a/packages/react-vis/tests/components/treemap-tests.js b/packages/react-vis/tests/components/treemap.test.js
similarity index 100%
rename from packages/react-vis/tests/components/treemap-tests.js
rename to packages/react-vis/tests/components/treemap.test.js
diff --git a/packages/react-vis/tests/components/voronoi-tests.js b/packages/react-vis/tests/components/voronoi.test.js
similarity index 100%
rename from packages/react-vis/tests/components/voronoi-tests.js
rename to packages/react-vis/tests/components/voronoi.test.js
diff --git a/packages/react-vis/tests/components/whisker-series-tests.js b/packages/react-vis/tests/components/whisker-series.test.js
similarity index 100%
rename from packages/react-vis/tests/components/whisker-series-tests.js
rename to packages/react-vis/tests/components/whisker-series.test.js
diff --git a/packages/react-vis/tests/components/xy-plot-tests.js b/packages/react-vis/tests/components/xy-plot.test.js
similarity index 100%
rename from packages/react-vis/tests/components/xy-plot-tests.js
rename to packages/react-vis/tests/components/xy-plot.test.js
diff --git a/packages/react-vis/tests/utils/axis-utils-tests.js b/packages/react-vis/tests/utils/axis-utils.test.js
similarity index 100%
rename from packages/react-vis/tests/utils/axis-utils-tests.js
rename to packages/react-vis/tests/utils/axis-utils.test.js
diff --git a/packages/react-vis/tests/utils/chart-utils-tests.js b/packages/react-vis/tests/utils/chart-utils.test.js
similarity index 100%
rename from packages/react-vis/tests/utils/chart-utils-tests.js
rename to packages/react-vis/tests/utils/chart-utils.test.js
diff --git a/packages/react-vis/tests/utils/data-utils-tests.js b/packages/react-vis/tests/utils/data-utils.test.js
similarity index 100%
rename from packages/react-vis/tests/utils/data-utils-tests.js
rename to packages/react-vis/tests/utils/data-utils.test.js
diff --git a/packages/react-vis/tests/utils/react-utils-tests.js b/packages/react-vis/tests/utils/react-utils.test.js
similarity index 100%
rename from packages/react-vis/tests/utils/react-utils-tests.js
rename to packages/react-vis/tests/utils/react-utils.test.js
diff --git a/packages/react-vis/tests/utils/scales-utils-tests.js b/packages/react-vis/tests/utils/scales-utils.test.js
similarity index 100%
rename from packages/react-vis/tests/utils/scales-utils-tests.js
rename to packages/react-vis/tests/utils/scales-utils.test.js
diff --git a/packages/react-vis/tests/utils/series-utils-tests.js b/packages/react-vis/tests/utils/series-utils.test.js
similarity index 100%
rename from packages/react-vis/tests/utils/series-utils-tests.js
rename to packages/react-vis/tests/utils/series-utils.test.js
diff --git a/packages/react-vis/tests/utils/styling-utils-tests.js b/packages/react-vis/tests/utils/styling-utils.test.js
similarity index 100%
rename from packages/react-vis/tests/utils/styling-utils-tests.js
rename to packages/react-vis/tests/utils/styling-utils.test.js
From 747aa86752cbe32a3f881c0b86e2a647451adf38 Mon Sep 17 00:00:00 2001
From: apeltier <26309854+a-peltier@users.noreply.github.com>
Date: Fri, 29 May 2020 09:10:18 +0200
Subject: [PATCH 6/6] Drop node 8 test in CI
---
.travis.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index bc260dcab..a255579e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
language: node_js
node_js:
- - '8'
- '10'
script:
- npm run lint