From d9aba83260e31c562fedaf16bd35d77f562fd842 Mon Sep 17 00:00:00 2001
From: Stefan Penner <stefan.penner@gmail.com>
Date: Mon, 16 Aug 2021 18:04:46 -0600
Subject: [PATCH] Fix embroider

---
 ember-cli-build.js    | 14 ++------------
 tests/index.html      | 10 +++++-----
 tests/test-helper.js  |  6 ++++++
 vendor/.gitkeep       |  0
 vendor/shims/qunit.js | 18 ------------------
 5 files changed, 13 insertions(+), 35 deletions(-)
 delete mode 100644 vendor/.gitkeep
 delete mode 100644 vendor/shims/qunit.js

diff --git a/ember-cli-build.js b/ember-cli-build.js
index 13f43af2..9e75d91e 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -3,24 +3,14 @@
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function (defaults) {
-  let app = new EmberAddon(defaults, {
-    autoImport: {
-      exclude: ['qunit'],
-    },
-  });
-
-  app.import('node_modules/qunit/qunit/qunit.js', {
-    type: 'test',
-  });
+  let app = new EmberAddon(defaults);
 
   app.import('node_modules/qunit/qunit/qunit.css', {
     type: 'test',
   });
 
-  app.import('vendor/shims/qunit.js', { type: 'test' });
-
   try {
-    const { maybeEmbroider } = require('@embroider/test-setup'); // eslint-disable-line node/no-missing-require
+    const { maybeEmbroider } = require('@embroider/test-setup'); // eslint-disable-line node/no-extraneous-require
     return maybeEmbroider(app);
   } catch (e) {
     // This exists, so that we can continue to support node 10 for some of our
diff --git a/tests/index.html b/tests/index.html
index efa55899..6d13069a 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -22,13 +22,13 @@
     {{content-for "test-body"}}
 
     <div id="qunit"></div>
-    <div id="qunit-fixture"></div>
-
-    <div id="ember-testing-container">
-      <div id="ember-testing"></div>
+    <div id="qunit-fixture">
+      <div id="ember-testing-container">
+        <div id="ember-testing"></div>
+      </div>
     </div>
 
-    <script src="/testem.js" integrity=""></script>
+    <script src="/testem.js" integrity="" data-embroider-ignore></script>
     <script src="{{rootURL}}assets/vendor.js"></script>
     <script src="{{rootURL}}assets/test-support.js"></script>
     <script src="{{rootURL}}assets/dummy.js"></script>
diff --git a/tests/test-helper.js b/tests/test-helper.js
index 4167cb36..a1c4e0e4 100644
--- a/tests/test-helper.js
+++ b/tests/test-helper.js
@@ -34,3 +34,9 @@ QUnit.testDone(function () {
   let testElementReset = testElementContainer.outerHTML;
   testElementContainer.innerHTML = testElementReset;
 });
+
+QUnit.start();
+if (typeof Testem !== 'undefined') {
+  // eslint-disable-line no-undef
+  Testem.hookIntoTestFramework(); // eslint-disable-line no-undef
+}
diff --git a/vendor/.gitkeep b/vendor/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/vendor/shims/qunit.js b/vendor/shims/qunit.js
deleted file mode 100644
index f680cd71..00000000
--- a/vendor/shims/qunit.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/* globals define, self */
-
-(function() {
-  function vendorModule() {
-    'use strict';
-
-    return {
-      default: self.QUnit,
-      module: self.QUnit.module,
-      test: self.QUnit.test,
-      todo: self.QUnit.todo,
-      skip: self.QUnit.skip,
-      __esModule: true,
-    };
-  }
-
-  define('qunit', [], vendorModule);
-})();