From d819a76ae8759743fc30bd6fdf141bfa0441dfef Mon Sep 17 00:00:00 2001
From: Paul Barry <devlab2425@gmail.com>
Date: Wed, 18 Oct 2023 17:37:13 -0400
Subject: [PATCH 01/10] Issue 1016: Initital attempt at using fetch over
 request

---
 .../develop.default/develop.default.spec.js   | 33 +++++--------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/packages/plugin-typescript/test/cases/develop.default/develop.default.spec.js b/packages/plugin-typescript/test/cases/develop.default/develop.default.spec.js
index b99d5d05d..5414e6581 100644
--- a/packages/plugin-typescript/test/cases/develop.default/develop.default.spec.js
+++ b/packages/plugin-typescript/test/cases/develop.default/develop.default.spec.js
@@ -18,7 +18,6 @@
  */
 import chai from 'chai';
 import path from 'path';
-import request from 'request';
 import { Runner } from 'gallinago';
 import { fileURLToPath, URL } from 'url';
 import { runSmokeTest } from '../../../../../test/smoke-test.js';
@@ -58,37 +57,23 @@ describe('Develop Greenwood With: ', function() {
 
     describe('Develop command specific .ts behaviors', function() {
       let response = {};
+      let data;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://127.0.0.1:${port}/main.ts`
-          }, (err, res) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-
-            resolve();
-          });
-        });
+        response = await fetch(`http://127.0.0.1:${port}/main.ts`);
+        data = await response.text();
       });
 
-      it('should return a 200', function(done) {
-        expect(response.statusCode).to.equal(200);
-
-        done();
+      it('should return a 200', function() {
+        expect(response.status).to.equal(200);
       });
 
-      it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/javascript');
-        done();
+      it('should return the correct content type', function() {
+        expect(response.headers.get('content-type')).to.contain('text/javascript');
       });
 
-      it('should return an ECMAScript module', function(done) {
-        expect(response.body.trim().indexOf('const user')).to.equal(0);
-        done();
+      it('should return an ECMAScript module', function() {
+        expect(data.trim().indexOf('const user')).to.equal(0);
       });
     });
   });

From 23f9a3907d2366e98219f11fa45c897a6761be1c Mon Sep 17 00:00:00 2001
From: Paul Barry <devlab2425@gmail.com>
Date: Wed, 18 Oct 2023 22:33:08 -0400
Subject: [PATCH 02/10] Issue-1016: Refactor IP to use localhost url

---
 .../cases/serve.default/serve.default.spec.js | 32 ++++++-------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/packages/cli/test/cases/serve.default/serve.default.spec.js b/packages/cli/test/cases/serve.default/serve.default.spec.js
