From 28f81d4263296392a701c501f3d2e090a248a663 Mon Sep 17 00:00:00 2001
From: Gaurav Munjal <gaurav.munjal@civicplus.com>
Date: Sat, 13 May 2023 15:39:49 -0400
Subject: [PATCH] fix fastboot-testing-app

---
 .../fastboot/instance-initializers/fetch.js                 | 4 ++++
 packages/ember-cli-fastboot/package.json                    | 4 +++-
 test-packages/ember-cli-fastboot-testing-app/package.json   | 6 +++++-
 .../ember-cli-fastboot-testing-app/tests/index.html         | 2 ++
 .../ember-cli-fastboot-testing-app/tests/test-helper.js     | 4 ++++
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/packages/ember-cli-fastboot/fastboot/instance-initializers/fetch.js b/packages/ember-cli-fastboot/fastboot/instance-initializers/fetch.js
index d2768fe05..aa3618e90 100644
--- a/packages/ember-cli-fastboot/fastboot/instance-initializers/fetch.js
+++ b/packages/ember-cli-fastboot/fastboot/instance-initializers/fetch.js
@@ -1,3 +1,7 @@
+import fetch from 'whatwg-fetch';
+
+window.fetch = fetch;
+
 function initialize(instance) {
   let { request } = instance.lookup('service:fastboot');
   fetch.__fastbootRequest = request;
diff --git a/packages/ember-cli-fastboot/package.json b/packages/ember-cli-fastboot/package.json
index 7b1af0a71..6b3ec1c2f 100644
--- a/packages/ember-cli-fastboot/package.json
+++ b/packages/ember-cli-fastboot/package.json
@@ -91,6 +91,7 @@
     "glob": "^7.1.3",
     "loader.js": "^4.7.0",
     "mocha": "^9.1.2",
+    "node-fetch": "^2.6.7",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.5.1",
     "qunit": "^2.17.2",
@@ -99,7 +100,8 @@
     "release-it-lerna-changelog": "^3.1.0",
     "request": "^2.88.0",
     "rsvp": "^4.8.3",
-    "webpack": "^5.58.1"
+    "webpack": "^5.58.1",
+    "whatwg-fetch": "^3.0.0"
   },
   "engines": {
     "node": "14.* || 16.* || >=18"
diff --git a/test-packages/ember-cli-fastboot-testing-app/package.json b/test-packages/ember-cli-fastboot-testing-app/package.json
index dbcce248c..1ba829b17 100644
--- a/test-packages/ember-cli-fastboot-testing-app/package.json
+++ b/test-packages/ember-cli-fastboot-testing-app/package.json
@@ -49,8 +49,12 @@
     "eslint-plugin-node": "^11.1.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "qunit-dom": "^1.2.0"
+    "qunit-dom": "^1.2.0",
+    "whatwg-fetch": "^3.0.0"
   },
+  "fastbootDependencies": [
+    "whatwg-fetch"
+  ],
   "ember": {
     "edition": "octane"
   },
diff --git a/test-packages/ember-cli-fastboot-testing-app/tests/index.html b/test-packages/ember-cli-fastboot-testing-app/tests/index.html
index 965565d98..530d28a58 100644
--- a/test-packages/ember-cli-fastboot-testing-app/tests/index.html
+++ b/test-packages/ember-cli-fastboot-testing-app/tests/index.html
@@ -21,6 +21,8 @@
     {{content-for "body"}}
     {{content-for "test-body"}}
 
+    <div id="ember-testing"></div>
+
     <script src="/testem.js" integrity=""></script>
     <script src="{{rootURL}}assets/vendor.js"></script>
     <script src="{{rootURL}}assets/test-support.js"></script>
diff --git a/test-packages/ember-cli-fastboot-testing-app/tests/test-helper.js b/test-packages/ember-cli-fastboot-testing-app/tests/test-helper.js
index 0382a848d..bcb2c9399 100644
--- a/test-packages/ember-cli-fastboot-testing-app/tests/test-helper.js
+++ b/test-packages/ember-cli-fastboot-testing-app/tests/test-helper.js
@@ -1,8 +1,12 @@
 import Application from '../app';
 import config from '../config/environment';
 import { setApplication } from '@ember/test-helpers';
+import * as QUnit from 'qunit';
+import { setup } from 'qunit-dom';
 import { start } from 'ember-qunit';
 
+setup(QUnit.assert);
+
 setApplication(Application.create(config.APP));
 
 start();