Merge pull request #744 from emberjs/remove-qunit-modules

emberjs · Aug 18, 2020 · 779d7c0 · 779d7c0
2 parents b2356ce + 13b74e0
commit 779d7c0
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 12 deletions.
diff --git a/addon-test-support/ember-qunit/adapter.js → addon-test-support/adapter.js b/addon-test-support/ember-qunit/adapter.js → addon-test-support/adapter.js
diff --git a/addon-test-support/ember-qunit/index.js → addon-test-support/index.js b/addon-test-support/ember-qunit/index.js → addon-test-support/index.js
diff --git a/addon-test-support/qunit/index.js b/addon-test-support/qunit/index.js
diff --git a/.../ember-qunit/test-isolation-validation.js → ...test-support/test-isolation-validation.js b/.../ember-qunit/test-isolation-validation.js → ...test-support/test-isolation-validation.js
diff --git a/...n-test-support/ember-qunit/test-loader.js → addon-test-support/test-loader.js b/...n-test-support/ember-qunit/test-loader.js → addon-test-support/test-loader.js
diff --git a/index.js b/index.js
@@ -39,6 +39,7 @@ module.exports = {
     // TODO: remove these `this.import` statements when the app is using using Embroider or ember-auto-import
     this.import('vendor/qunit/qunit.js', { type: 'test' });
     this.import('vendor/qunit/qunit.css', { type: 'test' });
+    this.import('vendor/ember-qunit/qunit-module.js', { type: 'test' });
     this.import('vendor/ember-qunit/qunit-configuration.js', { type: 'test' });
 
     let addonOptions = this.targetOptions();
@@ -84,9 +85,11 @@ module.exports = {
     // so that can have our `import`'s be
     // import { ... } from 'ember-qunit';
 
-    return this.preprocessJs(tree, '/', this.name, {
-      registry: this.registry,
-    });
+    const Funnel = require('broccoli-funnel');
+
+    let babel = this.addons.find((a) => a.name === 'ember-cli-babel');
+
+    return babel.transpileTree(new Funnel(tree, { destDir: 'ember-qunit' }));
   },
 
   setTestGenerator: function () {

diff --git a/vendor/ember-qunit/qunit-configuration.js b/vendor/ember-qunit/qunit-configuration.js
@@ -1,6 +1,8 @@
 /* globals QUnit */
 
 (function () {
+  'use strict';
+
   QUnit.config.autostart = false;
   QUnit.config.urlConfig.push({ id: 'nocontainer', label: 'Hide container' });
   QUnit.config.urlConfig.push({ id: 'nolint', label: 'Disable Linting' });

diff --git a/vendor/ember-qunit/qunit-module.js b/vendor/ember-qunit/qunit-module.js
@@ -0,0 +1,14 @@
+/* globals QUnit, define */
+
+(function () {
+  'use strict';
+
+  define('qunit', ['exports'], function (exports) {
+    exports.default = QUnit;
+    exports.module = QUnit.module;
+    exports.test = QUnit.test;
+    exports.skip = QUnit.skip;
+    exports.only = QUnit.only;
+    exports.todo = QUnit.todo;
+  });
+})();