index d30ace017..0677e8d88 100644
--- a/packages/cli/test/cases/serve.default/serve.default.spec.js
+++ b/packages/cli/test/cases/serve.default/serve.default.spec.js
@@ -46,7 +46,7 @@ describe('Serve Greenwood With: ', function() {
   const LABEL = 'Default Greenwood Configuration and Workspace';
   const cliPath = path.join(process.cwd(), 'packages/cli/src/index.js');
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
-  const hostname = 'http://127.0.0.1:8181';
+  const hostname = 'http://localhost:8181';
   let runner;
 
   before(function() {
@@ -76,35 +76,23 @@ describe('Serve Greenwood With: ', function() {
     // proxies to https://jsonplaceholder.typicode.com/posts via greenwood.config.js
     describe('Serve command with dev proxy', function() {
       let response = {};
+      let data;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/posts?id=7`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = JSON.parse(body);
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/posts?id=7`);
+        data = await response.json();
       });
 
-      it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
-        done();
+      it('should return a 200 status', function() {
+        expect(response.status).to.equal(200);
       });
 
-      it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('application/json; charset=utf-8');
-        done();
+      it('should return the correct content type', function() {
+        expect(response.headers.get('content-type')).to.equal('application/json; charset=utf-8');
       });
 
-      it('should return the correct response body', function(done) {
-        expect(response.body).to.have.lengthOf(1);
-        done();
+      it('should return the correct response body', function() {
+        expect(data).to.have.lengthOf(1);
       });
     });
 

From 4b5bcfe2c8a5478176a559b7aa479f235e5eef5a Mon Sep 17 00:00:00 2001
From: Paul Barry <devlab2425@gmail.com>
Date: Wed, 18 Oct 2023 21:38:59 -0400
Subject: [PATCH 03/10] Issue-1016: Initial POST refactor to fetch

---
 .../develop.default/develop.default.spec.js   | 42 ++++++-------------
 1 file changed, 13 insertions(+), 29 deletions(-)

diff --git a/packages/cli/test/cases/develop.default/develop.default.spec.js b/packages/cli/test/cases/develop.default/develop.default.spec.js
index 602b1e08a..3c89be0ce 100644
--- a/packages/cli/test/cases/develop.default/develop.default.spec.js
+++ b/packages/cli/test/cases/develop.default/develop.default.spec.js
@@ -1470,46 +1470,30 @@ describe('Develop Greenwood With: ', function() {
     describe('Develop command with POST API specific behaviors for JSON', function() {
       const param = 'Greenwood';
       let response = {};
+      let data;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.post({
-            url: `${hostname}:${port}/api/submit-json`,
-            json: true,
-            body: { name: param }
-          }, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve(response);
-          });
+        response = await fetch(`${hostname}:${port}/api/submit-json`, {
+          method: 'POST',
+          body: JSON.stringify({ name: param })
         });
+        data = await response.json();
       });
 
-      it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
-        done();
+      it('should return a 200 status', function() {
+        expect(response.status).to.equal(200);
       });
 
-      it('should return the expected response message', function(done) {
-        const { message } = response.body;
-
-        expect(message).to.equal(`Thank you ${param} for your submission!`);
-        done();
+      it('should return the expected response message', function() {
+        expect(data.message).to.equal(`Thank you ${param} for your submission!`);
       });
 
-      it('should return the expected content type header', function(done) {
-        expect(response.headers['content-type']).to.equal('application/json');
-        done();
+      it('should return the expected content type header', function() {
+        expect(response.headers.get('content-type')).to.equal('application/json');
       });
 
-      it('should return the secret header in the response', function(done) {
-        expect(response.headers['x-secret']).to.equal('1234');
-        done();
+      it('should return the secret header in the response', function() {
+        expect(response.headers.get('x-secret')).to.equal('1234');
       });
     });
 

From b1d197f920950d9908f5a24084dd060d9dafaf59 Mon Sep 17 00:00:00 2001
From: Paul Barry <devlab2425@gmail.com>
Date: Thu, 19 Oct 2023 01:01:44 -0400
Subject: [PATCH 04/10] Issue-1016: Progress on removal of request

---
 .../qraphql-server/graphql-server.spec.js     | 72 ++++++-------------
 .../develop.default/develop.default.spec.js   | 67 +++++------------
 .../develop.default/develop.default.spec.js   | 33 +++------
 .../cases/serve.default/serve.default.spec.js | 49 ++++---------
 4 files changed, 65 insertions(+), 156 deletions(-)

diff --git a/packages/plugin-graphql/test/cases/qraphql-server/graphql-server.spec.js b/packages/plugin-graphql/test/cases/qraphql-server/graphql-server.spec.js
index ead6131e9..4fa353c24 100644
--- a/packages/plugin-graphql/test/cases/qraphql-server/graphql-server.spec.js
+++ b/packages/plugin-graphql/test/cases/qraphql-server/graphql-server.spec.js
@@ -15,7 +15,6 @@
  * Greenwood default (src/)
  */
 import chai from 'chai';
-import request from 'request';
 import path from 'path';
 import { Runner } from 'gallinago';
 import { fileURLToPath, URL } from 'url';
@@ -26,12 +25,12 @@ describe('Develop Greenwood With: ', function() {
   const LABEL = 'GraphQL Server';
   const cliPath = path.join(process.cwd(), 'packages/cli/src/index.js');
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
-  const hostname = '127.0.0.1';
+  const hostname = 'localhost';
   const port = 4000;
   let runner;
 
   before(function() {
-    runner = new Runner();
+    runner = new Runner(true);
   });
 
   describe(LABEL, function() {
@@ -56,42 +55,29 @@ describe('Develop Greenwood With: ', function() {
       };
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://${hostname}:${port}`,
-            headers: {
-              accept: 'text/html'
-            }
-          }, (err, res) => {
-            if (err) {
-              reject();
-            }
-
-            response.status = res.statusCode;
-            response.headers = res.headers;
-
-            resolve(response);
-          });
+        response = await fetch(`http://${hostname}:${port}`, {
+          headers: {
+            accept: 'text/html'
+          }
         });
       });
 
-      it('should return a 200 status', function(done) {
+      it('should return a 200 status', function() {
         expect(response.status).to.equal(200);
-        done();
       });
 
-      it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
-        done();
+      it('should return the correct content type', function() {
+        expect(response.headers.get('content-type')).to.equal('text/html');
       });
     });
 
     // test a query call
-    describe('Develop command with GraphQL server and running a query', function() {
+    describe.only('Develop command with GraphQL server and running a query', function() {
       let response = {
         body: '',
         code: 0
       };
+      let data;
 
       const body = {
         'operationName': null,
@@ -100,38 +86,26 @@ describe('Develop Greenwood With: ', function() {
       };
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.post({
-            url: `http://${hostname}:${port}/graphql`,
-            json: true,
-            body
-          }, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response.status = res.statusCode;
-            response.headers = res.headers;
-            response.body = body;
-
-            resolve(response);
-          });
+        response = await fetch(`http://${hostname}:${port}/graphql`, {
+          method: 'POST',
+          body: JSON.stringify(body),
+          headers: {
+            'content-type': 'application/json'
+          }
         });
+        data = await response.text();
       });
 
-      it('should return a 200 status', function(done) {
+      it('should return a 200 status', function() {
         expect(response.status).to.equal(200);
-        done();
       });
 
-      it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('application/json; charset=utf-8');
-        done();
+      it('should return the correct content type', function() {
+        expect(response.headers.get('content-type')).to.equal('application/json; charset=utf-8');
       });
 
-      it('should return the expected query response', function(done) {
-        expect(response.body.data.config.workspace).to.equal(new URL('./src/', import.meta.url).href);
-        done();
+      it('should return the expected query response', function() {
+        expect(data.config.workspace).to.equal(new URL('./src/', import.meta.url).href);
       });
     });
   });
diff --git a/packages/plugin-import-css/test/cases/develop.default/develop.default.spec.js b/packages/plugin-import-css/test/cases/develop.default/develop.default.spec.js
index 601c872a3..45c06f766 100644
--- a/packages/plugin-import-css/test/cases/develop.default/develop.default.spec.js
+++ b/packages/plugin-import-css/test/cases/develop.default/develop.default.spec.js
@@ -24,7 +24,6 @@
  */
 import chai from 'chai';
 import path from 'path';
-import request from 'request';
 import { Runner } from 'gallinago';
 import { fileURLToPath, URL } from 'url';
 import { runSmokeTest } from '../../../../../test/smoke-test.js';
@@ -64,42 +63,27 @@ describe('Develop Greenwood With: ', function() {
 
     describe('Develop command specific ESM .css behaviors', function() {
       let response = {};
+      let data;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://127.0.0.1:${port}/main.css?type=css`
-          }, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`http://localhost:${port}/main.css?type=css`);
+        data = await response.text();
       });
 
-      it('should return a 200', function(done) {
-        expect(response.statusCode).to.equal(200);
-
-        done();
+      it('should return a 200', function() {
+        expect(response.status).to.equal(200);
       });
 
-      it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/javascript');
-        done();
+      it('should return the correct content type', function() {
+        expect(response.headers.get('content-type')).to.equal('text/javascript');
       });
 
       // https://github.com/ProjectEvergreen/greenwood/issues/766
       // https://unpkg.com/browse/bootstrap@4.6.1/dist/css/bootstrap.css
       // https://unpkg.com/browse/font-awesome@4.7.0/css/font-awesome.css
-      it('should return an ECMASCript module', function(done) {
-        expect(response.body.replace('\n', '').replace(/ /g, '').trim())
+      it('should return an ECMASCript module', function() {
+        expect(data.replace('\n', '').replace(/ /g, '').trim())
           .to.equal('constcss=`*{background-image:url("/assets/background.jpg");font-family:\'Arial\'}.blockquote-footer::before{content:"\\\\2014\\\\00A0";}.fa-chevron-right:before{content:"\\\\f054";}`;exportdefaultcss;'); // eslint-disable-line max-len
-        done();
       });
     });
 
@@ -107,38 +91,23 @@ describe('Develop Greenwood With: ', function() {
     // https://unpkg.com/browse/@material/mwc-button@0.22.1/styles.css.js
     describe('Develop command specific ESM .css.js files behaviors (CSS in disguise)', function() {
       let response = {};
+      let data;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://127.0.0.1:${port}/styles.css.js`
-          }, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`http://localhost:${port}/styles.css.js`);
+        data = await response.text();
       });
 
-      it('should return a 200', function(done) {
-        expect(response.statusCode).to.equal(200);
-
-        done();
+      it('should return a 200', function() {
+        expect(response.status).to.equal(200);
       });
 
-      it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/javascript');
-        done();
+      it('should return the correct content type', function() {
+        expect(response.headers.get('content-type')).to.equal('text/javascript');
       });
 
-      it('should return an ECMASCript module', function(done) {
-        expect(response.body).to.equal('export const styles = css `.mdc-touch-target-wrapper{display:inline}`;');
-        done();
+      it('should return an ECMASCript module', function() {
+        expect(data).to.equal('export const styles = css `.mdc-touch-target-wrapper{display:inline}`;');
       });
     });
   });
diff --git a/packages/plugin-import-json/test/cases/develop.default/develop.default.spec.js b/packages/plugin-import-json/test/cases/develop.default/develop.default.spec.js
index cc694b00c..2cdadb981 100644
--- a/packages/plugin-import-json/test/cases/develop.default/develop.default.spec.js
+++ b/packages/plugin-import-json/test/cases/develop.default/develop.default.spec.js
@@ -25,7 +25,6 @@
  */
 import chai from 'chai';
 import path from 'path';
-import request from 'request';
 import { Runner } from 'gallinago';
 import { fileURLToPath, URL } from 'url';
 import { runSmokeTest } from '../../../../../test/smoke-test.js';
@@ -65,37 +64,23 @@ describe('Develop Greenwood With: ', function() {
 
     describe('Develop command specific ESM .json behaviors', function() {
       let response = {};
+      let data;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://127.0.0.1:${port}/main.json?type=json`
-          }, (err, res) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-
-            resolve();
-          });
-        });
+        response = await fetch(`http://localhost:${port}/main.json?type=json`);
+        data = await response.text();
       });
 
-      it('should return a 200', function(done) {
-        expect(response.statusCode).to.equal(200);
-
-        done();
+      it('should return a 200', function() {
+        expect(response.status).to.equal(200);
       });
 
-      it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/javascript');
-        done();
+      it('should return the correct content type', function() {
+        expect(response.headers.get('content-type')).to.equal('text/javascript');
       });
 
-      it('should return an ECMAScript module', function(done) {
-        expect(response.body).to.equal('export default {"status":200,"message":"got json"}');
-        done();
+      it('should return an ECMAScript module', function() {
+        expect(data).to.equal('export default {"status":200,"message":"got json"}');
       });
     });
   });
diff --git a/packages/plugin-renderer-lit/test/cases/serve.default/serve.default.spec.js b/packages/plugin-renderer-lit/test/cases/serve.default/serve.default.spec.js
index 19650b886..6dd4b3ba2 100644
--- a/packages/plugin-renderer-lit/test/cases/serve.default/serve.default.spec.js
+++ b/packages/plugin-renderer-lit/test/cases/serve.default/serve.default.spec.js
@@ -28,7 +28,6 @@ import fs from 'fs';
 import { JSDOM } from 'jsdom';
 import path from 'path';
 import { getSetupFiles, getDependencyFiles, getOutputTeardownFiles } from '../../../../../test/utils.js';
-import request from 'request';
 import { Runner } from 'gallinago';
 import { fileURLToPath, URL } from 'url';
 
@@ -38,7 +37,7 @@ describe('Serve Greenwood With: ', function() {
   const LABEL = 'Custom Lit Renderer for SSR';
   const cliPath = path.join(process.cwd(), 'packages/cli/src/index.js');
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
-  const hostname = 'http://127.0.0.1:8080';
+  const hostname = 'http://localhost:8080';
   let runner;
 
   before(async function() {
@@ -140,6 +139,7 @@ describe('Serve Greenwood With: ', function() {
 
     let response = {};
     let artists = [];
+    let data;
     let dom;
     let usersPageDom;
     let usersPageHtml;
@@ -151,50 +151,31 @@ describe('Serve Greenwood With: ', function() {
 
       aboutPageGraphData = graph.filter(page => page.route === '/artists/')[0];
 
-      return new Promise((resolve, reject) => {
-        request.get(`${hostname}/artists/`, (err, res, body) => {
-          if (err) {
-            reject();
-          }
+      response = await fetch(`${hostname}/artists/`);
+      data = await response.text();
+      dom = new JSDOM(data);
 
-          response = res;
-          response.body = body;
-          dom = new JSDOM(body);
-
-          request.get(`${hostname}/users/`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            usersPageHtml = body;
-            usersPageDom = new JSDOM(body);
-
-            resolve();
-          });
-        });
-      });
+      response = await fetch(`${hostname}/users/`);
+      usersPageHtml = await response.text();
+      usersPageDom = new JSDOM(usersPageHtml);
     });
 
     describe('Serve command with HTML route response using getBody, getTemplate and getFrontmatter', function() {
 
-      it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
-        done();
+      it('should return a 200 status', function() {
+        expect(response.status).to.equal(200);
       });
 
-      it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
-        done();
+      it('should return the correct content type', function() {
+        expect(response.headers.get('content-type')).to.equal('text/html');
       });
 
-      it('should return a response body', function(done) {
-        expect(response.body).to.not.be.undefined;
-        done();
+      it('should return a response body', function() {
+        expect(data).to.not.be.undefined;
       });
 
-      it('the response body should be valid HTML from JSDOM', function(done) {
+      it('the response body should be valid HTML from JSDOM', function() {
         expect(dom).to.not.be.undefined;
-        done();
       });
 
       it('should have one <style> tag in the <head>', function() {

From 071c54d02975a0c4fe2575161c10ba7bc1ee7d0c Mon Sep 17 00:00:00 2001
From: Paul Barry <devlab2425@gmail.com>
Date: Thu, 19 Oct 2023 01:27:20 -0400
Subject: [PATCH 05/10] Issue-1016: Additional removal of request

---
 .mocharc.cjs                                  |  4 +-
 .../qraphql-server/graphql-server.spec.js     |  6 +-
 .../cases/exp-serve.ssr/exp-serve.ssr.spec.js |  2 +-
 .../develop.default/develop.default.spec.js   |  2 +-
 .../cases/exp-serve.ssr/exp-serve.ssr.spec.js | 62 +++++--------------
 .../develop.default/develop.default.spec.js   |  2 +-
 .../cases/exp-serve.ssr/exp-serve.ssr.spec.js | 34 +++-------
 7 files changed, 36 insertions(+), 76 deletions(-)

diff --git a/.mocharc.cjs b/.mocharc.cjs
index 51980dafe..c152173db 100644
--- a/.mocharc.cjs
+++ b/.mocharc.cjs
@@ -1,3 +1,5 @@
 module.exports = {
-  timeout: 90000
+  timeout: 90000,
+  bail: true,
+  exit: true,
 };
\ No newline at end of file
diff --git a/packages/plugin-graphql/test/cases/qraphql-server/graphql-server.spec.js b/packages/plugin-graphql/test/cases/qraphql-server/graphql-server.spec.js
index 4fa353c24..882157bd7 100644
--- a/packages/plugin-graphql/test/cases/qraphql-server/graphql-server.spec.js
+++ b/packages/plugin-graphql/test/cases/qraphql-server/graphql-server.spec.js
@@ -30,7 +30,7 @@ describe('Develop Greenwood With: ', function() {
   let runner;
 
   before(function() {
-    runner = new Runner(true);
+    runner = new Runner();
   });
 
   describe(LABEL, function() {
@@ -93,7 +93,7 @@ describe('Develop Greenwood With: ', function() {
             'content-type': 'application/json'
           }
         });
-        data = await response.text();
+        data = await response.json();
       });
 
       it('should return a 200 status', function() {
@@ -105,7 +105,7 @@ describe('Develop Greenwood With: ', function() {
       });
 
       it('should return the expected query response', function() {
-        expect(data.config.workspace).to.equal(new URL('./src/', import.meta.url).href);
+        expect(data.data.config.workspace).to.equal(new URL('./src/', import.meta.url).href);
       });
     });
   });
diff --git a/packages/plugin-import-css/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js b/packages/plugin-import-css/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
index 3a2b29f72..aeebc8f23 100644
--- a/packages/plugin-import-css/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
+++ b/packages/plugin-import-css/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
@@ -43,7 +43,7 @@ describe('Serve Greenwood With: ', function() {
   const LABEL = 'A Server Rendered Application (SSR) with API Routes importing CSS';
   const cliPath = path.join(process.cwd(), 'packages/cli/src/index.js');
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
-  const hostname = 'http://127.0.0.1:8080';
+  const hostname = 'http://localhost:8080';
   let runner;
 
   before(async function() {
diff --git a/packages/plugin-import-json/test/cases/develop.default/develop.default.spec.js b/packages/plugin-import-json/test/cases/develop.default/develop.default.spec.js
index 2cdadb981..0d4a11ffa 100644
--- a/packages/plugin-import-json/test/cases/develop.default/develop.default.spec.js
+++ b/packages/plugin-import-json/test/cases/develop.default/develop.default.spec.js
@@ -67,7 +67,7 @@ describe('Develop Greenwood With: ', function() {
       let data;
 
       before(async function() {
-        response = await fetch(`http://localhost:${port}/main.json?type=json`);
+        response = await fetch(`${hostname}:${port}/main.json?type=json`);
         data = await response.text();
       });
 
diff --git a/packages/plugin-import-json/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js b/packages/plugin-import-json/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
index 53035bf97..048e3cc31 100644
--- a/packages/plugin-import-json/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
+++ b/packages/plugin-import-json/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
@@ -30,7 +30,6 @@ import chai from 'chai';
 import { JSDOM } from 'jsdom';
 import path from 'path';
 import { getSetupFiles, getOutputTeardownFiles } from '../../../../../test/utils.js';
-import request from 'request';
 import { Runner } from 'gallinago';
 import { fileURLToPath } from 'url';
 
@@ -40,7 +39,7 @@ describe('Serve Greenwood With: ', function() {
   const LABEL = 'A Server Rendered Application (SSR) with API Routes importing JSON';
   const cliPath = path.join(process.cwd(), 'packages/cli/src/index.js');
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
-  const hostname = 'http://127.0.0.1:8080';
+  const hostname = 'http://localhost:8080';
   let runner;
 
   before(async function() {
@@ -68,37 +67,25 @@ describe('Serve Greenwood With: ', function() {
 
     describe('Serve command with HTML route response for products page', function() {
       let response = {};
+      let data;
       let productsPageDom;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/products/`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-            productsPageDom = new JSDOM(body);
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/products/`);
+        data = response.json();
+        productsPageDom = new JSDOM(data);
       });
 
-      it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
-        done();
+      it('should return a 200 status', function() {
+        expect(response.status).to.equal(200);
       });
 
-      it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
-        done();
+      it('should return the correct content type', function() {
+        expect(response.headers.get('content-type')).to.equal('text/html');
       });
 
-      it('should return a response body', function(done) {
-        expect(response.body).to.not.be.undefined;
-        done();
+      it('should return a response body', function() {
+        expect(data).to.not.be.undefined;
       });
 
       it('should make sure to have the expected number of <app-card> components on the page', function(done) {
@@ -114,34 +101,19 @@ describe('Serve Greenwood With: ', function() {
       let fragmentsApiDom;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/api/fragment`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-            fragmentsApiDom = new JSDOM(body);
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/api/fragment`);
       });
 
-      it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
-        done();
+      it('should return a 200 status', function() {
+        expect(response.status).to.equal(200);
       });
 
-      it('should return a custom status message', function(done) {
+      it('should return a custom status message', function() {
         expect(response.statusMessage).to.equal('OK');
-        done();
       });
 
-      it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
-        done();
+      it('should return the correct content type', function() {
+        expect(response.headers.get('content-type')).to.equal('text/html');
       });
 
       it('should make sure to have the expected number of <app-card> components in the fragment', function(done) {
diff --git a/packages/plugin-typescript/test/cases/develop.default/develop.default.spec.js b/packages/plugin-typescript/test/cases/develop.default/develop.default.spec.js
index 5414e6581..445069b85 100644
--- a/packages/plugin-typescript/test/cases/develop.default/develop.default.spec.js
+++ b/packages/plugin-typescript/test/cases/develop.default/develop.default.spec.js
@@ -60,7 +60,7 @@ describe('Develop Greenwood With: ', function() {
       let data;
 
       before(async function() {
-        response = await fetch(`http://127.0.0.1:${port}/main.ts`);
+        response = await fetch(`${hostname}:${port}/main.ts`);
         data = await response.text();
       });
 
diff --git a/packages/plugin-typescript/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js b/packages/plugin-typescript/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
index c38eaf820..23422bb72 100644
--- a/packages/plugin-typescript/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
+++ b/packages/plugin-typescript/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
@@ -26,7 +26,6 @@ import chai from 'chai';
 import { JSDOM } from 'jsdom';
 import path from 'path';
 import { getSetupFiles, getOutputTeardownFiles } from '../../../../../test/utils.js';
-import request from 'request';
 import { Runner } from 'gallinago';
 import { fileURLToPath } from 'url';
 
@@ -36,7 +35,7 @@ describe('Serve Greenwood With: ', function() {
   const LABEL = 'A Server Rendered Application (SSR) with API Routes importing TypeScript';
   const cliPath = path.join(process.cwd(), 'packages/cli/src/index.js');
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
-  const hostname = 'http://127.0.0.1:8080';
+  const hostname = 'http://localhost:8080';
   let runner;
 
   before(async function() {
@@ -62,39 +61,26 @@ describe('Serve Greenwood With: ', function() {
       });
     });
 
-    describe('Serve command with API specific behaviors for an HTML ("fragment") API', function() {
+    describe.only('Serve command with API specific behaviors for an HTML ("fragment") API', function() {
       let response = {};
       let fragmentsApiDom;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/api/fragment`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-            fragmentsApiDom = new JSDOM(body);
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/api/fragment`);
+        const body = await response.text();
+        fragmentsApiDom = new JSDOM(body);
       });
 
-      it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
-        done();
+      it('should return a 200 status', function() {
+        expect(response.status).to.equal(200);
       });
 
-      it('should return a custom status message', function(done) {
+      it('should return a custom status message', function() {
         expect(response.statusMessage).to.equal('OK');
-        done();
       });
 
-      it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
-        done();
+      it('should return the correct content type', function() {
+        expect(response.headers.get('content-type')).to.equal('text/html');
       });
 
       it('should make sure to have the expected CSS inlined into the page for each <app-card>', function(done) {

From cf4a6d623ec851fb217a756fd67dd091019eb64f Mon Sep 17 00:00:00 2001
From: Paul Barry <devlab2425@gmail.com>
Date: Thu, 19 Oct 2023 10:24:01 -0400
Subject: [PATCH 06/10] Issue-1016: Finalize plugin tests

---
 .../cases/build.default/build.default.spec.js | 15 +--
 .../cases/build.default/build.default.spec.js | 29 +++---
 .../develop.default/develop.default.spec.js   | 97 +++++--------------
 .../qraphql-server/graphql-server.spec.js     |  2 +-
 .../develop.default/develop.default.spec.js   |  4 +-
 .../cases/exp-serve.ssr/exp-serve.ssr.spec.js | 63 ++++--------
 .../cases/exp-serve.ssr/exp-serve.ssr.spec.js |  2 +-
 7 files changed, 72 insertions(+), 140 deletions(-)

diff --git a/packages/plugin-adapter-netlify/test/cases/build.default/build.default.spec.js b/packages/plugin-adapter-netlify/test/cases/build.default/build.default.spec.js
index 7414fc485..96db93136 100644
--- a/packages/plugin-adapter-netlify/test/cases/build.default/build.default.spec.js
+++ b/packages/plugin-adapter-netlify/test/cases/build.default/build.default.spec.js
@@ -54,6 +54,7 @@ describe('Build Greenwood With: ', function() {
   const cliPath = path.join(process.cwd(), 'packages/cli/src/index.js');
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   const netlifyFunctionsOutputUrl = new URL('./netlify/functions/', import.meta.url);
+  const hostname = 'http://www.example.com';
   let runner;
 
   before(async function() {
@@ -115,7 +116,7 @@ describe('Build Greenwood With: ', function() {
         });
         const { handler } = await import(new URL(`./${name}/${name}.js`, netlifyFunctionsOutputUrl));
         const response = await handler({
-          rawUrl: `http://www.example.com/api/greeting?name=${param}`,
+          rawUrl: `${hostname}/api/greeting?name=${param}`,
           httpMethod: 'GET'
         }, {});
         const { statusCode, body, headers } = response;
@@ -146,7 +147,7 @@ describe('Build Greenwood With: ', function() {
         });
         const { handler } = await import(new URL(`./${name}/${name}.js`, netlifyFunctionsOutputUrl));
         const response = await handler({
-          rawUrl: `http://www.example.com/api/greeting?name=${param}`,
+          rawUrl: `${hostname}/api/greeting?name=${param}`,
           httpMethod: 'GET'
         }, {});
         const { statusCode, body, headers } = response;
@@ -179,7 +180,7 @@ describe('Build Greenwood With: ', function() {
         });
         const { handler } = await import(new URL(`./${name}/${name}.js`, netlifyFunctionsOutputUrl));
         const response = await handler({
-          rawUrl: 'http://www.example.com/api/submit-json',
+          rawUrl: `${hostname}/api/submit-json`,
           body: { name: param },
           httpMethod: 'POST',
           headers: {
@@ -215,7 +216,7 @@ describe('Build Greenwood With: ', function() {
         });
         const { handler } = await import(new URL(`./${name}/${name}.js`, netlifyFunctionsOutputUrl));
         const response = await handler({
-          rawUrl: 'http://www.example.com/api/submit-form-data',
+          rawUrl: `${hostname}/api/submit-form-data`,
           body: `name=${param}`,
           httpMethod: 'POST',
           headers: {
@@ -251,7 +252,7 @@ describe('Build Greenwood With: ', function() {
         });
         const { handler } = await import(new URL(`./${name}/${name}.js`, netlifyFunctionsOutputUrl));
         const response = await handler({
-          rawUrl: 'http://www.example.com/artists/',
+          rawUrl: `${hostname}/artists/`,
           httpMethod: 'GET'
         }, {});
         const { statusCode, body, headers } = response;
@@ -288,7 +289,7 @@ describe('Build Greenwood With: ', function() {
         });
         const { handler } = await import(new URL(`./${name}/${name}.js`, netlifyFunctionsOutputUrl));
         const response = await handler({
-          rawUrl: 'http://www.example.com/users/',
+          rawUrl: `${hostname}/users/`,
           httpMethod: 'GET'
         }, {});
         const { statusCode, body, headers } = response;
@@ -325,7 +326,7 @@ describe('Build Greenwood With: ', function() {
         });
         const { handler } = await import(new URL(`./${name}/${name}.js`, netlifyFunctionsOutputUrl));
         const response = await handler({
-          rawUrl: `http://localhost:8080/post/?id=${postId}`,
+          rawUrl: `${hostname}/post/?id=${postId}`,
           httpMethod: 'GET'
         }, {});
 
diff --git a/packages/plugin-adapter-vercel/test/cases/build.default/build.default.spec.js b/packages/plugin-adapter-vercel/test/cases/build.default/build.default.spec.js
index 8f61c215e..c553414e6 100644
--- a/packages/plugin-adapter-vercel/test/cases/build.default/build.default.spec.js
+++ b/packages/plugin-adapter-vercel/test/cases/build.default/build.default.spec.js
@@ -55,6 +55,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   const vercelOutputFolder = new URL('./.vercel/output/', import.meta.url);
   const vercelFunctionsOutputUrl = new URL('./functions/', vercelOutputFolder);
+  const hostname = 'http://www.example.com';
   let runner;
 
   before(async function() {
@@ -126,9 +127,9 @@ describe('Build Greenwood With: ', function() {
         };
 
         await handler({
-          url: `http://www.example.com/api/greeting?name=${param}`,
+          url: `${hostname}/api/greeting?name=${param}`,
           headers: {
-            host: 'http://www.example.com'
+            host: hostname
           },
           method: 'GET'
         }, {
@@ -158,9 +159,9 @@ describe('Build Greenwood With: ', function() {
         };
 
         await handler({
-          url: 'http://www.example.com/api/fragment',
+          url: `${hostname}/api/fragment`,
           headers: {
-            host: 'http://www.example.com'
+            host: hostname
           },
           method: 'GET'
         }, {
@@ -194,9 +195,9 @@ describe('Build Greenwood With: ', function() {
         };
 
         await handler({
-          url: 'http://www.example.com/api/submit-json',
+          url: `${hostname}/api/submit-json`,
           headers: {
-            'host': 'http://www.example.com',
+            'host': hostname,
             'content-type': 'application/json'
           },
           body: { name },
@@ -231,9 +232,9 @@ describe('Build Greenwood With: ', function() {
         };
 
         await handler({
-          url: 'http://www.example.com/api/submit-form-data',
+          url: `${hostname}/api/submit-form-data`,
           headers: {
-            'host': 'http://www.example.com',
+            'host': hostname,
             'content-type': 'application/x-www-form-urlencoded'
           },
           body: { name },
@@ -266,9 +267,9 @@ describe('Build Greenwood With: ', function() {
         const count = 2;
 
         await handler({
-          url: 'http://www.example.com/artists',
+          url: `${hostname}/artists`,
           headers: {
-            host: 'http://www.example.com'
+            host: hostname
           },
           method: 'GET'
         }, {
@@ -305,9 +306,9 @@ describe('Build Greenwood With: ', function() {
         const count = 1;
 
         await handler({
-          url: 'http://www.example.com/users',
+          url: `${hostname}/users`,
           headers: {
-            host: 'http://www.example.com'
+            host: hostname
           },
           method: 'GET'
         }, {
@@ -345,9 +346,9 @@ describe('Build Greenwood With: ', function() {
         };
 
         await handler({
-          url: `http://localhost:8080/post/?id=${postId}`,
+          url: `${hostname}/post/?id=${postId}`,
           headers: {
-            host: 'http://localhost:8080'
+            host: hostname
           },
           method: 'GET'
         }, {
diff --git a/packages/plugin-graphql/test/cases/develop.default/develop.default.spec.js b/packages/plugin-graphql/test/cases/develop.default/develop.default.spec.js
index c27b6d50f..bb96f48e0 100644
--- a/packages/plugin-graphql/test/cases/develop.default/develop.default.spec.js
+++ b/packages/plugin-graphql/test/cases/develop.default/develop.default.spec.js
@@ -20,7 +20,6 @@
 import chai from 'chai';
 import { JSDOM } from 'jsdom';
 import path from 'path';
-import request from 'request';
 import { Runner } from 'gallinago';
 import { fileURLToPath, URL } from 'url';
 import { runSmokeTest } from '../../../../../test/smoke-test.js';
@@ -60,37 +59,21 @@ describe('Develop Greenwood With: ', function() {
 
     describe('Develop command import map for GraphQL', function() {
       let response = {};
+      let data;
       let dom;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://127.0.0.1:${port}`,
-            headers: {
-              accept: 'text/html'
-            }
-          }, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-
-            dom = new JSDOM(body);
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}`);
+        data = await response.text();
+        dom = new JSDOM(data);
       });
 
-      it('should return a 200', function(done) {
-        expect(response.statusCode).to.equal(200);
-
-        done();
+      it('should return a 200', function() {
+        expect(response.status).to.equal(200);
       });
 
-      it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
-        done();
+      it('should return the correct content type', function() {
+        expect(response.headers.get('content-type')).to.equal('text/html');
       });
 
       it('should return an import map shim <script> in the <head> of the document', function(done) {
@@ -110,73 +93,45 @@ describe('Develop Greenwood With: ', function() {
 
     describe('Develop command specific client node_modules resolution', function() {
       let response = {};
+      let data;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://127.0.0.1:${port}/node_modules/@greenwood/plugin-graphql/src/core/client.js`
-          }, (err, res) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/node_modules/@greenwood/plugin-graphql/src/core/client.js`);
+        data = await response.text();
       });
 
-      it('should return a 200', function(done) {
-        expect(response.statusCode).to.equal(200);
-
-        done();
+      it('should return a 200', function() {
+        expect(response.status).to.equal(200);
       });
 
-      it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/javascript');
-        done();
+      it('should return the correct content type', function() {
+        expect(response.headers.get('content-type')).to.equal('text/javascript');
       });
 
-      it('should return an ECMASCript module', function(done) {
-        expect(response.body).to.contain('export default client;');
-        done();
+      it('should return an ECMASCript module', function() {
+        expect(data).to.contain('export default client;');
       });
     });
 
     describe('Develop command specific .gql behaviors', function() {
       let response = {};
+      let data;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://127.0.0.1:${port}/data/queries/gallery.gql`
-          }, (err, res) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/data/queries/gallery.gql`);
+        data = await response.text();
       });
 
-      it('should return a 200', function(done) {
-        expect(response.statusCode).to.equal(200);
-
-        done();
+      it('should return a 200', function() {
+        expect(response.status).to.equal(200);
       });
 
-      it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/javascript');
-        done();
+      it('should return the correct content type', function() {
+        expect(response.headers.get('content-type')).to.equal('text/javascript');
       });
 
-      it('should return an ECMASCript module', function(done) {
-        expect(response.body.trim().indexOf('export default')).to.equal(0);
-        done();
+      it('should return an ECMASCript module', function() {
+        expect(data.trim().indexOf('export default')).to.equal(0);
       });
     });
   });
diff --git a/packages/plugin-graphql/test/cases/qraphql-server/graphql-server.spec.js b/packages/plugin-graphql/test/cases/qraphql-server/graphql-server.spec.js
index 882157bd7..2bcc15a43 100644
--- a/packages/plugin-graphql/test/cases/qraphql-server/graphql-server.spec.js
+++ b/packages/plugin-graphql/test/cases/qraphql-server/graphql-server.spec.js
@@ -72,7 +72,7 @@ describe('Develop Greenwood With: ', function() {
     });
 
     // test a query call
-    describe.only('Develop command with GraphQL server and running a query', function() {
+    describe('Develop command with GraphQL server and running a query', function() {
       let response = {
         body: '',
         code: 0
diff --git a/packages/plugin-import-css/test/cases/develop.default/develop.default.spec.js b/packages/plugin-import-css/test/cases/develop.default/develop.default.spec.js
index 45c06f766..fd893c883 100644
--- a/packages/plugin-import-css/test/cases/develop.default/develop.default.spec.js
+++ b/packages/plugin-import-css/test/cases/develop.default/develop.default.spec.js
@@ -66,7 +66,7 @@ describe('Develop Greenwood With: ', function() {
       let data;
 
       before(async function() {
-        response = await fetch(`http://localhost:${port}/main.css?type=css`);
+        response = await fetch(`${hostname}:${port}/main.css?type=css`);
         data = await response.text();
       });
 
@@ -94,7 +94,7 @@ describe('Develop Greenwood With: ', function() {
       let data;
 
       before(async function() {
-        response = await fetch(`http://localhost:${port}/styles.css.js`);
+        response = await fetch(`${hostname}:${port}/styles.css.js`);
         data = await response.text();
       });
 
diff --git a/packages/plugin-import-css/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js b/packages/plugin-import-css/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
index aeebc8f23..ed12a1f6b 100644
--- a/packages/plugin-import-css/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
+++ b/packages/plugin-import-css/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
@@ -33,7 +33,6 @@ import chai from 'chai';
 import { JSDOM } from 'jsdom';
 import path from 'path';
 import { getSetupFiles, getOutputTeardownFiles } from '../../../../../test/utils.js';
-import request from 'request';
 import { Runner } from 'gallinago';
 import { fileURLToPath } from 'url';
 
@@ -71,37 +70,25 @@ describe('Serve Greenwood With: ', function() {
 
     describe('Serve command with HTML route response for products page', function() {
       let response = {};
+      let data;
       let productsPageDom;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/products/`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-            productsPageDom = new JSDOM(body);
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/products/`);
+        data = await response.json();
+        productsPageDom = new JSDOM(data);
       });
 
-      it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
-        done();
+      it('should return a 200 status', function() {
+        expect(response.status).to.equal(200);
       });
 
-      it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
-        done();
+      it('should return the correct content type', function() {
+        expect(response.headers.get('content-type')).to.equal('text/html');
       });
 
-      it('should return a response body', function(done) {
-        expect(response.body).to.not.be.undefined;
-        done();
+      it('should return a response body', function() {
+        expect(data).to.not.be.undefined;
       });
 
       it('should have the expected import CSS in the page in the response body', function(done) {
@@ -125,37 +112,25 @@ describe('Serve Greenwood With: ', function() {
 
     describe('Serve command with API specific behaviors for an HTML ("fragment") API', function() {
       let response = {};
+      let data;
       let fragmentsApiDom;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/api/fragment`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-            fragmentsApiDom = new JSDOM(body);
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/api/fragment`);
+        data = await response.json();
+        fragmentsApiDom = new JSDOM(data);
       });
 
-      it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
-        done();
+      it('should return a 200 status', function() {
+        expect(response.status).to.equal(200);
       });
 
-      it('should return a custom status message', function(done) {
+      it('should return a custom status message', function() {
         expect(response.statusMessage).to.equal('OK');
-        done();
       });
 
-      it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
-        done();
+      it('should return the correct content type', function() {
+        expect(response.headers.get('content-type')).to.equal('text/html');
       });
 
       it('should make sure to have the expected CSS inlined into the page for each <app-card>', function(done) {
diff --git a/packages/plugin-typescript/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js b/packages/plugin-typescript/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
index 23422bb72..8559e56bb 100644
--- a/packages/plugin-typescript/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
+++ b/packages/plugin-typescript/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
@@ -61,7 +61,7 @@ describe('Serve Greenwood With: ', function() {
       });
     });
 
-    describe.only('Serve command with API specific behaviors for an HTML ("fragment") API', function() {
+    describe('Serve command with API specific behaviors for an HTML ("fragment") API', function() {
       let response = {};
       let fragmentsApiDom;
 

From 7a4b43f4854595f2d4b84f672c3f511df6367535 Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Mon, 6 Nov 2023 21:16:17 -0500
Subject: [PATCH 07/10] use response.text()

---
 .../test/cases/exp-serve.ssr/exp-serve.ssr.spec.js              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/plugin-import-css/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js b/packages/plugin-import-css/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
index ed12a1f6b..fe629e064 100644
--- a/packages/plugin-import-css/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
+++ b/packages/plugin-import-css/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
@@ -75,7 +75,7 @@ describe('Serve Greenwood With: ', function() {
 
       before(async function() {
         response = await fetch(`${hostname}/products/`);
-        data = await response.json();
+        data = await response.text();
         productsPageDom = new JSDOM(data);
       });
 

From 17894742f94abd41005fb04f2ea6174647eb5fe7 Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Mon, 6 Nov 2023 21:22:20 -0500
Subject: [PATCH 08/10] refactor init spec to fetch

---
 .../develop.default/develop.default.spec.js   | 25 ++++---------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/packages/init/test/cases/develop.default/develop.default.spec.js b/packages/init/test/cases/develop.default/develop.default.spec.js
index b9686d06c..c6a5ba83a 100644
--- a/packages/init/test/cases/develop.default/develop.default.spec.js
+++ b/packages/init/test/cases/develop.default/develop.default.spec.js
@@ -16,7 +16,6 @@ import fs from 'fs';
 import { JSDOM } from 'jsdom';
 import path from 'path';
 import { getSetupFiles } from '../../../../../test/utils.js';
-import request from 'request';
 import { Runner } from 'gallinago';
 import { runSmokeTest } from '../../../../../test/smoke-test.js';
 import { fileURLToPath, URL } from 'url';
@@ -93,32 +92,18 @@ xdescribe('Scaffold Greenwood and Run Develop command: ', function() {
           let dom;
 
           before(async function() {
-            return new Promise((resolve, reject) => {
-              request.get({
-                url: `http://127.0.0.1:${port}`,
-                headers: {
-                  accept: 'text/html'
-                }
-              }, (err, res, body) => {
-                if (err) {
-                  reject();
-                }
-
-                response = res;
-
-                dom = new JSDOM(body);
-                resolve();
-              });
-            });
+            response = await fetch(`${hostname}:${port}`);
+            const data = await response.text();
+            dom = new JSDOM(data);
           });
 
           it('should return the correct content type', function(done) {
-            expect(response.headers['content-type']).to.equal('text/html');
+            expect(response.headers.get('content-type')).to.equal('text/html');
             done();
           });
 
           it('should return a 200', function(done) {
-            expect(response.statusCode).to.equal(200);
+            expect(response.status).to.equal(200);
 
             done();
           });

From 1b237bcce3d49d3b39d4fbcef136594498f52a97 Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Tue, 7 Nov 2023 08:54:08 -0500
Subject: [PATCH 09/10] all specs refactored to use fetch

---
 .../develop.default.hud-disabled.spec.js      |  36 +-
 .../develop.default.hud.spec.js               |  36 +-
 .../develop.default/develop.default.spec.js   | 580 +++++-------------
 .../develop.default/src/api/submit-json.js    |   4 +-
 .../develop.plugins.context.spec.js           |  69 +--
 .../cases/develop.spa/develop.spa.spec.js     | 125 +---
 .../cases/develop.ssr/develop.ssr.spec.js     |  25 +-
 .../serve.config.static-router.spec.js        |  24 +-
 .../serve.default.api.spec.js                 | 168 ++---
 ...e.default.ssr-prerender-api-hybrid.spec.js |  45 +-
 .../serve.default.ssr-prerender.spec.js       |  24 +-
 .../serve.default.ssr-static-export.spec.js   |  24 +-
 .../cases/serve.default/serve.default.spec.js | 212 ++-----
 .../test/cases/serve.spa/serve.spa.spec.js    |  75 +--
 .../theme-pack/theme-pack.develop.spec.js     |  69 +--
 .../cases/exp-serve.ssr/exp-serve.ssr.spec.js |   7 +-
 16 files changed, 420 insertions(+), 1103 deletions(-)

diff --git a/packages/cli/test/cases/develop.default.hud-disabled/develop.default.hud-disabled.spec.js b/packages/cli/test/cases/develop.default.hud-disabled/develop.default.hud-disabled.spec.js
index f05504d7f..41f5801b0 100644
--- a/packages/cli/test/cases/develop.default.hud-disabled/develop.default.hud-disabled.spec.js
+++ b/packages/cli/test/cases/develop.default.hud-disabled/develop.default.hud-disabled.spec.js
@@ -20,7 +20,6 @@ import fs from 'fs';
 import { JSDOM } from 'jsdom';
 import path from 'path';
 import { getSetupFiles } from '../../../../../test/utils.js';
-import request from 'request';
 import { Runner } from 'gallinago';
 import { runSmokeTest } from '../../../../../test/smoke-test.js';
 import { fileURLToPath, URL } from 'url';
@@ -61,46 +60,31 @@ describe('Develop Greenwood With: ', function() {
     describe('Develop command specific HUD HTML behaviors when disabled', function() {
       let response = {};
       let sourceHtml = '';
-      let dom;
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://127.0.0.1:${port}`,
-            headers: {
-              accept: 'text/html'
-            }
-          }, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-
-            dom = new JSDOM(body);
-            sourceHtml = fs.readFileSync(fileURLToPath(new URL('./src/pages/index.html', import.meta.url)), 'utf-8');
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}`);
+        body = await response.clone().text();
+        sourceHtml = fs.readFileSync(fileURLToPath(new URL('./src/pages/index.html', import.meta.url)), 'utf-8');
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
+        expect(response.headers.get('content-type')).to.equal('text/html');
         done();
       });
 
       it('should return a 200', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
 
         done();
       });
 
       it('should contain the appropriate HUD output in the response', function(done) {
-        const body = dom.window.document.querySelectorAll('body')[0];
+        const dom = new JSDOM(body);
+        const bodyTag = dom.window.document.querySelectorAll('body')[0];
 
-        expect(body.textContent).not.to.contain('Malformed HTML detected, please check your closing tags or an HTML formatter');
-        expect(body.textContent.replace(/\\n/g, '').trim()).not.to.contain(sourceHtml.replace(/\\n/g, '').trim());
+        expect(bodyTag.textContent).not.to.contain('Malformed HTML detected, please check your closing tags or an HTML formatter');
+        expect(bodyTag.textContent.replace(/\\n/g, '').trim()).not.to.contain(sourceHtml.replace(/\\n/g, '').trim());
 
         done();
       });
diff --git a/packages/cli/test/cases/develop.default.hud/develop.default.hud.spec.js b/packages/cli/test/cases/develop.default.hud/develop.default.hud.spec.js
index df5768c6b..4d0d00b04 100644
--- a/packages/cli/test/cases/develop.default.hud/develop.default.hud.spec.js
+++ b/packages/cli/test/cases/develop.default.hud/develop.default.hud.spec.js
@@ -20,7 +20,6 @@ import fs from 'fs';
 import { JSDOM } from 'jsdom';
 import path from 'path';
 import { getSetupFiles } from '../../../../../test/utils.js';
-import request from 'request';
 import { Runner } from 'gallinago';
 import { runSmokeTest } from '../../../../../test/smoke-test.js';
 import { fileURLToPath, URL } from 'url';
@@ -61,46 +60,31 @@ describe('Develop Greenwood With: ', function() {
     describe('Develop command specific HUD HTML behaviors', function() {
       let response = {};
       let sourceHtml = '';
-      let dom;
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://127.0.0.1:${port}`,
-            headers: {
-              accept: 'text/html'
-            }
-          }, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-
-            dom = new JSDOM(body);
-            sourceHtml = fs.readFileSync(fileURLToPath(new URL('./src/pages/index.html', import.meta.url)), 'utf-8');
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}`);
+        body = await response.clone().text();
+        sourceHtml = fs.readFileSync(fileURLToPath(new URL('./src/pages/index.html', import.meta.url)), 'utf-8');
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
+        expect(response.headers.get('content-type')).to.equal('text/html');
         done();
       });
 
       it('should return a 200', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
 
         done();
       });
 
       it('should contain the appropriate HUD output in the response', function(done) {
-        const body = dom.window.document.querySelectorAll('body')[0];
+        const dom = new JSDOM(body);
+        const bodyTag = dom.window.document.querySelectorAll('body')[0];
 
-        expect(body.textContent).to.contain('Malformed HTML detected, please check your closing tags or an HTML formatter');
-        expect(body.textContent.replace(/\\n/g, '').trim()).to.contain(sourceHtml.replace(/\\n/g, '').trim());
+        expect(bodyTag.textContent).to.contain('Malformed HTML detected, please check your closing tags or an HTML formatter');
+        expect(bodyTag.textContent.replace(/\\n/g, '').trim()).to.contain(sourceHtml.replace(/\\n/g, '').trim());
 
         done();
       });
diff --git a/packages/cli/test/cases/develop.default/develop.default.spec.js b/packages/cli/test/cases/develop.default/develop.default.spec.js
index 3c89be0ce..b6fd01a72 100644
--- a/packages/cli/test/cases/develop.default/develop.default.spec.js
+++ b/packages/cli/test/cases/develop.default/develop.default.spec.js
@@ -48,7 +48,6 @@ import fs from 'fs';
 import { JSDOM } from 'jsdom';
 import path from 'path';
 import { getDependencyFiles, getSetupFiles } from '../../../../../test/utils.js';
-import request from 'request';
 import { runSmokeTest } from '../../../../../test/smoke-test.js';
 import { Runner } from 'gallinago';
 import { fileURLToPath, URL } from 'url';
@@ -464,34 +463,19 @@ describe('Develop Greenwood With: ', function() {
       let expectedImportMap;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://127.0.0.1:${port}`,
-            headers: {
-              accept: 'text/html'
-            }
-          }, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-
-            dom = new JSDOM(body);
-            expectedImportMap = JSON.parse(fs.readFileSync(new URL('./import-map.snapshot.json', import.meta.url), 'utf-8'));
-
-            resolve();
-          });
-        });
+        response = await fetch(`http://127.0.0.1:${port}`);
+        const data = await response.text();
+        dom = new JSDOM(data);
+        expectedImportMap = JSON.parse(fs.readFileSync(new URL('./import-map.snapshot.json', import.meta.url), 'utf-8'));
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
+        expect(response.headers.get('content-type')).to.equal('text/html');
         done();
       });
 
       it('should return a 200', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
 
         done();
       });
@@ -570,32 +554,18 @@ describe('Develop Greenwood With: ', function() {
       let dom;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://127.0.0.1:${port}/404/`,
-            headers: {
-              accept: 'text/html'
-            }
-          }, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-
-            dom = new JSDOM(body);
-            resolve();
-          });
-        });
+        response = await fetch(`http://127.0.0.1:${port}/404/`);
+        const data = await response.text();
+        dom = new JSDOM(data);
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
+        expect(response.headers.get('content-type')).to.equal('text/html');
         done();
       });
 
       it('should return a 200', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
 
         done();
       });
@@ -619,68 +589,50 @@ describe('Develop Greenwood With: ', function() {
 
     describe('Develop command specific JavaScript behaviors for user authored custom element', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}:${port}/components/header.js`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/components/header.js`);
+        body = await response.clone().text();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/javascript');
+        expect(response.headers.get('content-type')).to.equal('text/javascript');
         done();
       });
 
       it('should return the correct response body', function(done) {
-        expect(response.body).to.contain('class HeaderComponent extends HTMLElement');
+        expect(body).to.contain('class HeaderComponent extends HTMLElement');
         done();
       });
     });
 
     describe('Develop command specific CSS behaviors', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}:${port}/styles/main.css`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/styles/main.css`);
+        body = await response.clone().text();
       });
 
-      it('should eturn a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+      it('should return a 200 status', function(done) {
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/css');
+        expect(response.headers.get('content-type')).to.equal('text/css');
         done();
       });
 
       it('should return the correct response body', function(done) {
-        expect(response.body).to.contain('color: blue;');
+        expect(body).to.contain('color: blue;');
         done();
       });
     });
@@ -688,137 +640,100 @@ describe('Develop Greenwood With: ', function() {
     describe('Develop command with image (png) specific behavior', function() {
       const ext = 'png';
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-
-          request.get(`${hostname}:${port}/assets/logo.${ext}`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/assets/logo.${ext}`);
+        body = await response.clone().text();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal(`image/${ext}`);
+        expect(response.headers.get('content-type')).to.equal(`image/${ext}`);
         done();
       });
 
       it('should return binary data', function(done) {
-        expect(response.body).to.contain('PNG');
+        expect(body).to.contain('PNG');
         done();
       });
     });
 
     describe('Develop command with image (ico) specific behavior', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}:${port}/assets/favicon.ico`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve(response);
-          });
-        });
+        response = await fetch(`${hostname}:${port}/assets/favicon.ico`);
+        body = await response.clone().text();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('image/x-icon');
+        expect(response.headers.get('content-type')).to.equal('image/x-icon');
         done();
       });
 
       it('should return binary data', function(done) {
-        expect(response.body).to.contain('\u0000');
+        expect(body).to.contain('\u0000');
         done();
       });
     });
 
     describe('Develop command with image (webp) specific behavior', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}:${port}/assets/river-valley.webp`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve(response);
-          });
-        });
+        response = await fetch(`${hostname}:${port}/assets/river-valley.webp`);
+        body = await response.clone().text();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('image/webp');
+        expect(response.headers.get('content-type')).to.equal('image/webp');
         done();
       });
 
       it('should return binary data', function(done) {
-        expect(response.body).to.contain('\u0000');
+        expect(body).to.contain('\u0000');
         done();
       });
     });
 
     describe('Develop command with image (avif) specific behavior', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}:${port}/assets/fox.avif`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve(response);
-          });
-        });
+        response = await fetch(`${hostname}:${port}/assets/fox.avif`);
+        body = await response.clone().text();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('image/avif');
+        expect(response.headers.get('content-type')).to.equal('image/avif');
         done();
       });
 
       it('should return binary data', function(done) {
-        expect(response.body).to.contain('\u0000');
+        expect(body).to.contain('\u0000');
         done();
       });
     });
@@ -826,34 +741,25 @@ describe('Develop Greenwood With: ', function() {
     describe('Develop command with image (svg) specific behavior', function() {
       const ext = 'svg';
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}:${port}/assets/webcomponents.${ext}`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/assets/webcomponents.${ext}`);
+        body = await response.clone().text();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal(`image/${ext}+xml`);
+        expect(response.headers.get('content-type')).to.equal(`image/${ext}+xml`);
         done();
       });
 
       it('should return the correct response body', function(done) {
-        expect(response.body.indexOf('<svg')).to.equal(0);
+        expect(body.indexOf('<svg')).to.equal(0);
         done();
       });
     });
@@ -861,34 +767,25 @@ describe('Develop Greenwood With: ', function() {
     describe('Develop command with font specific (.woff) behavior', function() {
       const ext = 'woff';
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}:${port}/assets/source-sans-pro.woff?v=1`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/assets/source-sans-pro.${ext}?v=1`);
+        body = await response.clone().text();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal(`font/${ext}`);
+        expect(response.headers.get('content-type')).to.equal(`font/${ext}`);
         done();
       });
 
       it('should return the correct response body', function(done) {
-        expect(response.body).to.contain('wOFF');
+        expect(body).to.contain('wOFF');
         done();
       });
     });
@@ -896,262 +793,190 @@ describe('Develop Greenwood With: ', function() {
     describe('Develop command with generic video container format (.mp4) behavior', function() {
       const ext = 'mp4';
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `${hostname}:${port}/assets/splash-clip.mp4`
-          }, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/assets/splash-clip.mp4`);
+        body = await response.clone().text();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type header', function(done) {
-        expect(response.headers['content-type']).to.equal(`video/${ext}`);
+        expect(response.headers.get('content-type')).to.equal(`video/${ext}`);
         done();
       });
 
       it('should return the correct content length header', function(done) {
-        expect(response.headers['content-length']).to.equal('2498461');
+        expect(response.headers.get('content-length')).to.equal('2498461');
         done();
       });
 
       it('should return the correct etag header', function(done) {
-        expect(response.headers.etag).to.equal('2130309740');
+        expect(response.headers.get('etag')).to.equal('2130309740');
         done();
       });
 
       it('should return the correct response body', function(done) {
-        expect(response.body).to.contain(ext);
+        expect(body).to.contain(ext);
         done();
       });
     });
 
     describe('Develop command with generic video container format (.mp4) behavior that should return an etag hit', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `${hostname}:${port}/assets/splash-clip.mp4`,
-            headers: {
-              'if-none-match': '2130309740'
-            }
-          }, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/assets/splash-clip.mp4`, { headers: new Headers({ 'if-none-match': '2130309740' }) });
+        body = await response.clone().text();
       });
 
       it('should return a 304 status', function(done) {
-        expect(response.statusCode).to.equal(304);
+        expect(response.status).to.equal(304);
         done();
       });
 
       it('should return an empty body', function(done) {
-        expect(response.body).to.contain('');
+        expect(body).to.contain('');
         done();
       });
 
       it('should return the correct cache-control header', function(done) {
-        expect(response.headers['cache-control']).to.equal('no-cache');
+        expect(response.headers.get('cache-control')).to.equal('no-cache');
         done();
       });
     });
 
     describe('Develop command with audio format (.mp3) behavior', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}:${port}/assets/song-sample.mp3`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/assets/song-sample.mp3`);
+        body = await response.clone().text();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('audio/mpeg');
+        expect(response.headers.get('content-type')).to.equal('audio/mpeg');
         done();
       });
 
       it('should return the correct content length', function(done) {
-        expect(response.headers['content-length']).to.equal('5425061');
+        expect(response.headers.get('content-length')).to.equal('5425061');
         done();
       });
 
       it('should return the correct response body', function(done) {
-        expect(response.body).to.contain('ID3');
+        expect(body).to.contain('ID3');
         done();
       });
     });
 
     describe('Develop command with JSON specific behavior', function() {
       let response = {};
+      let data;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}:${port}/assets/data.json`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = JSON.parse(body);
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/assets/data.json`);
+        data = await response.clone().json();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('application/json');
+        expect(response.headers.get('content-type')).to.equal('application/json');
         done();
       });
 
       it('should return the correct response body', function(done) {
-        expect(response.body.name).to.equal('Marvin');
+        expect(data.name).to.equal('Marvin');
         done();
       });
     });
 
     describe('Develop command with source map specific behavior', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}:${port}/node_modules/lit-html/lit-html.js.map`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/node_modules/lit-html/lit-html.js.map`);
+        body = await response.clone().text();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('application/json');
+        expect(response.headers.get('content-type')).to.equal('application/json');
         done();
       });
 
       it('should return the correct response body', function(done) {
-        expect(response.body).to.contain('"sources":["src/lit-html.ts"]');
+        expect(body).to.contain('"sources":["src/lit-html.ts"]');
         done();
       });
     });
 
     describe('Develop command specific node modules resolution behavior for JS with query string', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}:${port}/node_modules/lit-html/lit-html.js?type=xyz`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/node_modules/lit-html/lit-html.js?type=xyz`);
+        body = await response.clone().text();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/javascript');
+        expect(response.headers.get('content-type')).to.equal('text/javascript');
         done();
       });
 
       it('should return the correct response body', function(done) {
-        expect(response.body).to.contain('Copyright 2017 Google LLC');
+        expect(body).to.contain('Copyright 2017 Google LLC');
         done();
       });
     });
 
     describe('Develop command specific node modules resolution behavior for CSS with query string', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://127.0.0.1:${port}/node_modules/simpledotcss/simple.css?xyz=123`
-          }, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`http://127.0.0.1:${port}/node_modules/simpledotcss/simple.css?xyz=123`);
+        body = await response.clone().text();
       });
 
       it('should return a 200', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/css');
+        expect(response.headers.get('content-type')).to.equal('text/css');
         done();
       });
 
       it('should correctly return CSS from the developers local files', function(done) {
-        expect(response.body).to.contain('/* Set the global variables for everything. Change these to use your own fonts/colours. */');
+        expect(body).to.contain('/* Set the global variables for everything. Change these to use your own fonts/colours. */');
         done();
       });
     });
@@ -1160,34 +985,25 @@ describe('Develop Greenwood With: ', function() {
     // https://github.com/ProjectEvergreen/greenwood/pull/687
     describe('Develop command specific workspace resolution when local file matches a file also in node_modules', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}:${port}/lit-html.js`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/lit-html.js`);
+        body = await response.clone().text();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/javascript');
+        expect(response.headers.get('content-type')).to.equal('text/javascript');
         done();
       });
 
       it('should return the correct response body', function(done) {
-        expect(response.body).to.equal('console.debug(\'its just a prank bro!\');');
+        expect(body).to.equal('console.debug(\'its just a prank bro!\');');
         done();
       });
     });
@@ -1195,34 +1011,25 @@ describe('Develop Greenwood With: ', function() {
     // https://github.com/ProjectEvergreen/greenwood/issues/715
     describe('Develop command node_modules resolution for a transient dependency\'s own imports', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}:${port}/node_modules/@bundled-es-modules/message-format/MessageFormat.js`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/node_modules/@bundled-es-modules/message-format/MessageFormat.js`);
+        body = await response.clone().text();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/javascript');
+        expect(response.headers.get('content-type')).to.equal('text/javascript');
         done();
       });
 
       it('should return the correct response body', function(done) {
-        expect(response.body).to.contain('export default messageFormat;');
+        expect(body).to.contain('export default messageFormat;');
         done();
       });
     });
@@ -1231,34 +1038,25 @@ describe('Develop Greenwood With: ', function() {
     // @lion/calendar/define -> /node_modules/@lion/calendar/lion-calendar.js
     describe('Develop command node_modules resolution for a flat export map entry from a dependency (not import or default)', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}:${port}/node_modules/@lion/calendar/lion-calendar.js`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/node_modules/@lion/calendar/lion-calendar.js`);
+        body = await response.clone().text();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/javascript');
+        expect(response.headers.get('content-type')).to.equal('text/javascript');
         done();
       });
 
       it('should return the correct response body', function(done) {
-        expect(response.body).to.contain('customElements.define(\'lion-calendar\', LionCalendar);');
+        expect(body).to.contain('customElements.define(\'lion-calendar\', LionCalendar);');
         done();
       });
     });
@@ -1266,39 +1064,30 @@ describe('Develop Greenwood With: ', function() {
     // need some better 404 handling here (promise reject handling for assets and routes)
     describe('Develop command with default 404 behavior', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}:${port}/abc.js`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/abc.js`);
+        body = await response.clone().text();
       });
 
       it('should return a 404 status', function(done) {
-        expect(response.statusCode).to.equal(404);
+        expect(response.status).to.equal(404);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/plain; charset=utf-8');
+        expect(response.headers.get('content-type')).to.equal('text/plain; charset=utf-8');
         done();
       });
 
       it('should return the correct response body', function(done) {
-        expect(response.body).to.contain('');
+        expect(body).to.contain('');
         done();
       });
 
       it('should return the correct status message body', function(done) {
-        expect(response.statusMessage).to.contain('Not Found');
+        expect(response.statusText).to.contain('Not Found');
         done();
       });
     });
@@ -1306,29 +1095,20 @@ describe('Develop Greenwood With: ', function() {
     // proxies to https://jsonplaceholder.typicode.com/posts via greenwood.config.js
     describe('Develop command with dev proxy', function() {
       let response = {};
+      let data;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}:${port}/posts?id=7`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = JSON.parse(body);
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/posts?id=7`);
+        data = await response.clone().json();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('application/json; charset=utf-8');
+        expect(response.headers.get('content-type')).to.equal('application/json; charset=utf-8');
         done();
       });
 
@@ -1339,7 +1119,7 @@ describe('Develop Greenwood With: ', function() {
       });
 
       it('should return the correct response body', function(done) {
-        expect(response.body).to.have.lengthOf(1);
+        expect(data).to.have.lengthOf(1);
         done();
       });
     });
@@ -1351,7 +1131,6 @@ describe('Develop Greenwood With: ', function() {
 
       before(async function() {
         response = await fetch(`${hostname}:${port}/api/greeting?name=${name}`);
-
         data = await response.json();
       });
 
@@ -1381,66 +1160,50 @@ describe('Develop Greenwood With: ', function() {
     describe('Develop command with API specific behaviors for an HTML ("fragment") API', function() {
       const name = 'Greenwood';
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}:${port}/api/fragment?name=${name}`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/api/fragment?name=${name}`);
+        body = await response.clone().text();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return a custom status message', function(done) {
-        expect(response.statusMessage).to.equal('SUCCESS!!!');
+        expect(response.statusText).to.equal('SUCCESS!!!');
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
+        expect(response.headers.get('content-type')).to.equal('text/html');
         done();
       });
 
       it('should return the correct response body', function(done) {
-        expect(response.body).to.contain(`<h1>Hello ${name}!!!</h1>`);
+        expect(body).to.contain(`<h1>Hello ${name}!!!</h1>`);
         done();
       });
     });
 
     describe('Develop command with API specific behaviors with a custom response', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}:${port}/api/missing`, (err, res) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/api/missing`);
+        body = await response.clone().text();
       });
 
       it('should return a 404 status', function(done) {
-        expect(response.statusCode).to.equal(404);
+        expect(response.status).to.equal(404);
         done();
       });
 
       it('should return a body of not found', function(done) {
-        expect(response.body).to.equal('Not Found');
+        expect(body).to.equal('Not Found');
         done();
       });
     });
@@ -1449,20 +1212,11 @@ describe('Develop Greenwood With: ', function() {
       let response = {};
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}:${port}/api/nothing`, (err, res) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/api/nothing`);
       });
 
       it('should return a custom status code', function(done) {
-        expect(response.statusCode).to.equal(204);
+        expect(response.status).to.equal(204);
         done();
       });
     });
@@ -1500,39 +1254,31 @@ describe('Develop Greenwood With: ', function() {
     describe('Develop command with POST API specific behaviors for FormData', function() {
       const param = 'Greenwood';
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.post({
-            url: `${hostname}:${port}/api/submit-form-data`,
-            form: {
-              name: param
-            }
-          }, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve(response);
-          });
+        response = await fetch(`${hostname}:${port}/api/submit-form-data`, {
+          method: 'POST',
+          body: new URLSearchParams({ name: param }).toString(),
+          headers: new Headers({
+            'content-type': 'application/x-www-form-urlencoded'
+          })
         });
+        body = await response.clone().text();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
-      it('should return the expected response message', function(done) {
-        expect(response.body).to.equal(`Thank you ${param} for your submission!`);
+      it('should return the expected content type header', function(done) {
+        expect(response.headers.get('content-type')).to.equal('text/html');
         done();
       });
 
-      it('should return the expected content type header', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
+      it('should return the expected response message', function(done) {
+        expect(body).to.equal(`Thank you ${param} for your submission!`);
         done();
       });
     });
diff --git a/packages/cli/test/cases/develop.default/src/api/submit-json.js b/packages/cli/test/cases/develop.default/src/api/submit-json.js
index b43a3e367..cb8ba972c 100644
--- a/packages/cli/test/cases/develop.default/src/api/submit-json.js
+++ b/packages/cli/test/cases/develop.default/src/api/submit-json.js
@@ -1,6 +1,6 @@
 export async function handler(request) {
-  const formData = await request.json();
-  const { name } = formData;
+  const data = await request.json();
+  const { name } = data;
   const body = { message: `Thank you ${name} for your submission!` };
 
   return new Response(JSON.stringify(body), {
diff --git a/packages/cli/test/cases/develop.plugins.context/develop.plugins.context.spec.js b/packages/cli/test/cases/develop.plugins.context/develop.plugins.context.spec.js
index 54b57579b..438931fce 100644
--- a/packages/cli/test/cases/develop.plugins.context/develop.plugins.context.spec.js
+++ b/packages/cli/test/cases/develop.plugins.context/develop.plugins.context.spec.js
@@ -22,7 +22,6 @@ import chai from 'chai';
 import fs from 'fs';
 import { JSDOM } from 'jsdom';
 import path from 'path';
-import request from 'request';
 import { runSmokeTest } from '../../../../../test/smoke-test.js';
 import { Runner } from 'gallinago';
 import { fileURLToPath, URL } from 'url';
@@ -66,27 +65,13 @@ describe('Develop Greenwood With: ', function() {
       let dom;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://127.0.0.1:${port}`,
-            headers: {
-              accept: 'text/html'
-            }
-          }, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-
-            dom = new JSDOM(body);
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}`);
+        const body = await response.clone().text();
+        dom = new JSDOM(body);
       });
 
       it('should return a 200', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
@@ -116,37 +101,26 @@ describe('Develop Greenwood With: ', function() {
 
     describe('Custom Theme Pack internal logic for resolving theme.css for local development', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://127.0.0.1:${port}/node_modules/${packageJson.name}/dist/styles/theme.css`
-          }, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/node_modules/${packageJson.name}/dist/styles/theme.css`);
+        body = await response.clone().text();
       });
 
       it('should return a 200', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
 
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/css');
+        expect(response.headers.get('content-type')).to.equal('text/css');
         done();
       });
 
       it('should correctly return CSS from the developers local files', function(done) {
-        expect(response.body).to.equal(':root {\n  --color-primary: #135;\n}');
+        expect(body).to.equal(':root {\n  --color-primary: #135;\n}');
 
         done();
       });
@@ -154,37 +128,26 @@ describe('Develop Greenwood With: ', function() {
 
     describe('Custom Theme Pack internal logic for resolving greeting.js for local development', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://127.0.0.1:${port}/node_modules/${packageJson.name}/dist/components/greeting.js`
-          }, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/node_modules/${packageJson.name}/dist/components/greeting.js`);
+        body = await response.clone().text();
       });
 
       it('should return a 200', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
 
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/javascript');
+        expect(response.headers.get('content-type')).to.equal('text/javascript');
         done();
       });
 
       it('should correctly return JavaScript from the developers local files', function(done) {
-        expect(response.body).to.contain('customElements.define(\'x-greeting\', GreetingComponent);');
+        expect(body).to.contain('customElements.define(\'x-greeting\', GreetingComponent);');
 
         done();
       });
diff --git a/packages/cli/test/cases/develop.spa/develop.spa.spec.js b/packages/cli/test/cases/develop.spa/develop.spa.spec.js
index 6fffefd76..f4b492202 100644
--- a/packages/cli/test/cases/develop.spa/develop.spa.spec.js
+++ b/packages/cli/test/cases/develop.spa/develop.spa.spec.js
@@ -21,7 +21,6 @@ import chai from 'chai';
 import fs from 'fs';
 import path from 'path';
 import { getDependencyFiles } from '../../../../../test/utils.js';
-import request from 'request';
 import { runSmokeTest } from '../../../../../test/smoke-test.js';
 import { Runner } from 'gallinago';
 import { fileURLToPath, URL } from 'url';
@@ -75,117 +74,78 @@ describe('Develop Greenwood With: ', function() {
 
     describe('Develop command specific HTML behaviors for client side routing at root - /', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://127.0.0.1:${port}/`,
-            headers: {
-              accept: 'text/html'
-            }
-          }, (err, res) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/`);
+        body = await response.clone().text();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
+        expect(response.headers.get('content-type')).to.equal('text/html');
         done();
       });
 
       it('should return a 200', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
 
         done();
       });
 
       it('should return the expected body contents', function(done) {
-        expect(removeWhiteSpace(response.body.match(BODY_REGEX)[0])).to.equal(expected);
+        expect(removeWhiteSpace(body.match(BODY_REGEX)[0])).to.equal(expected);
         done();
       });
     });
 
     describe('Develop command specific HTML behaviors for client side routing at 1 level route - /<resource>', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://127.0.0.1:${port}/artists/`,
-            headers: {
-              accept: 'text/html'
-            }
-          }, (err, res) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-
-            resolve();
-          });
-        });
+        response = await fetch(`http://127.0.0.1:${port}/artists/`);
+        body = await response.clone().text();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
+        expect(response.headers.get('content-type')).to.equal('text/html');
         done();
       });
 
       it('should return a 200', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
 
         done();
       });
 
       it('should return the expected body contents', function(done) {
-        expect(removeWhiteSpace(response.body.match(BODY_REGEX)[0])).to.equal(expected);
+        expect(removeWhiteSpace(body.match(BODY_REGEX)[0])).to.equal(expected);
         done();
       });
     });
 
     describe('Develop command specific HTML behaviors for client side routing at 1 level route - /<resource>/:id', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://127.0.0.1:${port}/artists/1`,
-            headers: {
-              accept: 'text/html'
-            }
-          }, (err, res) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-
-            resolve();
-          });
-        });
+        response = await fetch(`http://127.0.0.1:${port}/artists/1`);
+        body = await response.clone().text();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
+        expect(response.headers.get('content-type')).to.equal('text/html');
         done();
       });
 
       it('should return a 200', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
 
         done();
       });
 
       it('should return the expected body contents', function(done) {
-        expect(removeWhiteSpace(response.body.match(BODY_REGEX)[0])).to.equal(expected);
+        expect(removeWhiteSpace(body.match(BODY_REGEX)[0])).to.equal(expected);
         done();
       });
     });
