Move tests to root directories

.babelrc.build.js

@@ -0,0 +1,4 @@
+module.exports = {
+  extends: "./.babelrc.js",
+  ignore: [/^.*(.test.)[j|t]sx?$/]
+};

.eslintrc.js

@@ -32,12 +32,26 @@ module.exports = {
     "jest/globals": true
   },
   overrides: [
+    {
+      files: ["**/*.test.*", "./test/**/*"],
+      rules: {
+        "react/sort-comp": "off",
+        "no-magic-numbers": 0,
+        "max-statements": 0,
+        "import/no-unresolved": 0,
+        "no-undef": "off",
+        "max-nested-callbacks": "off",
+        "@typescript-eslint/no-empty-function": "off",
+        "react/prop-types": "off"
+      }
+    },
     {
       files: ["*.ts", "*.tsx"],
       excludedFiles: ["*.d.ts"],
       parser: "@typescript-eslint/parser",
       parserOptions: {
         project: ["./tsconfig.base.json"],
+        // eslint-disable-next-line no-undef
         tsconfigRootDir: __dirname
       },
       plugins: ["@typescript-eslint"],

jest-config.js

@@ -2,13 +2,9 @@ module.exports = {
   preset: "ts-jest",
   testEnvironment: "jsdom",
   moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
-  testMatch: ["**/jest/**/?(*.)+(test).[jt]s?(x)"],
-  testPathIgnorePatterns: ["victory-native"],
+  testPathIgnorePatterns: ["victory-native", "node_modules", "config"],
   transform: {
-    "^.+/test/.+\\.(ts|tsx|js|jsx)$": [
-      "babel-jest",
-      { configFile: "./.babelrc.js" }
-    ]
+    "\\.[jt]sx?$": ["babel-jest", { configFile: "./.babelrc.js" }]
   },
   setupFilesAfterEnv: ["<rootDir>/test/jest-setup.js"]
 };

jest-native-config.js

@@ -1,6 +1,6 @@
 module.exports = {
   moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
-  testMatch: ["**/jest/victory-native/**/?(*.)+(spec|test).[jt]s?(x)"],
+  testMatch: ["**/*/victory-native/**/?(*.)+(spec|test).[jt]s?(x)"],
   transform: {
     // TODO(2215): Switch over to only transpiling from within `/test/`
     // https://github.com/FormidableLabs/victory/issues/2215

package-scripts.js

@@ -68,14 +68,14 @@ module.exports = {
     },
     typecheck: {
       default: npsUtils.series.nps("typecheck.packages", "typecheck.test"),
-      base: "tsc --noEmit",
-      core: "lerna exec --scope victory-core -- nps typecheck.base",
+      src: "tsc --noEmit",
       demo: "tsc -p ./demo/tsconfig.json --noEmit",
       test: "tsc -p ./test/tsconfig.json --noEmit",
-      packages: "lerna exec --ignore victory-vendor -- nps typecheck.base"
+      core: "lerna exec --scope victory-core -- nps typecheck.src",
+      packages: "lerna exec --ignore victory-vendor -- nps typecheck.src"
     },
     types: {
-      base: "tsc --emitDeclarationOnly --rootDir src",
+      base: "tsc -p ./tsconfig.build.json --emitDeclarationOnly --rootDir src",
       lib: "nps types.base -- -- --outDir lib",
       es: "nps types.base -- -- --outDir es"
     },
@@ -95,8 +95,8 @@ module.exports = {
       default: npsUtils.series.nps("lint", "test")
     },
     watch: {
-      es: "lerna exec --parallel --ignore victory-native --ignore victory-vendor -- cross-env BABEL_ENV=es babel src --out-dir es --config-file ../../.babelrc.js --copy-files --extensions .tsx,.ts,.jsx,.js --watch",
-      lib: "lerna exec --parallel --ignore victory-native --ignore victory-vendor -- cross-env BABEL_ENV=commonjs babel src --out-dir lib --config-file ../../.babelrc.js --copy-files --extensions .tsx,.ts,.jsx,.js --watch",
+      es: "lerna exec --parallel --ignore victory-native --ignore victory-vendor -- cross-env BABEL_ENV=es babel src --out-dir es --config-file ../../.babelrc.build.js --copy-files --no-copy-ignored --extensions .tsx,.ts,.jsx,.js --watch",
+      lib: "lerna exec --parallel --ignore victory-native --ignore victory-vendor -- cross-env BABEL_ENV=commonjs babel src --out-dir lib --config-file ../../.babelrc.build.js --copy-files --no-copy-ignored --extensions .tsx,.ts,.jsx,.js --watch",
       core: npsUtils.concurrent.nps("watch.es", "watch.lib"),
       // `victory-vendor` is built 1x up front and not watched.
       default: npsUtils.series.nps("build-package-libs-vendor", "watch.core")
@@ -113,9 +113,9 @@ module.exports = {
       "lerna version --no-git-tag-version --no-push --loglevel silly",
     // TODO: organize build scripts once build perf is sorted out
     "babel-es":
-      "cross-env BABEL_ENV=es babel src --out-dir es --config-file ../../.babelrc.js --copy-files --extensions .tsx,.ts,.jsx,.js",
+      "cross-env BABEL_ENV=es babel src --out-dir es --config-file ../../.babelrc.build.js --copy-files --no-copy-ignored --extensions .tsx,.ts,.jsx,.js",
     "babel-lib":
-      "cross-env BABEL_ENV=commonjs babel src --out-dir lib --config-file ../../.babelrc.js --copy-files --extensions .tsx,.ts,.jsx,.js",
+      "cross-env BABEL_ENV=commonjs babel src --out-dir lib --config-file ../../.babelrc.build.js --copy-files --no-copy-ignored --extensions .tsx,.ts,.jsx,.js",
     "build-es": npsUtils.series.nps("clean.es", "babel-es", "types.es"),
     "build-lib": npsUtils.series.nps("clean.lib", "babel-lib", "types.lib"),
     "build-libs": npsUtils.series.nps("build-lib", "build-es"),

test/jest/victory-area/area.test.js → packages/victory-area/src/area.test.js

@@ -1,5 +1,5 @@
 import React from "react";
-import { Area } from "victory-area";
+import Area from "./area";
 import { merge } from "lodash";
 import { render } from "@testing-library/react";
 import { VictoryContainer } from "victory-core";

test/jest/victory-area/helper-methods.test.js → packages/victory-area/src/helper-methods.test.js

@@ -1,4 +1,4 @@
-import { getDataWithBaseline } from "victory-area/lib/helper-methods";
+import { getDataWithBaseline } from "./helper-methods";
 import * as d3Scale from "victory-vendor/d3-scale";
 
 describe("victory-area/helper-methods", () => {

test/jest/victory-area/victory-area.test.js → packages/victory-area/src/victory-area.test.js

@@ -4,7 +4,7 @@ import React from "react";
 import { Area, VictoryArea } from "victory-area";
 import { VictoryChart } from "victory-chart";
 import { curveCatmullRom } from "victory-vendor/d3-shape";
-import { calculateD3Path } from "../../svg-test-helper";
+import { calculateD3Path } from "../../../test/helpers";
 
 describe("components/victory-area", () => {
   describe("default component rendering", () => {

packages/victory-area/tsconfig.build.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "exclude": ["**/*.test.*"]
+}

packages/victory-axis/tsconfig.build.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "exclude": ["**/*.test.*"]
+}

test/jest/victory-bar/bar.test.js → packages/victory-bar/src/bar.test.js

@@ -2,8 +2,8 @@ import React from "react";
 import { render } from "@testing-library/react";
 import * as d3Scale from "victory-vendor/d3-scale";
 import { VictoryContainer } from "victory-core";
-import { Bar } from "victory-bar";
-import { getBarShape } from "../../svg-test-helper";
+import Bar from "./bar";
+import { getBarShape } from "../../../test/helpers";
 
 describe("victory-primitives/bar", () => {
   const baseProps = {

test/jest/victory-bar/geometry-helper-methods.test.js → packages/victory-bar/src/geometry-helper-methods.test.js

@@ -1,4 +1,4 @@
-import { circle, point } from "victory-bar/lib/geometry-helper-methods";
+import { circle, point } from "./geometry-helper-methods";
 
 describe("point", () => {
   describe("calculates distances", () => {

test/jest/victory-bar/victory-bar.test.js → packages/victory-bar/src/victory-bar.test.js

@@ -1,11 +1,10 @@
-/*eslint-disable max-nested-callbacks */
-
-import React from "react";
+import * as React from "react";
 import { render, fireEvent, screen } from "@testing-library/react";
 import { range } from "lodash";
 import { VictoryChart } from "victory-chart";
-import { VictoryBar, Bar } from "victory-bar";
-import { isBar, getBarHeight } from "../../svg-test-helper";
+import VictoryBar from "./victory-bar";
+import Bar from "./bar";
+import { isBar, getBarHeight } from "../../../test/helpers";
 
 describe("components/victory-bar", () => {
   describe("default component rendering", () => {

packages/victory-bar/tsconfig.build.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "exclude": ["**/*.test.*"]
+}

test/jest/victory-box-plot/victory-box-plot.test.js → packages/victory-box-plot/src/victory-box-plot.test.js

@@ -1,7 +1,6 @@
-/*eslint-disable react/prop-types */
 import { render, screen } from "@testing-library/react";
 import React from "react";
-import { VictoryBoxPlot } from "victory-box-plot";
+import VictoryBoxPlot from "./victory-box-plot";
 import { VictoryChart } from "victory-chart";
 import { Border, LineSegment, Whisker } from "victory-core";
 

packages/victory-box-plot/tsconfig.build.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "exclude": ["**/*.test.*"]
+}

test/jest/victory-brush-container/brush-helpers.test.js → packages/victory-brush-container/src/brush-helpers.test.js

@@ -1,8 +1,7 @@
-import { BrushHelpers } from "victory-brush-container";
+import Helpers from "./brush-helpers";
 
 describe("containers/brush-helpers", () => {
-  const { withinBounds, constrainBox } = BrushHelpers;
-
+  const { withinBounds, constrainBox } = Helpers;
   describe("withinBounds", () => {
     it("returns true when within bounds", () => {
       const point = { x: 1, y: 1 };

packages/victory-brush-container/tsconfig.build.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "exclude": ["**/*.test.*"]
+}

packages/victory-brush-line/tsconfig.build.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "exclude": ["**/*.test.*"]
+}

test/jest/victory-candlestick/candle.test.js → packages/victory-candlestick/src/candle.test.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { render } from "@testing-library/react";
-import { Candle } from "victory-candlestick";
+import Candle from "./candle";
 import { VictoryContainer } from "victory-core";
 import * as d3Scale from "victory-vendor/d3-scale";
 

test/jest/victory-candlestick/helper-methods.test.js → packages/victory-candlestick/src/helper-methods.test.js

@@ -1,7 +1,6 @@
-/* eslint max-nested-callbacks: 0 */
 import { range } from "lodash";
 import { fromJS } from "immutable";
-import { getData, getDomain } from "victory-candlestick/lib/helper-methods";
+import { getData, getDomain } from "./helper-methods";
 
 const immutableGetDataTest = {
   createData: (x) => fromJS(x),

test/jest/victory-candlestick/victory-candlestick.test.js → packages/victory-candlestick/src/victory-candlestick.test.js

@@ -1,8 +1,8 @@
-/*eslint-disable max-nested-callbacks */
 import { fireEvent, render, screen } from "@testing-library/react";
 import { range } from "lodash";
 import React from "react";
-import { Candle, VictoryCandlestick } from "victory-candlestick";
+import Candle from "./candle";
+import VictoryCandlestick from "./victory-candlestick";
 import { VictoryChart } from "victory-chart";
 
 const MyCandle = () => <div data-testid="my-candle" />;

packages/victory-candlestick/tsconfig.build.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "exclude": ["**/*.test.*"]
+}

packages/victory-canvas/tsconfig.build.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "exclude": ["**/*.test.*"]
+}

test/jest/victory-chart/helper-methods.test.js → packages/victory-chart/src/helper-methods.test.js

@@ -1,4 +1,4 @@
-import { getChildComponents } from "victory-chart/lib/helper-methods";
+import { getChildComponents } from "./helper-methods";
 import React from "react";
 import { VictoryAxis } from "victory-axis";
 import { VictoryLine } from "victory-line";

packages/victory-chart/tsconfig.build.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "exclude": ["**/*.test.*"]
+}

test/jest/victory-core/victory-accessible-group/victory-accessible-group.test.tsx → packages/victory-core/src/victory-accessible-group/victory-accessible-group.test.tsx

@@ -1,12 +1,13 @@
 import { render } from "@testing-library/react";
 import React from "react";
-import { VictoryAccessibleGroup } from "victory-core";
+import { VictoryAccessibleGroup } from "./victory-accessible-group";
+import { SVGWrapper } from "../../../../test/helpers";
 
 describe("components/victory-accessible-group", () => {
   it("renders an g with an aria-label", () => {
     const { container } = render(
       <VictoryAccessibleGroup aria-label="test-aria-label" />,
-      { wrapper: "svg" }
+      { wrapper: SVGWrapper }
     );
     expect(container.querySelector("g")).toMatchInlineSnapshot(`
       <g
@@ -19,7 +20,7 @@ describe("components/victory-accessible-group", () => {
   it("renders an g with a tabIndex and className", () => {
     const { container } = render(
       <VictoryAccessibleGroup tabIndex={5} className="accessibility" />,
-      { wrapper: "svg" }
+      { wrapper: SVGWrapper }
     );
     expect(container.querySelector("g")).toMatchInlineSnapshot(`
       <g
@@ -36,7 +37,7 @@ describe("components/victory-accessible-group", () => {
         desc="test description"
         aria-describedby="describes group"
       />,
-      { wrapper: "svg" }
+      { wrapper: SVGWrapper }
     );
     expect(container.querySelector("g")).toMatchInlineSnapshot(`
       <g
@@ -59,7 +60,7 @@ describe("components/victory-accessible-group", () => {
         aria-label="desc node tests"
         desc="applies to both aria-describedby and descId"
       />,
-      { wrapper: "svg" }
+      { wrapper: SVGWrapper }
     );
     expect(container.querySelector("g")).toMatchInlineSnapshot(`
       <g

test/jest/victory-core/victory-animation/util.test.tsx → packages/victory-core/src/victory-animation/util.test.tsx

@@ -1,5 +1,5 @@
 /* eslint-disable no-unused-expressions */
-import { victoryInterpolator } from "victory-core/lib/victory-animation/util";
+import { victoryInterpolator } from "./util";
 
 describe("victoryInterpolator", () => {
   it("does not attempt to interpolate identical values", () => {

test/jest/victory-core/victory-container/victory-container.test.tsx → packages/victory-core/src/victory-container/victory-container.test.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { VictoryContainer } from "victory-core";
+import { VictoryContainer } from "./victory-container";
 import { fireEvent, render } from "@testing-library/react";
 
 describe("components/victory-container", () => {