Merge pull request #4 from promaster-sdk/test-folders

Test file locations
promaster-sdk · Oct 20, 2019 · 39ff7ea · 39ff7ea
2 parents d65dfcb + 481d4d7
commit 39ff7ea
Show file tree

Hide file tree

Showing 46 changed files with 149 additions and 138 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -5,3 +5,7 @@ node_modules/
 
 # Don't lint build-output in test folders (test/lib)
 lib/
+
+# Root files
+jest-snapshot-resolver.js
+jest.config.js
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -4,15 +4,10 @@ module.exports = {
     project: [
       "./packages/_stories/tsconfig.json",
       "./packages/property/tsconfig.json",
-      "./packages/property/test/tsconfig.json",
       "./packages/property-filter-pretty/tsconfig.json",
-      "./packages/property-filter-pretty/test/tsconfig.json",
       "./packages/react-properties-selector/tsconfig.json",
-      "./packages/react-properties-selector/test/tsconfig.json",
       "./packages/react-property-selectors/tsconfig.json",
-      "./packages/react-property-selectors/test/tsconfig.json",
-      "./packages/variant-listing/tsconfig.json",
-      "./packages/variant-listing/test/tsconfig.json"
+      "./packages/variant-listing/tsconfig.json"
     ]
   },
   rules: {

diff --git a/jest.config.js b/jest.config.js
@@ -1,12 +1,65 @@
 module.exports = {
-  projects: ["<rootDir>/packages/test/*"],
-  preset: "ts-jest",
+  // projects: [
+  //   {
+  //     displayName: "property",
+  //     preset: "ts-jest",
+  //     globals: {
+  //       "ts-jest": {
+  //         tsConfig: "<rootDir>/packages/property/tsconfig.json"
+  //       }
+  //     },
+  //     testMatch: ["<rootDir>/packages/property/**/*.test.ts?(x)"]
+  //   },
+  //   {
+  //     displayName: "property-filter-pretty",
+  //     preset: "ts-jest",
+  //     globals: {
+  //       "ts-jest": {
+  //         tsConfig: "<rootDir>/packages/property-filter-pretty/tsconfig.json"
+  //       }
+  //     },
+  //     testMatch: ["<rootDir>/packages/property-filter-pretty/**/*.test.ts?(x)"]
+  //   },
+  //   {
+  //     displayName: "react-properties-selector",
+  //     preset: "ts-jest",
+  //     globals: {
+  //       "ts-jest": {
+  //         tsConfig: "<rootDir>/packages/react-properties-selector/tsconfig.json"
+  //       }
+  //     },
+  //     testMatch: [
+  //       "<rootDir>/packages/react-properties-selector/**/*.test.ts?(x)"
+  //     ]
+  //   },
+  //   {
+  //     displayName: "react-property-selectors",
+  //     preset: "ts-jest",
+  //     globals: {
+  //       "ts-jest": {
+  //         tsConfig: "<rootDir>/packages/react-property-selectors/tsconfig.json"
+  //       }
+  //     },
+  //     testMatch: [
+  //       "<rootDir>/packages/react-property-selectors/**/*.test.ts?(x)"
+  //     ]
+  //   },
+  //   {
+  //     displayName: "variant-listing",
+  //     preset: "ts-jest",
+  //     globals: {
+  //       "ts-jest": {
+  //         tsConfig: "<rootDir>/packages/variant-listing/tsconfig.json"
+  //       }
+  //     },
+  //     testMatch: ["<rootDir>/packages/variant-listing/**/*.test.ts?(x)"]
+  //   }
+  // ],
+  projects: ["<rootDir>/packages/*/jest.config.js"],
   coverageDirectory: "<rootDir>/coverage/",
-  collectCoverageFrom: ["<rootDir>/packages/*/src/**/*.{ts,tsx}"],
-  coverageReporters: ["text-summary", "lcov"],
-  globals: {
-    "ts-jest": {
-      tsConfig: "<rootDir>/packages/tsconfig.settings.json"
-    }
-  }
+  collectCoverageFrom: [
+    "<rootDir>/packages/*/src/**/*.ts?(x)",
+    "!<rootDir>/packages/_stories/**/*",
+    "!<rootDir>/packages/*/src/**/*.test.ts?(x)"
+  ]
 };
diff --git a/package.json b/package.json
@@ -60,7 +60,8 @@
     "storybook": "yarn build && run-p -l start storybook:start",
     "storybook:start": "start-storybook -p 6006",
     "build-storybook": "build-storybook",
-    "test": "jest",
+    "test": "run-s build test-all",
+    "test-all": "jest",
     "test:property": "jest --projects packages/property",
     "test:property-filter-pretty": "jest --projects packages/property-filter-pretty",
     "test:react-property-selectors": "jest --projects packages/react-property-selectors",

diff --git a/packages/property-filter-pretty/.npmignore b/packages/property-filter-pretty/.npmignore
@@ -0,0 +1,5 @@
+**/__mocks__/**
+**/__tests__/**
+src
+tsconfig.json
+tsconfig.tsbuildinfo
diff --git a/packages/property-filter-pretty/jest.config.js b/packages/property-filter-pretty/jest.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  displayName: "property-filter-pretty",
+  preset: "ts-jest",
+  testMatch: ["<rootDir>/src/**/*.test.ts?(x)"]
+};
diff --git a/packages/property-filter-pretty/package.json b/packages/property-filter-pretty/package.json
@@ -20,13 +20,6 @@
     "promaster",
     "promaster-sdk"
   ],