@@ -193,36 +153,26 @@ describe('Develop Greenwood With: ', function() {
     // https://github.com/ProjectEvergreen/greenwood/issues/1064
     describe('Develop command specific workspace resolution behavior that does not think its a client side route', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://127.0.0.1:${port}/events/main.css`
-          }, (err, res) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-
-            resolve();
-          });
-        });
+        response = await fetch(`http://127.0.0.1:${port}/events/main.css`);
+        body = await response.clone().text();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/css');
+        expect(response.headers.get('content-type')).to.equal('text/css');
         done();
       });
 
       it('should return a 200', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
 
         done();
       });
 
       it('should return the expected body contents', function(done) {
-        expect(response.body.replace(/\n/g, '').indexOf('* {  color: red;}')).to.equal(0);
+        expect(body.replace(/\n/g, '').indexOf('* {  color: red;}')).to.equal(0);
         done();
       });
     });
@@ -230,39 +180,30 @@ describe('Develop Greenwood With: ', function() {
     // https://github.com/ProjectEvergreen/greenwood/issues/803
     describe('Develop command specific node modules resolution behavior that does not think its a client side route', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://127.0.0.1:${port}/node_modules/simpledotcss/simple.css`,
-            headers: {
-              accept: 'ext/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9'
-            }
-          }, (err, res) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-
-            resolve();
-          });
+        response = await fetch(`http://127.0.0.1:${port}/node_modules/simpledotcss/simple.css`, {
+          headers: new Headers({
+            accept: 'ext/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9'
+          })
         });
