Fix embroider

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

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>

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
+}