From f1c309a1633a3fba9194ad1511dca23357d14c18 Mon Sep 17 00:00:00 2001
From: Daz DeBoer <daz@gradle.com>
Date: Sun, 15 May 2022 09:46:37 -0600
Subject: [PATCH] Simplify Jest setup

- Remove explicit dependency on jest-circus: this is now the default runner
- Remove test timeout setting
- Remove @types/jest from explicit dependencies
---
 jest.config.js    | 4 +---
 jest.setup.js     | 1 -
 package-lock.json | 6 ++++--
 package.json      | 2 --
 4 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100644 jest.setup.js

diff --git a/jest.config.js b/jest.config.js
index b205d1b..6c82c17 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -3,10 +3,8 @@ module.exports = {
   moduleFileExtensions: ['js', 'ts', 'json'],
   testEnvironment: 'node',
   testMatch: ['**/*.test.ts'],
-  testRunner: 'jest-circus/runner',
   transform: {
     '^.+\\.ts$': 'ts-jest'
   },
-  verbose: true,
-  setupFilesAfterEnv: ['./jest.setup.js']
+  verbose: true
 }
diff --git a/jest.setup.js b/jest.setup.js
deleted file mode 100644
index 132fbcc..0000000
--- a/jest.setup.js
+++ /dev/null
@@ -1 +0,0 @@
-jest.setTimeout(10000) // in milliseconds
diff --git a/package-lock.json b/package-lock.json
index e10b773..4d743e2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,6 @@
         "string-argv": "0.3.1"
       },
       "devDependencies": {
-        "@types/jest": "27.4.1",
         "@types/node": "16.11.21",
         "@types/unzipper": "0.10.5",
         "@typescript-eslint/parser": "5.23.0",
@@ -29,7 +28,6 @@
         "eslint-plugin-github": "4.3.6",
         "eslint-plugin-jest": "26.2.0",
         "jest": "27.5.1",
-        "jest-circus": "27.5.1",
         "js-yaml": "4.1.0",
         "patch-package": "6.4.7",
         "prettier": "2.6.2",
@@ -1606,6 +1604,8 @@
       "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.4.1.tgz",
       "integrity": "sha512-23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "jest-matcher-utils": "^27.0.0",
         "pretty-format": "^27.0.0"
@@ -8401,6 +8401,8 @@
       "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.4.1.tgz",
       "integrity": "sha512-23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
         "jest-matcher-utils": "^27.0.0",
         "pretty-format": "^27.0.0"
diff --git a/package.json b/package.json
index f4c3bde..c3a733c 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,6 @@
     "string-argv": "0.3.1"
   },
   "devDependencies": {
-    "@types/jest": "27.4.1",
     "@types/node": "16.11.21",
     "@types/unzipper": "0.10.5",
     "@typescript-eslint/parser": "5.23.0",
@@ -43,7 +42,6 @@
     "eslint-plugin-github": "4.3.6",
     "eslint-plugin-jest": "26.2.0",
     "jest": "27.5.1",
-    "jest-circus": "27.5.1",
     "js-yaml": "4.1.0",
     "patch-package": "6.4.7",
     "prettier": "2.6.2",