+        body = await response.clone().text();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/css');
+        expect(response.headers.get('content-type')).to.equal('text/css');
         done();
       });
 
       it('should return a 200', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
 
         done();
       });
 
       it('should return the expected body contents', function(done) {
-        expect(response.body.indexOf('/* Set the global variables for everything. Change these to use your own fonts/colours. */')).to.equal(0);
+        expect(body.indexOf('/* Set the global variables for everything. Change these to use your own fonts/colours. */')).to.equal(0);
         done();
       });
     });
diff --git a/packages/cli/test/cases/develop.ssr/develop.ssr.spec.js b/packages/cli/test/cases/develop.ssr/develop.ssr.spec.js
index d0fac0374..d12b4b817 100644
--- a/packages/cli/test/cases/develop.ssr/develop.ssr.spec.js
+++ b/packages/cli/test/cases/develop.ssr/develop.ssr.spec.js
@@ -26,7 +26,6 @@ import fs from 'fs';
 import { JSDOM } from 'jsdom';
 import path from 'path';
 import { getSetupFiles, getDependencyFiles, getOutputTeardownFiles } from '../../../../../test/utils.js';
-import request from 'request';
 import { Runner } from 'gallinago';
 import { fileURLToPath, URL } from 'url';
 
@@ -139,39 +138,29 @@ describe('Develop Greenwood With: ', function() {
       let response = {};
       let dom;
       let artistsPageGraphData;
+      let body;
 
       before(async function() {
         const graph = JSON.parse(await fs.promises.readFile(path.join(outputPath, '.greenwood/graph.json'), 'utf-8'));
 
+        response = await fetch(`${hostname}/artists/`);
+        body = await response.text();
+        dom = new JSDOM(body);
         artistsPageGraphData = graph.filter(page => page.route === '/artists/')[0];
-
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/artists/`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-            dom = new JSDOM(body);
-
-            resolve();
-          });
-        });
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
+        expect(response.headers.get('content-type')).to.equal('text/html');
         done();
       });
 
       it('should return a response body', function(done) {
-        expect(response.body).to.not.be.undefined;
+        expect(body).to.not.be.undefined;
         done();
       });
 
diff --git a/packages/cli/test/cases/serve.config.static-router/serve.config.static-router.spec.js b/packages/cli/test/cases/serve.config.static-router/serve.config.static-router.spec.js
index e990e335d..d3be8b253 100644
--- a/packages/cli/test/cases/serve.config.static-router/serve.config.static-router.spec.js
+++ b/packages/cli/test/cases/serve.config.static-router/serve.config.static-router.spec.js
@@ -24,7 +24,6 @@
 import chai from 'chai';
 import path from 'path';
 import { getSetupFiles, getDependencyFiles, getOutputTeardownFiles } from '../../../../../test/utils.js';
-import request from 'request';
 import { runSmokeTest } from '../../../../../test/smoke-test.js';
 import { Runner } from 'gallinago';
 import { fileURLToPath, URL } from 'url';
@@ -73,35 +72,26 @@ describe('Serve Greenwood With: ', function() {
 
     describe('Serve command with SSR route with staticRouter config set', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/artists/`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/artists/`);
+        body = await response.clone().text();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
+        expect(response.headers.get('content-type')).to.equal('text/html');
         done();
       });
 
       it('should return the correct response body', function(done) {
-        expect(response.body).to.contain('<h2>Analog</h2>');
-        expect(response.body).to.contain('<img src="/assets/analog.png" alt="Analog"/>');
+        expect(body).to.contain('<h2>Analog</h2>');
+        expect(body).to.contain('<img src="/assets/analog.png" alt="Analog"/>');
         done();
       });
     });
diff --git a/packages/cli/test/cases/serve.default.api/serve.default.api.spec.js b/packages/cli/test/cases/serve.default.api/serve.default.api.spec.js
index 039d37c33..4e9ce751b 100644
--- a/packages/cli/test/cases/serve.default.api/serve.default.api.spec.js
+++ b/packages/cli/test/cases/serve.default.api/serve.default.api.spec.js
@@ -26,7 +26,6 @@
 import chai from 'chai';
 import path from 'path';
 import { getSetupFiles, getOutputTeardownFiles } from '../../../../../test/utils.js';
-import request from 'request';
 import { runSmokeTest } from '../../../../../test/smoke-test.js';
 import { Runner } from 'gallinago';
 import { fileURLToPath, URL } from 'url';
@@ -67,40 +66,31 @@ describe('Serve Greenwood With: ', function() {
     describe('Serve command with API specific behaviors for a JSON API', function() {
       const name = 'Greenwood';
       let response = {};
+      let data;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/api/greeting?name=${name}`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = JSON.parse(body);
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/api/greeting?name=${name}`);
+        data = await response.clone().json();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return a default status message', function(done) {
         // OK appears to be a Koa default when statusText is an empty string
-        expect(response.statusMessage).to.equal('OK');
+        expect(response.statusText).to.equal('OK');
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('application/json');
+        expect(response.headers.get('content-type')).to.equal('application/json');
         done();
       });
 
       it('should return the correct response body', function(done) {
-        expect(response.body.message).to.equal(`Hello ${name}!!!`);
+        expect(data.message).to.equal(`Hello ${name}!!!`);
         done();
       });
     });
@@ -108,39 +98,30 @@ describe('Serve Greenwood With: ', function() {
     describe('Serve command with API specific behaviors for an HTML ("fragment") API', function() {
       const name = 'Greenwood';
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/api/fragment?name=${name}`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/api/fragment?name=${name}`);
+        body = await response.clone().text();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return a custom status message', function(done) {
-        expect(response.statusMessage).to.equal('SUCCESS!!!');
+        expect(response.statusText).to.equal('SUCCESS!!!');
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
+        expect(response.headers.get('content-type')).to.equal('text/html');
         done();
       });
 
       it('should return the correct response body', function(done) {
-        expect(response.body).to.contain(`<h1>Hello ${name}!!!</h1>`);
+        expect(body).to.contain(`<h1>Hello ${name}!!!</h1>`);
         done();
       });
     });
@@ -149,20 +130,11 @@ describe('Serve Greenwood With: ', function() {
       let response = {};
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/api/nothing`, (err, res) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/api/nothing`);
       });
 
       it('should return a custom status code', function(done) {
-        expect(response.statusCode).to.equal(204);
+        expect(response.status).to.equal(204);
         done();
       });
     });
@@ -171,51 +143,31 @@ describe('Serve Greenwood With: ', function() {
       let response = {};
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/api/foo`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/api/foo`);
       });
 
       it('should return a 404 status', function(done) {
-        expect(response.statusCode).to.equal(404);
+        expect(response.status).to.equal(404);
         done();
       });
     });
 
     describe('Serve command with API specific behaviors with a custom response', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/api/missing`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/api/missing`);
+        body = await response.clone().text();
       });
 
       it('should return a 404 status', function(done) {
-        expect(response.statusCode).to.equal(404);
+        expect(response.status).to.equal(404);
         done();
       });
 
       it('should return a body of not found', function(done) {
-        expect(response.body).to.equal('Not Found');
+        expect(body).to.equal('Not Found');
         done();
       });
     });
@@ -223,47 +175,35 @@ describe('Serve Greenwood With: ', function() {
     describe('Serve command with POST API specific behaviors for JSON', function() {
       const param = 'Greenwood';
       let response = {};
+      let data;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.post({
-            url: `${hostname}/api/submit-json`,
-            body: {
-              name: param
-            },
-            json: true
-          }, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve(response);
-          });
+        response = await fetch(`${hostname}/api/submit-json`, {
+          method: 'POST',
+          body: JSON.stringify({ name: param })
         });
+        data = await response.clone().json();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
-      it('should return the expected response message', function(done) {
-        const { message } = response.body;
-
-        expect(message).to.equal(`Thank you ${param} for your submission!`);
+      it('should return the expected content type header', function(done) {
+        expect(response.headers.get('content-type')).to.equal('application/json');
         done();
       });
 
-      it('should return the expected content type header', function(done) {
-        expect(response.headers['content-type']).to.equal('application/json');
+      it('should return the secret header in the response', function(done) {
+        expect(response.headers.get('x-secret')).to.equal('1234');
         done();
       });
 
-      it('should return the secret header in the response', function(done) {
-        expect(response.headers['x-secret']).to.equal('1234');
+      it('should return the expected response message', function(done) {
+        const { message } = data;
+
+        expect(message).to.equal(`Thank you ${param} for your submission!`);
         done();
       });
     });
@@ -271,39 +211,31 @@ describe('Serve Greenwood With: ', function() {
     describe('Serve command with POST API specific behaviors for FormData', function() {
       const param = 'Greenwood';
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.post({
-            url: `${hostname}/api/submit-form-data`,
-            form: {
-              name: param
-            }
-          }, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve(response);
-          });
+        response = await fetch(`${hostname}/api/submit-form-data`, {
+          method: 'POST',
+          body: new URLSearchParams({ name: param }).toString(),
+          headers: new Headers({
+            'content-type': 'application/x-www-form-urlencoded'
+          })
         });
+        body = await response.clone().text();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
-      it('should return the expected response message', function(done) {
-        expect(response.body).to.equal(`Thank you ${param} for your submission!`);
+      it('should return the expected content type header', function(done) {
+        expect(response.headers.get('content-type')).to.equal('text/html');
         done();
       });
 
-      it('should return the expected content type header', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
+      it('should return the expected response message', function(done) {
+        expect(body).to.equal(`Thank you ${param} for your submission!`);
         done();
       });
     });
diff --git a/packages/cli/test/cases/serve.default.ssr-prerender-api-hybrid/serve.default.ssr-prerender-api-hybrid.spec.js b/packages/cli/test/cases/serve.default.ssr-prerender-api-hybrid/serve.default.ssr-prerender-api-hybrid.spec.js
index 87c535b13..ecdd62f82 100644
--- a/packages/cli/test/cases/serve.default.ssr-prerender-api-hybrid/serve.default.ssr-prerender-api-hybrid.spec.js
+++ b/packages/cli/test/cases/serve.default.ssr-prerender-api-hybrid/serve.default.ssr-prerender-api-hybrid.spec.js
@@ -29,7 +29,6 @@ import glob from 'glob-promise';
 import { JSDOM } from 'jsdom';
 import path from 'path';
 import { getSetupFiles, getOutputTeardownFiles } from '../../../../../test/utils.js';
-import request from 'request';
 import { runSmokeTest } from '../../../../../test/smoke-test.js';
 import { Runner } from 'gallinago';
 import { fileURLToPath, URL } from 'url';
@@ -72,36 +71,27 @@ describe('Serve Greenwood With: ', function() {
     describe('Serve command that prerenders SSR pages', function() {
       let dom;
       let response;
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-            dom = new JSDOM(body);
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/`);
+        body = await response.clone().text();
+        dom = new JSDOM(body);
       });
 
       describe('Serve command with HTML response for the home page', function() {
         it('should return a 200 status', function(done) {
-          expect(response.statusCode).to.equal(200);
+          expect(response.status).to.equal(200);
           done();
         });
 
         it('should return the correct content type', function(done) {
-          expect(response.headers['content-type']).to.equal('text/html');
+          expect(response.headers.get('content-type')).to.equal('text/html');
           done();
         });
 
         it('should return a response body', function(done) {
-          expect(response.body).to.not.be.undefined;
+          expect(body).to.not.be.undefined;
           done();
         });
 
@@ -140,34 +130,25 @@ describe('Serve Greenwood With: ', function() {
     describe('Serve command with API specific behaviors for a JSON API', function() {
       const name = 'Greenwood';
       let response = {};
+      let data;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/api/greeting?name=${name}`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = JSON.parse(body);
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/api/greeting?name=${name}`);
+        data = await response.clone().json();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('application/json');
+        expect(response.headers.get('content-type')).to.equal('application/json');
         done();
       });
 
       it('should return the correct response body', function(done) {
-        expect(response.body.message).to.equal(`Hello ${name}!!!`);
+        expect(data.message).to.equal(`Hello ${name}!!!`);
         done();
       });
     });
diff --git a/packages/cli/test/cases/serve.default.ssr-prerender/serve.default.ssr-prerender.spec.js b/packages/cli/test/cases/serve.default.ssr-prerender/serve.default.ssr-prerender.spec.js
index 063f98db3..e3d382c5d 100644
--- a/packages/cli/test/cases/serve.default.ssr-prerender/serve.default.ssr-prerender.spec.js
+++ b/packages/cli/test/cases/serve.default.ssr-prerender/serve.default.ssr-prerender.spec.js
@@ -27,7 +27,6 @@ import glob from 'glob-promise';
 import { JSDOM } from 'jsdom';
 import path from 'path';
 import { getSetupFiles, getOutputTeardownFiles } from '../../../../../test/utils.js';
-import request from 'request';
 import { runSmokeTest } from '../../../../../test/smoke-test.js';
 import { Runner } from 'gallinago';
 import { fileURLToPath, URL } from 'url';
@@ -69,36 +68,27 @@ describe('Serve Greenwood With: ', function() {
     describe('Serve command that prerenders SSR pages', function() {
       let dom;
       let response;
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-            dom = new JSDOM(body);
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/`);
+        body = await response.clone().text();
+        dom = new JSDOM(body);
       });
 
       describe('Serve command with HTML response for the home page', function() {
         it('should return a 200 status', function(done) {
-          expect(response.statusCode).to.equal(200);
+          expect(response.status).to.equal(200);
           done();
         });
 
         it('should return the correct content type', function(done) {
-          expect(response.headers['content-type']).to.equal('text/html');
+          expect(response.headers.get('content-type')).to.equal('text/html');
           done();
         });
 
         it('should return a response body', function(done) {
-          expect(response.body).to.not.be.undefined;
+          expect(body).to.not.be.undefined;
           done();
         });
 
diff --git a/packages/cli/test/cases/serve.default.ssr-static-export/serve.default.ssr-static-export.spec.js b/packages/cli/test/cases/serve.default.ssr-static-export/serve.default.ssr-static-export.spec.js
index 7db6a586f..977b201a6 100644
--- a/packages/cli/test/cases/serve.default.ssr-static-export/serve.default.ssr-static-export.spec.js
+++ b/packages/cli/test/cases/serve.default.ssr-static-export/serve.default.ssr-static-export.spec.js
@@ -26,7 +26,6 @@ import glob from 'glob-promise';
 import { JSDOM } from 'jsdom';
 import path from 'path';
 import { getSetupFiles, getDependencyFiles, getOutputTeardownFiles } from '../../../../../test/utils.js';
-import request from 'request';
 import { runSmokeTest } from '../../../../../test/smoke-test.js';
 import { Runner } from 'gallinago';
 import { fileURLToPath, URL } from 'url';
@@ -147,35 +146,26 @@ describe('Serve Greenwood With: ', function() {
     describe('Serve command that tests for static HTML export from SSR route', function() {
       let dom;
       let response;
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/artists/`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-            dom = new JSDOM(body);
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/artists/`);
+        body = await response.clone().text();
+        dom = new JSDOM(body);
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
+        expect(response.headers.get('content-type')).to.equal('text/html');
         done();
       });
 
       it('should return a response body', function(done) {
-        expect(response.body).to.not.be.undefined;
+        expect(body).to.not.be.undefined;
         done();
       });
 
diff --git a/packages/cli/test/cases/serve.default/serve.default.spec.js b/packages/cli/test/cases/serve.default/serve.default.spec.js
index 0677e8d88..ca93bc372 100644
--- a/packages/cli/test/cases/serve.default/serve.default.spec.js
+++ b/packages/cli/test/cases/serve.default/serve.default.spec.js
@@ -35,7 +35,6 @@
 import chai from 'chai';
 import path from 'path';
 import { getSetupFiles, getOutputTeardownFiles } from '../../../../../test/utils.js';
-import request from 'request';
 import { runSmokeTest } from '../../../../../test/smoke-test.js';
 import { Runner } from 'gallinago';
 import { fileURLToPath, URL } from 'url';
@@ -99,34 +98,25 @@ describe('Serve Greenwood With: ', function() {
     // https://github.com/ProjectEvergreen/greenwood/issues/1059
     describe('Serve command with dev proxy with an /api prefix', function() {
       let response = {};
+      let data;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/api/posts?id=7`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = JSON.parse(body);
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/api/posts?id=7`);
+        data = await response.clone().json();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('application/json; charset=utf-8');
+        expect(response.headers.get('content-type')).to.equal('application/json; charset=utf-8');
         done();
       });
 
       it('should return the correct response body', function(done) {
-        expect(JSON.stringify(response.body)).to.equal('{}');
+        expect(JSON.stringify(data)).to.equal('{}');
         done();
       });
     });
@@ -134,69 +124,50 @@ describe('Serve Greenwood With: ', function() {
     describe('Serve command with image (png) specific behavior', function() {
       const ext = 'png';
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-
-          request.get(`${hostname}/assets/logo.${ext}`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/assets/logo.${ext}`);
+        body = await response.clone().text();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal(`image/${ext}`);
+        expect(response.headers.get('content-type')).to.equal(`image/${ext}`);
         done();
       });
 
       it('should return binary data', function(done) {
-        expect(response.body).to.contain('PNG');
+        expect(body).to.contain('PNG');
         done();
       });
     });
 
     describe('Serve command with image (ico) specific behavior', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/assets/favicon.ico`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve(response);
-          });
-        });
+        response = await fetch(`${hostname}/assets/favicon.ico`);
+        body = await response.clone().text();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('image/x-icon');
+        expect(response.headers.get('content-type')).to.equal('image/x-icon');
         done();
       });
 
       it('should return binary data', function(done) {
-        expect(response.body).to.contain('\u0000');
+        expect(body).to.contain('\u0000');
         done();
       });
     });
@@ -204,34 +175,25 @@ describe('Serve Greenwood With: ', function() {
     describe('Serve command with SVG specific behavior', function() {
       const ext = 'svg';
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/assets/webcomponents.${ext}`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/assets/webcomponents.${ext}`);
+        body = await response.clone().text();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal(`image/${ext}+xml`);
+        expect(response.headers.get('content-type')).to.equal(`image/${ext}+xml`);
         done();
       });
 
       it('should return the correct response body', function(done) {
-        expect(response.body.indexOf('<svg')).to.equal(0);
+        expect(body.indexOf('<svg')).to.equal(0);
         done();
       });
     });
@@ -239,34 +201,25 @@ describe('Serve Greenwood With: ', function() {
     describe('Serve command with font specific (.woff) behavior', function() {
       const ext = 'woff';
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/assets/source-sans-pro.woff?v=1`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/assets/source-sans-pro.woff?v=1`);
+        body = await response.clone().text();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal(`font/${ext}`);
+        expect(response.headers.get('content-type')).to.equal(`font/${ext}`);
         done();
       });
 
       it('should return the correct response body', function(done) {
-        expect(response.body).to.contain('wOFF');
+        expect(body).to.contain('wOFF');
         done();
       });
     });
@@ -274,148 +227,110 @@ describe('Serve Greenwood With: ', function() {
     describe('Serve command with generic video container format (.mp4) behavior', function() {
       const ext = 'mp4';
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `${hostname}/assets/splash-clip.mp4`
-          }, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/assets/splash-clip.mp4`);
+        body = await response.clone().text();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal(`video/${ext}`);
+        expect(response.headers.get('content-type')).to.equal(`video/${ext}`);
         done();
       });
 
       it('should return the correct content length', function(done) {
-        expect(response.headers['content-length']).to.equal('2498461');
+        expect(response.headers.get('content-length')).to.equal('2498461');
         done();
       });
 
       it('should return the correct response body', function(done) {
-        expect(response.body).to.contain(ext);
+        expect(body).to.contain(ext);
         done();
       });
     });
 
     describe('Serve command with audio format (.mp3) behavior', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/assets/song-sample.mp3`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/assets/song-sample.mp3`);
