From 2ff41f7a506ee5f6211f68b176ab597ed087c868 Mon Sep 17 00:00:00 2001
From: Elliot DeNolf <denolfe@gmail.com>
Date: Mon, 11 Sep 2023 17:22:02 -0400
Subject: [PATCH] chore: more tests commands to top level

---
 .github/workflows/tests.yml                |  8 ++++----
 package.json                               |  4 ++--
 packages/payload/jest.components.config.js | 16 ----------------
 packages/payload/package.json              |  3 ---
 4 files changed, 6 insertions(+), 25 deletions(-)
 delete mode 100644 packages/payload/jest.components.config.js

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 43c4ca6beb..8dee497e18 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -47,18 +47,18 @@ jobs:
         run: pnpm install
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-      - run: pnpm --filter payload build
+      - run: pnpm build
 
       - name: Component Tests
-        run: pnpm --filter payload run test:components
+        run: pnpm test:components
 
       - name: Install Playwright Browsers
         run: npx playwright install --with-deps
       - name: E2E Tests
-        run: pnpm --filter payload test:e2e --bail
+        run: pnpm test:e2e --bail
 
       - name: Integration Tests
-        run: pnpm --filter payload run test:int
+        run: pnpm test:int
 
       - name: Generate Payload Types
         run: pnpm dev:generate-types fields
diff --git a/package.json b/package.json
index 1c2ef6e8e9..5d8105fab2 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "clean:cache": "rimraf node_modules/.cache && rimraf packages/payload/node_modules/.cache",
     "clean:unix": "find . \\( -type d \\( -name node_modules -o -name dist -o -name .cache \\) -o -type f -name tsconfig.tsbuildinfo \\) -exec rm -rf {} +",
     "dev": "pnpm --filter payload run dev",
-    "dev:generate-graphql-schema": "pnpm --filter payload run dev:generate-graphql-schema",
+    "dev:generate-graphql-schema": "ts-node -T ./test/generateGraphQLSchema.ts",
     "dev:generate-types": "pnpm --filter payload run dev:generate-types",
     "dev:postgres": "pnpm --filter payload run dev:postgres",
     "fix": "eslint \"src/**/*.ts\" --fix",
@@ -62,7 +62,7 @@
     "release:minor": "release-it minor",
     "release:patch": "release-it patch",
     "test": "pnpm test:int && pnpm test:components && pnpm test:e2e",
-    "test:components": "pnpm --filter payload run test:components",
+    "test:components": "cross-env jest --config=jest.components.config.js",
     "test:e2e": "ts-node -T ./test/runE2E.ts",
     "test:e2e:debug": "cross-env PWDEBUG=1 DISABLE_LOGGING=true playwright test",
     "test:e2e:headed": "cross-env DISABLE_LOGGING=true playwright test --headed",
diff --git a/packages/payload/jest.components.config.js b/packages/payload/jest.components.config.js
deleted file mode 100644
index 12d8963145..0000000000
--- a/packages/payload/jest.components.config.js
+++ /dev/null
@@ -1,16 +0,0 @@
-module.exports = {
-  moduleNameMapper: {
-    '\\.(css|scss)$': '<rootDir>/src/bundlers/mocks/emptyModule.js',
-    '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
-      '<rootDir>/src/bundlers/mocks/fileMock.js',
-  },
-  setupFilesAfterEnv: ['../../test/componentsSetup.js'],
-  testEnvironment: 'jsdom',
-  testPathIgnorePatterns: ['node_modules', 'dist'],
-  testRegex: '(/src/admin/.*\\.(test|spec))\\.[jt]sx?$',
-  testTimeout: 15000,
-  transform: {
-    '^.+\\.(t|j)sx?$': ['@swc/jest'],
-  },
-  verbose: true,
-}
diff --git a/packages/payload/package.json b/packages/payload/package.json
index 05cb4bd3a6..d20c571d26 100644
--- a/packages/payload/package.json
+++ b/packages/payload/package.json
@@ -276,8 +276,6 @@
     "clean:cache": "rimraf node_modules/.cache",
     "copyfiles": "copyfiles -u 1 \"src/**/*.{html,css,scss,ttf,woff,woff2,eot,svg,jpg,png,json}\" dist/",
     "dev": "nodemon",
-    "dev:generate-graphql-schema": "ts-node -T ../../test/generateGraphQLSchema.ts",
-    "dev:generate-types": "ts-node -T ../../test/generateTypes.ts",
     "dev:postgres": "cross-env PAYLOAD_DATABASE=postgres nodemon",
     "fix": "eslint \"src/**/*.ts\" --fix",
     "lint": "eslint \"src/**/*.ts\"",
@@ -287,7 +285,6 @@
     "release:major": "release-it major",
     "release:minor": "release-it minor",
     "release:patch": "release-it patch",
-    "test:components": "cross-env jest --config=jest.components.config.js",
     "translateNewKeys": "ts-node -T ./scripts/translateNewKeys.ts"
   },
   "sideEffects": false,