-  "files": [
-    "/lib",
-    "package.json",
-    "CHANGELOG.md",
-    "LICENSE",
-    "README.md"
-  ],
   "dependencies": {
     "@promaster-sdk/property": "^2.4.0",
     "ts-exhaustive-check": "^1.0.0",

diff --git a/...r-pretty/test/src/pretty-printing.test.ts → ...tty/src/__tests__/pretty-printing.test.ts b/...r-pretty/test/src/pretty-printing.test.ts → ...tty/src/__tests__/pretty-printing.test.ts
@@ -1,5 +1,5 @@
 import { PropertyFilter } from "@promaster-sdk/property";
-import * as PrettyPrinting from "@promaster-sdk/property-filter-pretty";
+import * as PrettyPrinting from "../index";
 
 describe("filterPrettyPrintSimple", () => {
   it("should print a must be 1", () => {

diff --git a/packages/property-filter-pretty/test/jest.config.js b/packages/property-filter-pretty/test/jest.config.js
diff --git a/packages/property-filter-pretty/test/tsconfig.json b/packages/property-filter-pretty/test/tsconfig.json
diff --git a/packages/property-filter-pretty/tsconfig.json b/packages/property-filter-pretty/tsconfig.json
@@ -5,7 +5,7 @@
     "outDir": "lib",
     "rootDir": "src",
     "lib": ["dom", "es2015", "es2017.object", "esnext.asynciterable"],
-    "types": ["node"]
+    "types": ["node", "jest"]
   },
   "references": [{ "path": "../property" }]
 }
diff --git a/packages/property/.npmignore b/packages/property/.npmignore
@@ -0,0 +1,5 @@
+**/__mocks__/**
+**/__tests__/**
+src
+tsconfig.json
+tsconfig.tsbuildinfo
diff --git a/packages/property/jest.config.js b/packages/property/jest.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  displayName: "property",
+  preset: "ts-jest",
+  testMatch: ["<rootDir>/src/**/*.test.ts?(x)"]
+};
diff --git a/packages/property/package.json b/packages/property/package.json
@@ -20,13 +20,6 @@
     "promaster",
     "promaster-sdk"
   ],
-  "files": [
-    "/lib",
-    "package.json",
-    "CHANGELOG.md",
-    "LICENSE",
-    "README.md"
-  ],
   "dependencies": {
     "uom": "^2.3.0"
   }

diff --git a/...est/src/data/property-filter-ast-parse.ts → ...tests__/data/property-filter-ast-parse.ts b/...est/src/data/property-filter-ast-parse.ts → ...tests__/data/property-filter-ast-parse.ts
@@ -1,4 +1,4 @@
-import { PropertyFilterAst } from "@promaster-sdk/property";
+import * as PropertyFilterAst from "../../property-filter-ast";
 
 const {
   newIdentifierExpr,

diff --git a/...c/data/property-filter-is-syntax-valid.ts → ..._/data/property-filter-is-syntax-valid.ts b/...c/data/property-filter-is-syntax-valid.ts → ..._/data/property-filter-is-syntax-valid.ts
diff --git a/.../test/src/data/property-filter-isvalid.ts → ...__tests__/data/property-filter-isvalid.ts b/.../test/src/data/property-filter-isvalid.ts → ...__tests__/data/property-filter-isvalid.ts
@@ -1,6 +1,6 @@
 import { Amount } from "uom";
-import { PropertyValue } from "@promaster-sdk/property";
-import { compareNumbers } from "@promaster-sdk/property/lib/utils/compare-utils";
+import * as PropertyValue from "../../property-value";
+import { compareNumbers } from "../../utils/compare-utils";
 
 export const tests = [
   {

diff --git a/...erty/test/src/property-filter-ast.test.ts → ...src/__tests__/property-filter-ast.test.ts b/...erty/test/src/property-filter-ast.test.ts → ...src/__tests__/property-filter-ast.test.ts
@@ -1,8 +1,6 @@
-import {
-  PropertyFilterAst as Ast,
-  PropertyValueSet,
-  PropertyValue
-} from "@promaster-sdk/property";
+import * as Ast from "../property-filter-ast";
+import * as PropertyValueSet from "../property-value-set";
+import * as PropertyValue from "../property-value";
 import * as ParseData from "./data/property-filter-ast-parse";
 import * as IsValidData from "./data/property-filter-isvalid";
 

diff --git a/...property/test/src/property-filter.test.ts → ...rty/src/__tests__/property-filter.test.ts b/...property/test/src/property-filter.test.ts → ...rty/src/__tests__/property-filter.test.ts
@@ -1,4 +1,5 @@
-import { PropertyFilter, PropertyValueSet } from "@promaster-sdk/property";
+import * as PropertyFilter from "../property-filter";
+import * as PropertyValueSet from "../property-value-set";
 import * as IsValidData from "./data/property-filter-isvalid";
 import * as IsSyntaxValidData from "./data/property-filter-is-syntax-valid";
 

diff --git a/...perty/test/src/property-value-set.test.ts → .../src/__tests__/property-value-set.test.ts b/...perty/test/src/property-value-set.test.ts → .../src/__tests__/property-value-set.test.ts
@@ -1,5 +1,6 @@
-import { PropertyValueSet, PropertyValue } from "@promaster-sdk/property";
 import { Units, Amount } from "uom";
+import * as PropertyValueSet from "../property-value-set";
+import * as PropertyValue from "../property-value";
 
 describe("PropertyValueSet", () => {
   describe("getValue", () => {

diff --git a/.../property/test/src/property-value.test.ts → ...erty/src/__tests__/property-value.test.ts b/.../property/test/src/property-value.test.ts → ...erty/src/__tests__/property-value.test.ts
@@ -1,5 +1,5 @@
 import { Units, Amount, Quantity } from "uom";
-import { PropertyValue } from "@promaster-sdk/property";
+import * as PropertyValue from "../property-value";
 
 describe("PropertyValue", () => {
   it("should_parse_amount_with_decimal_dot", () => {

diff --git a/packages/property/test/tsconfig.json b/packages/property/test/tsconfig.json
diff --git a/packages/property/tsconfig.json b/packages/property/tsconfig.json
@@ -5,8 +5,7 @@
     "outDir": "lib",
     "rootDir": "src",
     "lib": ["dom", "es2015", "es2017.object", "esnext.asynciterable"],
-    // If we do not specify this we get clashes in global types
-    "types": ["node"]
+    "types": ["node", "jest"]
   },
   "references": []
 }
diff --git a/packages/react-properties-selector/.npmignore b/packages/react-properties-selector/.npmignore
@@ -0,0 +1,5 @@
+**/__mocks__/**
+**/__tests__/**
+src
+tsconfig.json
+tsconfig.tsbuildinfo
diff --git a/packages/react-properties-selector/jest.config.js b/packages/react-properties-selector/jest.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  displayName: "react-properties-selector",
+  preset: "ts-jest",
+  testMatch: ["<rootDir>/src/**/*.test.ts?(x)"]
+};
diff --git a/packages/react-properties-selector/package.json b/packages/react-properties-selector/package.json
@@ -20,13 +20,6 @@
     "promaster",
     "promaster-sdk"
   ],
-  "files": [
-    "/lib",
-    "package.json",
-    "CHANGELOG.md",
-    "LICENSE",
-    "README.md"
-  ],
   "dependencies": {
     "@promaster-sdk/property": "^2.4.0",
     "@promaster-sdk/property-filter-pretty": "^2.5.0",

diff --git a/...shots__/properties-selector.test.tsx.snap → ...shots__/properties-selector.test.tsx.snap b/...shots__/properties-selector.test.tsx.snap → ...shots__/properties-selector.test.tsx.snap
@@ -354,7 +354,7 @@ exports[`Simple PropertiesSelector 1`] = `
                     "background": "green",
                     "backgroundColor": "#ccc",
                     "height": "22px",
-                    "marginTop": "5px",
+                    "marginTop": "6px",
                     "position": "relative",
                     "width": "22px",
                   }

diff --git a/...tor/test/src/properties-selector.test.tsx → ...rc/__tests__/properties-selector.test.tsx b/...tor/test/src/properties-selector.test.tsx → ...rc/__tests__/properties-selector.test.tsx
@@ -1,11 +1,11 @@
 import React from "react";
 import * as renderer from "react-test-renderer";
-import * as PropertiesSelector from "@promaster-sdk/react-properties-selector";
 import {
   PropertyFilter,
   PropertyValue,
   PropertyValueSet
 } from "@promaster-sdk/property";
+import * as PropertiesSelector from "../index";
 
 test("Simple PropertiesSelector", () => {
   const productProperties = exampleProductProperties();

diff --git a/packages/react-properties-selector/test/tsconfig.json b/packages/react-properties-selector/test/tsconfig.json
diff --git a/packages/react-properties-selector/tsconfig.json b/packages/react-properties-selector/tsconfig.json
@@ -5,7 +5,7 @@
     "outDir": "lib",
     "rootDir": "src",
     "lib": ["dom", "es2015", "es2017.object", "esnext.asynciterable"],
-    "types": ["node"]
+    "types": ["node", "jest"]
   },
   "references": [
     { "path": "../property" },

diff --git a/packages/react-property-selectors/.npmignore b/packages/react-property-selectors/.npmignore
@@ -0,0 +1,5 @@
+**/__mocks__/**
+**/__tests__/**
+src
+tsconfig.json
+tsconfig.tsbuildinfo
diff --git a/packages/react-property-selectors/jest.config.js b/packages/react-property-selectors/jest.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  displayName: "react-property-selectors",
+  preset: "ts-jest",
+  testMatch: ["<rootDir>/src/**/*.test.ts?(x)"]
+};
diff --git a/packages/react-property-selectors/package.json b/packages/react-property-selectors/package.json
@@ -20,13 +20,6 @@
     "promaster",
     "promaster-sdk"
   ],
-  "files": [
-    "/lib",
-    "package.json",
-    "CHANGELOG.md",
-    "LICENSE",
-    "README.md"
-  ],
   "dependencies": {
     "@promaster-sdk/property": "^2.4.0",
     "@promaster-sdk/property-filter-pretty": "^2.5.0",

diff --git a/.../checkbox-property-selector.test.tsx.snap → .../checkbox-property-selector.test.tsx.snap b/.../checkbox-property-selector.test.tsx.snap → .../checkbox-property-selector.test.tsx.snap
@@ -25,7 +25,7 @@ exports[`Simple CheckboxPropertySelector 1`] = `
         "background": "green",
         "backgroundColor": "#ccc",
         "height": "22px",
-        "marginTop": "5px",
+        "marginTop": "6px",
         "position": "relative",
         "width": "22px",
       }

diff --git a/...t/src/checkbox-property-selector.test.tsx → ...sts__/checkbox-property-selector.test.tsx b/...t/src/checkbox-property-selector.test.tsx → ...sts__/checkbox-property-selector.test.tsx
@@ -8,7 +8,7 @@ import {
 import {
   createCheckboxPropertySelector,
   CheckboxPropertyValueItem
-} from "@promaster-sdk/react-property-selectors";
+} from "../index";
 
 const CheckboxPropertySelector = createCheckboxPropertySelector({});
 

diff --git a/packages/react-property-selectors/src/checkbox/checkbox-property-selector.tsx b/packages/react-property-selectors/src/checkbox/checkbox-property-selector.tsx
@@ -64,7 +64,7 @@ const defaultCheckbox = (props: CheckboxProps): JSX.Element => (
   <div
     {...props}
     style={{
-      marginTop: "5px",
+      marginTop: "6px",
       position: "relative",
       backgroundColor: "#ccc",
       width: "22px",

diff --git a/packages/react-property-selectors/test/tsconfig.json b/packages/react-property-selectors/test/tsconfig.json