+        body = await response.clone().text();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('audio/mpeg');
+        expect(response.headers.get('content-type')).to.equal('audio/mpeg');
         done();
       });
 
       it('should return the correct content length', function(done) {
-        expect(response.headers['content-length']).to.equal('5425061');
+        expect(response.headers.get('content-length')).to.equal('5425061');
         done();
       });
 
       it('should return the correct response body', function(done) {
-        expect(response.body).to.contain('ID3');
+        expect(body).to.contain('ID3');
         done();
       });
     });
 
     describe('Serve command with JSON specific behavior', function() {
       let response = {};
+      let data;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/assets/data.json`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = JSON.parse(body);
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/assets/data.json`);
+        data = await response.clone().json();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('application/json');
+        expect(response.headers.get('content-type')).to.equal('application/json');
         done();
       });
 
       it('should return the correct response body', function(done) {
-        expect(response.body.name).to.equal('Marvin');
+        expect(data.name).to.equal('Marvin');
         done();
       });
     });
 
     describe('Serve command with source map specific behavior', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/assets/router.js.map`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/assets/router.js.map`);
+        body = await response.clone().text();
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('application/json');
+        expect(response.headers.get('content-type')).to.equal('application/json');
         done();
       });
 
       it('should return the correct response body', function(done) {
-        expect(response.body).to.contain('"sources":["../packages/cli/src/lib/router.js"]');
+        expect(body).to.contain('"sources":["../packages/cli/src/lib/router.js"]');
         done();
       });
     });
