Uniformify tests structure (#267)

* chore: remove one-off Jest snapshot for consistency

* chore: refactor test structure to be consistent

- No `wire/tests/` directory, instead tests are moved to be sibling
  files in `src/` like the other packages.
- Removed root level Jest config and script, and instead leverages
  Lerna to run `test` in each package.
- `example` package's `test` script now just runs the integration test
  (rather than erroring).
- Github Actions workflow updated to simply run `npm test` (rather than
  being split into multiple jobs).

.github/workflows/main.yml

@@ -18,13 +18,3 @@ jobs:
         run: npx lerna bootstrap && npm run build
       - name: Run tests
         run: npm test
-
-  test_integration:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - run: npm ci
-      - name: Bootstrap packages
-        run: npx lerna bootstrap && npm run build
-      - name: Run integration tests
-        run: npm run test:integration

package.json

@@ -9,8 +9,7 @@
     "watch": "lerna run --parallel watch",
     "lint": "tslint --project tsconfig.json -t verbose",
     "lint!": "npm run lint -- --fix",
-    "test": "npm run lint && jest",
-    "test:integration": "cd packages/example && docker-compose run test"
+    "test": "npm run lint && lerna run test"
   },
   "devDependencies": {
     "@types/jest": "26.0.23",
@@ -27,11 +26,5 @@
   },
   "dependencies": {
     "io-ts": "^2.1.2"
-  },
-  "jest": {
-    "testRegex": "(/tests/.*|(\\.|/)test)\\.tsx?$",
-    "transform": {
-      "^.+\\.tsx?$": "ts-jest"
-    }
   }
 }

packages/cli/package.json

@@ -19,6 +19,7 @@
     "roots": [
       "src"
     ],
+    "testRegex": "\\.test\\.tsx?$",
     "transform": {
       "^.+\\.tsx?$": "ts-jest"
     }

packages/cli/src/generator.test.ts

@@ -139,7 +139,26 @@ export interface IGetNotificationsQuery {
         types,
         {} as ParsedConfig,
       );
-      expect(result).toMatchSnapshot();
+      const expected = `/** 'InsertNotifications' parameters type */
+export interface IInsertNotificationsParams {
+  notification: {
+    payload: Json | null | void,
+    user_id: string | null | void,
+    type: string | null | void
+  };
+}
+
+/** 'InsertNotifications' return type */
+export type IInsertNotificationsResult = void;
+
+/** 'InsertNotifications' query type */
+export interface IInsertNotificationsQuery {
+  params: IInsertNotificationsParams;
+  result: IInsertNotificationsResult;
+}
+
+`;
+      expect(result).toEqual(expected);
     });
 
     test(`DeleteUsers by UUID (${mode})`, async () => {

packages/cli/tsconfig.json

@@ -4,6 +4,6 @@
     "outDir": "./lib/" /* Redirect output structure to the directory. */,
     "rootDir": "./src/" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
   },
-  "exclude": ["tests", "lib"],
+  "exclude": ["lib"],
   "include": ["./src"]
 }

packages/example/package.json

@@ -14,7 +14,7 @@
     "lib"
   ],
   "scripts": {
-    "test": "echo \"Error: run tests from root\" && exit 1",
+    "test": "docker-compose run test",
     "typegen": "pgtyped -c config.json",
     "build": "tsc --declaration",
     "watch": "tsc --declaration --watch --preserveWatchOutput",

packages/example/tsconfig.json

@@ -25,7 +25,6 @@
     /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
   },
   "exclude": [
-    "tests",
     "lib"
   ],
   "include": [

packages/query/package.json

@@ -19,6 +19,7 @@
     "roots": [
       "src"
     ],
+    "testRegex": "\\.test\\.tsx?$",
     "transform": {
       "^.+\\.tsx?$": "ts-jest"
     }

packages/query/tsconfig.json

@@ -4,6 +4,6 @@
     "outDir": "./lib/" /* Redirect output structure to the directory. */,
     "rootDir": "./src/" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
   },
-  "exclude": ["tests", "lib"],
+  "exclude": ["lib"],
   "include": ["./src"]
 }

packages/wire/package.json

@@ -14,7 +14,10 @@
     "watch": "tsc --declaration --watch --preserveWatchOutput"
   },
   "jest": {
-    "testRegex": "(/tests/.*|(\\.|/)test)\\.tsx?$",
+    "roots": [
+      "src"
+    ],
+    "testRegex": "\\.test\\.tsx?$",
     "transform": {
       "^.+\\.tsx?$": "ts-jest"
     }

packages/wire/tsconfig.json

@@ -4,6 +4,6 @@
     "outDir": "./lib/" /* Redirect output structure to the directory. */,
     "rootDir": "./src/" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
   },
-  "exclude": ["tests", "lib"],
+  "exclude": ["lib"],
   "include": ["./src"]
 }