fix: unit tests

packages/vx-shape/test/Arc.test.tsx

@@ -55,7 +55,7 @@ describe('<Arc />', () => {
     ArcChildren({ children: fn });
     const args = fn.mock.calls[0][0];
     const keys = Object.keys(args);
-    expect(keys.includes('path')).toEqual(true);
+    expect(keys).toContain('path');
   });
 
   test('it should take an innerRadius number prop', () => {
@@ -192,6 +192,7 @@ describe('<Arc />', () => {
   });
 
   test('it should expose its ref via an innerRef prop', () => {
+    // eslint-disable-next-line jest/no-test-return-statement
     return new Promise(done => {
       const refCallback = (ref: SVGPathElement) => {
         expect(ref.tagName).toMatch('path');

packages/vx-shape/test/Area.test.tsx

@@ -40,6 +40,7 @@ describe('<Area />', () => {
   });
 
   test('it should expose its ref via an innerRef prop', () => {
+    // eslint-disable-next-line jest/no-test-return-statement
     return new Promise(done => {
       const refCallback = (ref: SVGPathElement) => {
         expect(ref.tagName).toMatch('path');
@@ -64,7 +65,7 @@ describe('<Area />', () => {
     AreaChildren({ children: fn });
     const args = fn.mock.calls[0][0];
     const keys = Object.keys(args);
-    expect(keys.includes('path')).toEqual(true);
+    expect(keys).toContain('path');
   });
 
   test('it should take an x number prop', () => {

packages/vx-shape/test/AreaClosed.test.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { shallow, mount } from 'enzyme';
 
+import { scaleLinear } from '@vx/scale';
 import { AreaClosed } from '../src';
 import { AreaClosedProps } from '../src/shapes/AreaClosed';
 
@@ -15,18 +16,20 @@ const data: Datum[] = [
   { x: new Date('2017-01-03'), y: 5 },
 ];
 
-const xScale = () => 50;
-xScale.range = () => [0, 100];
-xScale.domain = () => [0, 100];
-xScale.copy = () => xScale;
+const yScale = scaleLinear({ domain: [0, 100], range: [100, 0] });
 
-const yScale = () => 50;
-yScale.range = () => [100, 0] as [number, number];
-yScale.domain = () => [0, 100] as [number, number];
-yScale.copy = () => yScale;
+// const xScale = () => 50;
+// xScale.range = () => [0, 100];
+// xScale.domain = () => [0, 100];
+// xScale.copy = () => xScale;
 
-const x = () => xScale();
-const y = () => yScale();
+// const yScale = () => 50;
+// yScale.range = () => [100, 0] as [number, number];
+// yScale.domain = () => [0, 100] as [number, number];
+// yScale.copy = () => yScale;
+
+const x = () => 50;
+const y = () => 50;
 
 const AreaClosedWrapper = (restProps = {}) =>
   shallow(<AreaClosed data={data} yScale={yScale} x={x} y1={y} {...restProps} />);
@@ -72,7 +75,7 @@ describe('<AreaClosed />', () => {
     AreaClosedChildren({ children: fn });
     const args = fn.mock.calls[0][0];
     const keys = Object.keys(args);
-    expect(keys.includes('path')).toEqual(true);
+    expect(keys).toContain('path');
   });
 
   test('it should take an x number prop', () => {

packages/vx-shape/test/BarGroup.test.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
+import { scaleBand, scaleLinear } from '@vx/scale';
 import { BarGroup } from '../src';
 import { BarGroupProps } from '../src/shapes/BarGroup';
 import { GroupKey } from '../src/types';
@@ -28,22 +29,26 @@ const data: Datum[] = [
 ];
 
 const x0 = () => 5;
-const x0Scale = () => 2;
-x0Scale.bandwidth = () => 10;
-x0Scale.domain = () => [0, 100] as [number, number];
-x0Scale.range = () => [0, 100] as [number, number];
-x0Scale.copy = () => x0Scale;
-
-const x1Scale = () => 5;
-x1Scale.bandwidth = () => 2;
-x1Scale.domain = () => [0, 100] as [number, number];
-x1Scale.range = () => [0, 100] as [number, number];
-x1Scale.copy = () => x1Scale;
-
-const yScale = () => 5;
-yScale.domain = () => [0, 100] as [number, number];
-yScale.range = () => [0, 100] as [number, number];
-yScale.copy = () => yScale;
+const x0Scale = scaleBand({ domain: [0, 100], range: [0, 100] });
+const x1Scale = scaleBand({ domain: [0, 100], range: [0, 100] });
+const yScale = scaleLinear({ domain: [0, 100], range: [0, 100] });
+
+// const x0Scale = () => 2;
+// x0Scale.bandwidth = () => 10;
+// x0Scale.domain = () => [0, 100] as [number, number];
+// x0Scale.range = () => [0, 100] as [number, number];
+// x0Scale.copy = () => x0Scale;
+
+// const x1Scale = () => 5;
+// x1Scale.bandwidth = () => 2;
+// x1Scale.domain = () => [0, 100] as [number, number];
+// x1Scale.range = () => [0, 100] as [number, number];
+// x1Scale.copy = () => x1Scale;
+
+// const yScale = () => 5;
+// yScale.domain = () => [0, 100] as [number, number];
+// yScale.range = () => [0, 100] as [number, number];
+// yScale.copy = () => yScale;
 
 const color = () => 'skyblue';
 const keys = ['New York', 'San Francisco', 'Austin'];

packages/vx-shape/test/BarGroupHorizontal.test.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
+import { scaleBand, scaleLinear } from '@vx/scale';
 import { BarGroupHorizontal } from '../src';
-import { BarGroupHorizontalProps } from '../src/shapes/BarGroupHorizontal';
-import { GroupKey } from '../src/types';
+import { BarGroupHorizontalProps } from '../lib/shapes/BarGroupHorizontal';
 
 interface Datum {
   date: Date;
@@ -27,21 +27,27 @@ const data: Datum[] = [
   },
 ];
 
-const y0 = () => 1;
-const y0Scale = () => 2;
-y0Scale.bandwidth = () => 10;
-y0Scale.domain = () => [0, 100] as [number, number];
-y0Scale.range = () => [0, 100] as [number, number];
-y0Scale.copy = () => y0Scale;
-const y1Scale = () => 1;
-y1Scale.bandwidth = () => 2;
-y1Scale.domain = () => [0, 100] as [number, number];
-y1Scale.range = () => [0, 100] as [number, number];
-y1Scale.copy = () => y1Scale;
-const xScale = (d: Datum) => 5;
-xScale.domain = () => [0, 100] as [number, number];
-xScale.range = () => [0, 100] as [number, number];
-xScale.copy = () => xScale;
+const y0 = () => 5;
+const y0Scale = scaleBand({ domain: [0, 100], range: [0, 100] });
+const y1Scale = scaleBand({ domain: [0, 100], range: [0, 100] });
+const xScale = scaleLinear({ domain: [0, 100], range: [0, 100] });
+
+// const y0 = () => 1;
+// const y0Scale = () => 2;
+// y0Scale.bandwidth = () => 10;
+// y0Scale.domain = () => [0, 100] as [number, number];
+// y0Scale.range = () => [0, 100] as [number, number];
+// y0Scale.copy = () => y0Scale;
+// const y1Scale = () => 1;
+// y1Scale.bandwidth = () => 2;
+// y1Scale.domain = () => [0, 100] as [number, number];
+// y1Scale.range = () => [0, 100] as [number, number];
+// y1Scale.copy = () => y1Scale;
+// const xScale = (d: Datum) => 5;
+// xScale.domain = () => [0, 100] as [number, number];
+// xScale.range = () => [0, 100] as [number, number];
+// xScale.copy = () => xScale;
+
 const color = () => 'violet';
 const keys = ['New York', 'San Francisco', 'Austin'];
 const width = 1;
@@ -61,10 +67,7 @@ const BarGroupWrapper = (restProps = {}) =>
     />,
   );
 
-const BarGroupChildren = ({
-  children,
-  ...restProps
-}: Partial<BarGroupHorizontalProps<Datum, GroupKey>>) =>
+const BarGroupChildren = ({ children, ...restProps }: Partial<BarGroupHorizontalProps<Datum>>) =>
   shallow(
     <BarGroupHorizontal
       data={data}

packages/vx-shape/test/BarStack.test.tsx

@@ -1,14 +1,19 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-
+import { scaleBand } from '@vx/scale';
 import { BarStack } from '../src';
 
-const scale = () => 2;
-scale.domain = () => [0, 100] as [number, number];
-scale.range = () => [0, 100] as [number, number];
-scale.bandwidth = () => 2;
-scale.step = () => 2;
-scale.copy = () => scale;
+const scale = scaleBand({
+  domain: [0, 100],
+  range: [0, 100],
+});
+
+// const scale = () => 2;
+// scale.domain = () => [0, 100] as [number, number];
+// scale.range = () => [0, 100] as [number, number];
+// scale.bandwidth = () => 2;
+// scale.step = () => 2;
+// scale.copy = () => scale;
 
 describe('<BarStack />', () => {
   test('it should be defined', () => {

packages/vx-shape/test/BarStackHorizontal.test.tsx

@@ -1,16 +1,24 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
+import { scaleBand } from '@vx/scale';
 import { BarStackHorizontal } from '../src';
 
-const scale = () => 5;
-scale.domain = () => [0, 100] as [number, number];
-scale.range = () => [0, 100] as [number, number];
-scale.bandwidth = () => 5;
-scale.step = () => 5;
-scale.paddingInner = () => 5;
-scale.paddingOuter = () => 5;
-scale.copy = () => scale;
+const scale = scaleBand({
+  domain: [0, 100],
+  range: [0, 100],
+  paddingInner: 5,
+  paddingOuter: 5,
+});
+
+// const scale = () => 5;
+// scale.domain = () => [0, 100] as [number, number];
+// scale.range = () => [0, 100] as [number, number];
+// scale.bandwidth = () => 5;
+// scale.step = () => 5;
+// scale.paddingInner = () => 5;
+// scale.paddingOuter = () => 5;
+// scale.copy = () => scale;
 
 describe('<BarStackHorizontal />', () => {
   test('it should be defined', () => {

packages/vx-shape/test/Circle.test.tsx

@@ -19,6 +19,7 @@ describe('<Circle />', () => {
   });
 
   test('it should expose its ref via an innerRef prop', () => {
+    // eslint-disable-next-line jest/no-test-return-statement
     return new Promise(done => {
       const refCallback = (ref: SVGCircleElement) => {
         expect(ref.tagName).toMatch('circle');

packages/vx-shape/test/Line.test.tsx

@@ -19,6 +19,7 @@ describe('<Line />', () => {
   });
 
   test('it should expose its ref via an innerRef prop', () => {
+    // eslint-disable-next-line jest/no-test-return-statement
     return new Promise(done => {
       const refCallback = (ref: SVGLineElement) => {
         expect(ref.tagName).toMatch('line');

packages/vx-shape/test/LinkHorizontal.test.tsx

@@ -23,6 +23,7 @@ describe('<LinkHorizontal />', () => {
   });
 
   test('it should expose its ref via an innerRef prop', () => {
+    // eslint-disable-next-line jest/no-test-return-statement
     return new Promise(done => {
       const refCallback = (ref: SVGPathElement) => {
         expect(ref.tagName).toMatch('path');

packages/vx-shape/test/LinkVertical.test.tsx

@@ -22,6 +22,7 @@ describe('<LinkVertical />', () => {
   });
 
   test('it should expose its ref via an innerRef prop', () => {
+    // eslint-disable-next-line jest/no-test-return-statement
     return new Promise(done => {
       const refCallback = (ref: SVGPathElement) => {
         expect(ref.tagName).toMatch('path');