@@ -424,22 +339,11 @@ describe('Serve Greenwood With: ', function() {
       let response = {};
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/foo.png`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/foo.png`);
       });
 
       it('should return a 404 status', function(done) {
-        expect(response.statusCode).to.equal(404);
+        expect(response.status).to.equal(404);
         done();
       });
     });
diff --git a/packages/cli/test/cases/serve.spa/serve.spa.spec.js b/packages/cli/test/cases/serve.spa/serve.spa.spec.js
index 834016ae3..912a546bb 100644
--- a/packages/cli/test/cases/serve.spa/serve.spa.spec.js
+++ b/packages/cli/test/cases/serve.spa/serve.spa.spec.js
@@ -21,7 +21,6 @@ import chai from 'chai';
 import fs from 'fs';
 import { getOutputTeardownFiles } from '../../../../../test/utils.js';
 import path from 'path';
-import request from 'request';
 import { runSmokeTest } from '../../../../../test/smoke-test.js';
 import { Runner } from 'gallinago';
 import { fileURLToPath, URL } from 'url';
@@ -71,116 +70,78 @@ describe('Serve Greenwood With: ', function() {
 
     describe('Serve command specific HTML behaviors for client side routing at root - /', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://127.0.0.1:${port}/`,
-            headers: {
-              accept: 'text/html'
-            }
-          }, (err, res) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/`);
+        body = await response.clone().text();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
+        expect(response.headers.get('content-type')).to.equal('text/html');
         done();
       });
 
       it('should return a 200', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
 
         done();
       });
 
       it('should return the expected body contents', function(done) {
-        expect(removeWhiteSpace(response.body.match(BODY_REGEX)[0])).to.equal(expected);
+        expect(removeWhiteSpace(body.match(BODY_REGEX)[0])).to.equal(expected);
         done();
       });
     });
 
     describe('Serve command specific HTML behaviors for client side routing at 1 level route - /<resource>', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://127.0.0.1:${port}/artists/`,
-            headers: {
-              accept: 'text/html'
-            }
-          }, (err, res) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/artists/`);
+        body = await response.clone().text();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
+        expect(response.headers.get('content-type')).to.equal('text/html');
         done();
       });
 
       it('should return a 200', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
 
         done();
       });
 
       it('should return the expected body contents', function(done) {
-        expect(removeWhiteSpace(response.body.match(BODY_REGEX)[0])).to.equal(expected);
+        expect(removeWhiteSpace(body.match(BODY_REGEX)[0])).to.equal(expected);
         done();
       });
     });
 
     describe('Serve command specific HTML behaviors for client side routing at 1 level route - /<resource>/:id', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://127.0.0.1:${port}/artists/1`,
-            headers: {
-              accept: 'text/html'
-            }
-          }, (err, res) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/artists/1`);
+        body = await response.clone().text();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
+        expect(response.headers.get('content-type')).to.equal('text/html');
         done();
       });
 
       it('should return a 200', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
 
         done();
       });
 
       it('should return the expected body contents', function(done) {
-        expect(removeWhiteSpace(response.body.match(BODY_REGEX)[0])).to.equal(expected);
+        expect(removeWhiteSpace(body.match(BODY_REGEX)[0])).to.equal(expected);
         done();
       });
     });
diff --git a/packages/cli/test/cases/theme-pack/theme-pack.develop.spec.js b/packages/cli/test/cases/theme-pack/theme-pack.develop.spec.js
index 7cdefb39f..85b455571 100644
--- a/packages/cli/test/cases/theme-pack/theme-pack.develop.spec.js
+++ b/packages/cli/test/cases/theme-pack/theme-pack.develop.spec.js
@@ -29,7 +29,6 @@ import chai from 'chai';
 import fs from 'fs';
 import { JSDOM } from 'jsdom';
 import path from 'path';
-import request from 'request';
 import { Runner } from 'gallinago';
 import { runSmokeTest } from '../../../../../test/smoke-test.js';
 import { fileURLToPath, URL } from 'url';
@@ -73,27 +72,13 @@ describe('Develop Greenwood With: ', function() {
       let dom;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://127.0.0.1:${port}`,
