From a616fd7875ad3e7c47a1d99d3e91c6ed0fe01f47 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 May 2021 17:22:27 +0000
Subject: [PATCH 1/2] Bump @types/mocha from 7.0.2 to 8.2.2

Bumps [@types/mocha](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/mocha) from 7.0.2 to 8.2.2.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/mocha)

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 96a7b306e4..40d34deaec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,7 @@
       },
       "devDependencies": {
         "@types/glob": "~7.1.3",
-        "@types/mocha": "~7.0.2",
+        "@types/mocha": "~8.2.2",
         "@types/mock-fs": "~4.13.0",
         "@types/node": "~14.17.0",
         "@types/node-fetch": "~2.5.10",
@@ -200,9 +200,9 @@
       "dev": true
     },
     "node_modules/@types/mocha": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-7.0.2.tgz",
-      "integrity": "sha512-ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w==",
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.2.tgz",
+      "integrity": "sha512-Lwh0lzzqT5Pqh6z61P3c3P5nm6fzQK/MMHl9UKeneAeInVflBSz1O2EkX6gM6xfJd7FBXBY5purtLx7fUiZ7Hw==",
       "dev": true
     },
     "node_modules/@types/mock-fs": {
@@ -4100,9 +4100,9 @@
       "dev": true
     },
     "@types/mocha": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-7.0.2.tgz",
-      "integrity": "sha512-ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w==",
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.2.tgz",
+      "integrity": "sha512-Lwh0lzzqT5Pqh6z61P3c3P5nm6fzQK/MMHl9UKeneAeInVflBSz1O2EkX6gM6xfJd7FBXBY5purtLx7fUiZ7Hw==",
       "dev": true
     },
     "@types/mock-fs": {
diff --git a/package.json b/package.json
index 64cd249db8..2b0b04ad01 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
   },
   "devDependencies": {
     "@types/glob": "~7.1.3",
-    "@types/mocha": "~7.0.2",
+    "@types/mocha": "~8.2.2",
     "@types/mock-fs": "~4.13.0",
     "@types/node": "~14.17.0",
     "@types/node-fetch": "~2.5.10",

From 6d222f60cb1be7133bef19386a85e5a31c498be8 Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andrew@schwartzmeyer.com>
Date: Fri, 21 May 2021 10:39:53 -0700
Subject: [PATCH 2/2] Fix deprecated use of `mocha`

The `useColors` option was replaced with `color`.
---
 test/testRunner.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/testRunner.ts b/test/testRunner.ts
index fdd927358c..7d19dedb68 100644
--- a/test/testRunner.ts
+++ b/test/testRunner.ts
@@ -9,7 +9,7 @@ export function run(): Promise<void> {
     // Create the mocha test
     const mocha = new Mocha({
         ui: "tdd",         // the TDD UI is being used in extension.test.ts (suite, test, etc.)
-        useColors: !process.env.TF_BUILD, // colored output from test results
+        color: !process.env.TF_BUILD, // colored output from test results
         reporter: "mocha-multi-reporters",
         timeout: 5000,
         reporterOptions: {