-            headers: {
-              accept: 'text/html'
-            }
-          }, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-
-            dom = new JSDOM(body);
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}`);
+        const body = await response.clone().text();
+        dom = new JSDOM(body);
       });
 
       it('should return a 200', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
@@ -116,37 +101,26 @@ describe('Develop Greenwood With: ', function() {
 
     describe('Custom Theme Pack internal logic for resolving theme.css for local development', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://127.0.0.1:${port}/node_modules/${packageJson.name}/dist/styles/theme.css`
-          }, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/node_modules/${packageJson.name}/dist/styles/theme.css`);
+        body = await response.clone().text();
       });
 
       it('should return a 200', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
 
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/css');
+        expect(response.headers.get('content-type')).to.equal('text/css');
         done();
       });
 
       it('should correctly return CSS from the developers local files', function(done) {
-        expect(response.body).to.equal(':root {\n  --color-primary: #135;\n  --color-secondary: #74b238;\n  --font-family: \'Optima\', sans-serif;\n}');
+        expect(body).to.equal(':root {\n  --color-primary: #135;\n  --color-secondary: #74b238;\n  --font-family: \'Optima\', sans-serif;\n}');
 
         done();
       });
@@ -154,37 +128,26 @@ describe('Develop Greenwood With: ', function() {
 
     describe('Custom Theme Pack internal logic for resolving header.js for local development', function() {
       let response = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get({
-            url: `http://127.0.0.1:${port}/node_modules/${packageJson.name}/dist/components/header.js`
-          }, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}:${port}/node_modules/${packageJson.name}/dist/components/header.js`);
+        body = await response.clone().text();
       });
 
       it('should return a 200', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
 
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/javascript');
+        expect(response.headers.get('content-type')).to.equal('text/javascript');
         done();
       });
 
       it('should correctly return JavaScript from the developers local files', function(done) {
-        expect(response.body).to.contain('customElements.define(\'x-header\', HeaderComponent);');
+        expect(body).to.contain('customElements.define(\'x-header\', HeaderComponent);');
 
         done();
       });
diff --git a/packages/plugin-import-css/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js b/packages/plugin-import-css/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
index fe629e064..85b36295e 100644
--- a/packages/plugin-import-css/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
+++ b/packages/plugin-import-css/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
@@ -112,13 +112,12 @@ describe('Serve Greenwood With: ', function() {
 
     describe('Serve command with API specific behaviors for an HTML ("fragment") API', function() {
       let response = {};
-      let data;
       let fragmentsApiDom;
 
       before(async function() {
         response = await fetch(`${hostname}/api/fragment`);
-        data = await response.json();
-        fragmentsApiDom = new JSDOM(data);
+        const body = await response.clone().text();
+        fragmentsApiDom = new JSDOM(body);
       });
 
       it('should return a 200 status', function() {
@@ -126,7 +125,7 @@ describe('Serve Greenwood With: ', function() {
       });
 
       it('should return a custom status message', function() {
-        expect(response.statusMessage).to.equal('OK');
+        expect(response.statusText).to.equal('OK');
       });
 
       it('should return the correct content type', function() {

From 4de60da69c7499d31838d4425e95c3081e626242 Mon Sep 17 00:00:00 2001
From: Owen Buckley <owenbuckley13@gmail.com>
Date: Tue, 7 Nov 2023 09:57:47 -0500
Subject: [PATCH 10/10] refactoring all specs

---
 .mocharc.cjs                                  |   4 +-
 .../cases/develop.ssr/develop.ssr.spec.js     |  23 +--
 .../serve.default.ssr.spec.js                 | 184 ++++++------------
 .../cases/exp-serve.ssr/exp-serve.ssr.spec.js |  21 +-
 .../exp-prerender.serve.ssr.spec.js           |  26 ++-
 .../cases/exp-serve.ssr/exp-serve.ssr.spec.js |   8 +-
 6 files changed, 94 insertions(+), 172 deletions(-)

diff --git a/.mocharc.cjs b/.mocharc.cjs
index c152173db..51980dafe 100644
--- a/.mocharc.cjs
+++ b/.mocharc.cjs
@@ -1,5 +1,3 @@
 module.exports = {
-  timeout: 90000,
-  bail: true,
-  exit: true,
+  timeout: 90000
 };
\ No newline at end of file
diff --git a/packages/cli/test/cases/develop.ssr/develop.ssr.spec.js b/packages/cli/test/cases/develop.ssr/develop.ssr.spec.js
index d12b4b817..1f1bf608c 100644
--- a/packages/cli/test/cases/develop.ssr/develop.ssr.spec.js
+++ b/packages/cli/test/cases/develop.ssr/develop.ssr.spec.js
@@ -230,35 +230,26 @@ describe('Develop Greenwood With: ', function() {
       const postId = 1;
       let response = {};
       let dom = {};
+      let body;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/post/?id=${postId}`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-            dom = new JSDOM(body);
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/post/?id=${postId}`);
+        body = await response.clone().text();
+        dom = new JSDOM(body);
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
+        expect(response.headers.get('content-type')).to.equal('text/html');
         done();
       });
 
       it('should return a response body', function(done) {
-        expect(response.body).to.not.be.undefined;
+        expect(body).to.not.be.undefined;
         done();
       });
 
diff --git a/packages/cli/test/cases/serve.default.ssr/serve.default.ssr.spec.js b/packages/cli/test/cases/serve.default.ssr/serve.default.ssr.spec.js
index 9999fb0bb..4490f5e17 100644
--- a/packages/cli/test/cases/serve.default.ssr/serve.default.ssr.spec.js
+++ b/packages/cli/test/cases/serve.default.ssr/serve.default.ssr.spec.js
@@ -35,7 +35,6 @@ import fs from 'fs';
 import { JSDOM } from 'jsdom';
 import path from 'path';
 import { getSetupFiles, getOutputTeardownFiles } from '../../../../../test/utils.js';
-import request from 'request';
 import { runSmokeTest } from '../../../../../test/smoke-test.js';
 import { Runner } from 'gallinago';
 import { fileURLToPath } from 'url';
@@ -74,63 +73,18 @@ describe('Serve Greenwood With: ', function() {
 
     runSmokeTest(['serve'], LABEL);
 
-    let response = {};
-    let artistsPageDom;
-    let homePageDom;
-    let usersPageDom;
-    let artistsPageGraphData;
-
-    before(async function() {
-      return new Promise((resolve, reject) => {
-        request.get(`${hostname}/`, (err, res, body) => {
-          if (err) {
-            reject();
-          }
-
-          homePageDom = new JSDOM(body);
-
-          resolve();
-        });
-      });
-    });
-
-    before(async function() {
-      const graph = JSON.parse(await fs.promises.readFile(path.join(outputPath, 'public/graph.json'), 'utf-8'));
-
-      artistsPageGraphData = graph.find(page => page.route === '/artists/');
-
-      return new Promise((resolve, reject) => {
-        request.get(`${hostname}/artists/`, (err, res, body) => {
-          if (err) {
-            reject();
-          }
-
-          response = res;
-          response.body = body;
-
-          artistsPageDom = new JSDOM(body);
-
-          resolve();
-        });
-      });
-    });
-
-    before(async function() {
-      return new Promise((resolve, reject) => {
-        request.get(`${hostname}/users/`, (err, res, body) => {
-          if (err) {
-            reject();
-          }
-          usersPageDom = new JSDOM(body);
+    describe('Serve command with HTML route response for the home page using "get" functions', function() {
+      let response;
+      let dom;
 
-          resolve();
-        });
+      before(async function() {
+        response = await fetch(`${hostname}/`);
+        const body = await response.clone().text();
+        dom = new JSDOM(body);
       });
-    });
 
-    describe('Serve command with HTML route response for the home page using "get" functions', function() {
       it('should have the expected output for the page', function() {
-        const headings = homePageDom.window.document.querySelectorAll('body > h1');
+        const headings = dom.window.document.querySelectorAll('body > h1');
 
         expect(headings.length).to.equal(1);
         expect(headings[0].textContent).to.equal('Hello from the server rendered home page!');
@@ -145,19 +99,32 @@ describe('Serve Greenwood With: ', function() {
     });
 
     describe('Serve command with HTML route response for artists page using "get" functions', function() {
+      let response;
+      let dom;
+      let artistsPageGraphData;
+      let body;
+
+      before(async function() {
+        response = await fetch(`${hostname}/artists/`);
+        body = await response.clone().text();
+        const graph = JSON.parse(await fs.promises.readFile(path.join(outputPath, 'public/graph.json'), 'utf-8'));
+
+        artistsPageGraphData = graph.find(page => page.route === '/artists/');
+        dom = new JSDOM(body);
+      });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the correct content type', function(done) {
-        expect(response.headers['content-type']).to.equal('text/html');
+        expect(response.headers.get('content-type')).to.equal('text/html');
         done();
       });
 
       it('should return a response body', function(done) {
-        expect(response.body).to.not.be.undefined;
+        expect(body).to.not.be.undefined;
         done();
       });
 
@@ -170,31 +137,31 @@ describe('Serve Greenwood With: ', function() {
       });
 
       it('the response body should be valid HTML from JSDOM', function(done) {
-        expect(artistsPageDom).to.not.be.undefined;
+        expect(dom).to.not.be.undefined;
         done();
       });
 
       it('should have one style tags', function() {
-        const styles = artistsPageDom.window.document.querySelectorAll('head > style');
+        const styles = dom.window.document.querySelectorAll('head > style');
 
         expect(styles.length).to.equal(1);
       });
 
       it('should have the expected number of <script> tags in the <head>', function() {
-        const scripts = Array.from(artistsPageDom.window.document.querySelectorAll('head > script')).filter(tag => !tag.getAttribute('data-gwd'));
+        const scripts = Array.from(dom.window.document.querySelectorAll('head > script')).filter(tag => !tag.getAttribute('data-gwd'));
 
         expect(scripts.length).to.equal(4);
       });
 
       it('should have the expected <app-header> tag from the app template in the <head>', function() {
-        const scripts = Array.from(artistsPageDom.window.document.querySelectorAll('head > script'))
+        const scripts = Array.from(dom.window.document.querySelectorAll('head > script'))
           .filter(script => script.src && script.src.startsWith('/header.'));
 
         expect(scripts.length).to.equal(1);
       });
 
       it('should have expected SSR content from the non module script tag', function() {
-        const scripts = Array.from(artistsPageDom.window.document.querySelectorAll('head > script'))
+        const scripts = Array.from(dom.window.document.querySelectorAll('head > script'))
           .filter(tag => !tag.getAttribute('data-gwd'))
           .filter(tag => !tag.getAttribute('type'));
 
@@ -203,20 +170,20 @@ describe('Serve Greenwood With: ', function() {
       });
 
       it('should have the expected number of table rows of content', function() {
-        const rows = artistsPageDom.window.document.querySelectorAll('body > table tr');
+        const rows = dom.window.document.querySelectorAll('body > table tr');
 
         expect(rows.length).to.equal(11);
       });
 
       it('should have the expected <title> content in the <head>', function() {
-        const title = artistsPageDom.window.document.querySelectorAll('head > title');
+        const title = dom.window.document.querySelectorAll('head > title');
 
         expect(title.length).to.equal(1);
         expect(title[0].textContent).to.equal('/artists/');
       });
 
       it('should have custom metadata in the <head>', function() {
-        const metaDescription = Array.from(artistsPageDom.window.document.querySelectorAll('head > meta'))
+        const metaDescription = Array.from(dom.window.document.querySelectorAll('head > meta'))
           .filter((tag) => tag.getAttribute('name') === 'description');
 
         expect(metaDescription.length).to.equal(1);
@@ -239,7 +206,7 @@ describe('Serve Greenwood With: ', function() {
       });
 
       it('should append the expected <script> tag for a frontmatter import <x-counter> component', function() {
-        const counterScript = Array.from(artistsPageDom.window.document.querySelectorAll('head > script[src]'))
+        const counterScript = Array.from(dom.window.document.querySelectorAll('head > script[src]'))
           .filter((tag) => tag.getAttribute('src').startsWith('/counter.'));
 
         expect(counterScript.length).to.equal(1);
@@ -268,13 +235,22 @@ describe('Serve Greenwood With: ', function() {
     });
 
     describe('Prerender an HTML route response for users page exporting an HTMLElement as default export', function() {
+      let response;
+      let dom;
+
+      before(async function() {
+        response = await fetch(`${hostname}/users/`);
+        const body = await response.clone().text();
+        dom = new JSDOM(body);
+      });
+
       it('the response body should be valid HTML from JSDOM', function(done) {
-        expect(usersPageDom).to.not.be.undefined;
+        expect(dom).to.not.be.undefined;
         done();
       });
 
       it('should have the expected <h1> text in the <body>', function() {
-        const heading = usersPageDom.window.document.querySelectorAll('body > h1');
+        const heading = dom.window.document.querySelectorAll('body > h1');
         const userLength = parseInt(heading[0].querySelector('span').textContent, 10);
 
         expect(heading.length).to.be.equal(1);
@@ -283,7 +259,7 @@ describe('Serve Greenwood With: ', function() {
       });
 
       it('should have the expected number of <wc-card> tags in the <head>', function() {
-        const cards = usersPageDom.window.document.querySelectorAll('body > wc-card template[shadowroot="open"]');
+        const cards = dom.window.document.querySelectorAll('body > wc-card template[shadowroot="open"]');
 
         expect(cards.length).to.be.greaterThan(0);
       });
@@ -298,54 +274,36 @@ describe('Serve Greenwood With: ', function() {
 
     describe('Bundled image using new URL and import.meta.url', function() {
       const bundledName = 'assets/logo-abb2e884.svg';
-      let bundledImageResponse = {};
+      let response = {};
+      let body;
       let usersResponse = {};
+      let usersBody;
 
       before(async function() {
-        await new Promise((resolve, reject) => {
-          request.get(`${hostname}/${bundledName}`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            bundledImageResponse = res;
-            bundledImageResponse.body = body;
-
-            resolve();
-          });
-        });
-
-        await new Promise((resolve, reject) => {
-          request.get(`${hostname}/_users.js`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
+        response = await fetch(`${hostname}/${bundledName}`);
+        body = await response.clone().text();
 
-            usersResponse = res;
-            usersResponse.body = body;
-
-            resolve();
-          });
-        });
+        usersResponse = await fetch(`${hostname}/users/`);
+        usersBody = await usersResponse.clone().text();
       });
 
       it('should return a 200 status for the image', function(done) {
-        expect(bundledImageResponse.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
       it('should return the expected content-type for the image', function(done) {
-        expect(bundledImageResponse.headers['content-type']).to.equal('image/svg+xml');
+        expect(response.headers.get('content-type')).to.equal('image/svg+xml');
         done();
       });
 
       it('should return the expected body for the image', function(done) {
-        expect(bundledImageResponse.body.startsWith('<svg')).to.equal(true);
+        expect(body.startsWith('<svg')).to.equal(true);
         done();
       });
 
       it('should return the expected bundled image name inside the bundled page route', function(done) {
-        expect(usersResponse.body.indexOf(bundledName) >= 0).to.equal(true);
+        expect(usersBody.indexOf(bundledName) >= 0).to.equal(true);
         done();
       });
     });
@@ -353,19 +311,12 @@ describe('Serve Greenwood With: ', function() {
     describe('Prerender an HTML route response for post page exporting an HTMLElement as default export and data loading', function() {
       const postId = 1;
       let dom;
+      let response;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/post/?id=${postId}`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            dom = new JSDOM(body);
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/post/?id=${postId}`);
+        const body = await response.clone().text();
+        dom = new JSDOM(body);
       });
 
       it('the response body should be valid HTML from JSDOM', function(done) {
@@ -399,22 +350,11 @@ describe('Serve Greenwood With: ', function() {
       let response = {};
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/foo`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/foo`);
       });
 
       it('should return a 404 status', function(done) {
-        expect(response.statusCode).to.equal(404);
+        expect(response.status).to.equal(404);
         done();
       });
     });
diff --git a/packages/plugin-import-json/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js b/packages/plugin-import-json/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
index 048e3cc31..161aa44f3 100644
--- a/packages/plugin-import-json/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
+++ b/packages/plugin-import-json/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
@@ -67,13 +67,12 @@ describe('Serve Greenwood With: ', function() {
 
     describe('Serve command with HTML route response for products page', function() {
       let response = {};
-      let data;
-      let productsPageDom;
+      let dom;
 
       before(async function() {
         response = await fetch(`${hostname}/products/`);
-        data = response.json();
-        productsPageDom = new JSDOM(data);
+        const body = await response.clone().text();
+        dom = new JSDOM(body);
       });
 
       it('should return a 200 status', function() {
@@ -84,12 +83,8 @@ describe('Serve Greenwood With: ', function() {
         expect(response.headers.get('content-type')).to.equal('text/html');
       });
 
-      it('should return a response body', function() {
-        expect(data).to.not.be.undefined;
-      });
-
       it('should make sure to have the expected number of <app-card> components on the page', function(done) {
-        const cardComponents = productsPageDom.window.document.querySelectorAll('body app-card');
+        const cardComponents = dom.window.document.querySelectorAll('body app-card');
 
         expect(cardComponents.length).to.equal(2);
         done();
@@ -98,10 +93,12 @@ describe('Serve Greenwood With: ', function() {
 
     describe('Serve command with API specific behaviors for an HTML ("fragment") API', function() {
       let response = {};
-      let fragmentsApiDom;
+      let dom;
 
       before(async function() {
         response = await fetch(`${hostname}/api/fragment`);
+        const body = await response.clone().text();
+        dom = new JSDOM(body);
       });
 
       it('should return a 200 status', function() {
@@ -109,7 +106,7 @@ describe('Serve Greenwood With: ', function() {
       });
 
       it('should return a custom status message', function() {
-        expect(response.statusMessage).to.equal('OK');
+        expect(response.statusText).to.equal('OK');
       });
 
       it('should return the correct content type', function() {
@@ -117,7 +114,7 @@ describe('Serve Greenwood With: ', function() {
       });
 
       it('should make sure to have the expected number of <app-card> components in the fragment', function(done) {
-        const cardComponents = fragmentsApiDom.window.document.querySelectorAll('body > app-card');
+        const cardComponents = dom.window.document.querySelectorAll('body > app-card');
 
         expect(cardComponents.length).to.equal(2);
         done();
diff --git a/packages/plugin-typescript/test/cases/exp-prerender.serve.ssr/exp-prerender.serve.ssr.spec.js b/packages/plugin-typescript/test/cases/exp-prerender.serve.ssr/exp-prerender.serve.ssr.spec.js
index a85b9d422..dff8dbb9b 100644
--- a/packages/plugin-typescript/test/cases/exp-prerender.serve.ssr/exp-prerender.serve.ssr.spec.js
+++ b/packages/plugin-typescript/test/cases/exp-prerender.serve.ssr/exp-prerender.serve.ssr.spec.js
@@ -27,7 +27,6 @@ import chai from 'chai';
 import { JSDOM } from 'jsdom';
 import path from 'path';
 import { getSetupFiles, getOutputTeardownFiles } from '../../../../../test/utils.js';
-import request from 'request';
 import { Runner } from 'gallinago';
 import { fileURLToPath } from 'url';
 
@@ -67,25 +66,17 @@ xdescribe('Serve Greenwood With: ', function() {
 
     describe('Serve command with SSR prerender specific behaviors for an HTML page', function() {
       let response = {};
+      let body;
+      let fragmentsApiDom;
 
       before(async function() {
-        return new Promise((resolve, reject) => {
-          request.get(`${hostname}/`, (err, res, body) => {
-            if (err) {
-              reject();
-            }
-
-            response = res;
-            response.body = body;
-            fragmentsApiDom = new JSDOM(body);
-
-            resolve();
-          });
-        });
+        response = await fetch(`${hostname}/artists/`);
+        body = await response.clone().text();
+        fragmentsApiDom = new JSDOM(body);
       });
 
       it('should return a 200 status', function(done) {
-        expect(response.statusCode).to.equal(200);
+        expect(response.status).to.equal(200);
         done();
       });
 
@@ -94,6 +85,11 @@ xdescribe('Serve Greenwood With: ', function() {
         done();
       });
 
+      it('should ...', function(done) {
+        expect(fragmentsApiDom).to.not.be.undefined;
+        done();
+      });
+
       // it should return the correct h1 contents
       // it should return the correct app-card contents
     });
diff --git a/packages/plugin-typescript/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js b/packages/plugin-typescript/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
index 8559e56bb..01ed288b4 100644
--- a/packages/plugin-typescript/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
+++ b/packages/plugin-typescript/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
@@ -63,12 +63,12 @@ describe('Serve Greenwood With: ', function() {
 
     describe('Serve command with API specific behaviors for an HTML ("fragment") API', function() {
       let response = {};
-      let fragmentsApiDom;
+      let dom;
 
       before(async function() {
         response = await fetch(`${hostname}/api/fragment`);
         const body = await response.text();
-        fragmentsApiDom = new JSDOM(body);
+        dom = new JSDOM(body);
       });
 
       it('should return a 200 status', function() {
@@ -76,7 +76,7 @@ describe('Serve Greenwood With: ', function() {
       });
 
       it('should return a custom status message', function() {
-        expect(response.statusMessage).to.equal('OK');
+        expect(response.statusText).to.equal('OK');
       });
 
       it('should return the correct content type', function() {
@@ -84,7 +84,7 @@ describe('Serve Greenwood With: ', function() {
       });
 
       it('should make sure to have the expected CSS inlined into the page for each <app-card>', function(done) {
-        const cardComponents = fragmentsApiDom.window.document.querySelectorAll('body > app-card');
+        const cardComponents = dom.window.document.querySelectorAll('body > app-card');
 
         expect(cardComponents.length).to.equal(2);
         Array.from(cardComponents).forEach((card) => {