Try to upgrade ember-cli-qunit to 4.3.x

Author: Gaurav0

app/services/ember-cli.js

@@ -384,8 +384,8 @@ export default Ember.Service.extend({
         </div>
         <div id="test-root"></div>`;
 
-      let moreCode = "requirejs.entries['ember-cli/test-loader'] = requirejs.entries['ember-cli-test-loader/test-support/index'] || requirejs.entries['assets/test-loader'] || requirejs.entries['ember-cli/test-loader'];\n";
-      testStuff += `<script type="text/javascript">${moreCode}require("${twiddleAppName}/tests/test-helper");</script>`;
+      let moreCode = "window.requirejs.entries['ember-cli/test-loader'] = window.requirejs.entries['ember-cli-test-loader/test-support/index'] || requirejs.entries['assets/test-loader'] || window.requirejs.entries['ember-cli/test-loader'];\n";
+      testStuff += `<script type="text/javascript">${moreCode}window.require("${twiddleAppName}/tests/test-helper");</script>`;
     }
 
     if (testing || isTestingEnabled) {
@@ -396,7 +396,7 @@ export default Ember.Service.extend({
       });
 
       testStuff += `<script type="text/javascript">
-        Ember.Test.adapter = require('ember-qunit').QUnitAdapter.create();
+        Ember.Test.adapter = window.require('ember-qunit').QUnitAdapter.create();
       </script>`;
     }
 
@@ -546,11 +546,11 @@ function contentForAppBoot(content, config) {
   }
 
   monkeyPatchModules.forEach(function(mod) {
-    content.push('  require("'+mod+'").__esModule=true;');
+    content.push('  window.require("'+mod+'").__esModule=true;');
   });
 
   if (!config.testingEnabled || config.legacyTesting) {
-    content.push('  require("' +
+    content.push('  window.require("' +
       config.modulePrefix +
       '/app")["default"].create(' +
       calculateAppConfig(config) +

ember-cli-build.js

@@ -149,8 +149,11 @@ module.exports = function(defaults) {
 
   let transpiledInitializersTree = babelTranspiler(baseInitializersTree, babelOpts());
 
-  let finalQUnitTree = buildAddonTree('ember-qunit');
   let finalTestHelpersTree = buildAddonTree('ember-test-helpers');
+  console.log(app.preprocessJs);
+  let finalQUnitTree = buildAddonTree('ember-qunit', {
+    excludes: ['addon-test-support/ember-qunit/legacy-2-x/**/*.js']
+  });
 
   let mergedDepsTree = mergeTrees([bowerTree, shimsTree, transpiledInitializersTree, transpiledResolverTree, emberDataShims]);
 
@@ -164,17 +167,21 @@ module.exports = function(defaults) {
     outputFile: '/assets/twiddle-deps.js'
   });
 
-  return app.toTree(mergeTrees([twiddleVendorTree, loaderTree, testLoaderTree, finalQUnitTree, finalTestHelpersTree]));
+  return app.toTree(mergeTrees([twiddleVendorTree, loaderTree, testLoaderTree, finalTestHelpersTree, finalQUnitTree]));
 };
 
-function buildAddonTree(addonName) {
+function buildAddonTree(addonName, options = {}) {
   const funnel = require('broccoli-funnel');
   const concat = require('broccoli-concat');
   const babelTranspiler = require('broccoli-babel-transpiler');
   const path = require('path');
 
+  let { excludes } = options;
+  excludes = excludes || [];
+
   let baseTree = funnel(path.dirname(require.resolve(addonName)), {
-    include: ['**/*.js']
+    include: ['**/*.js'],
+    exclude: ['index.js', 'ember-cli-build.js', 'testem.js', 'lib/**/*.js', 'config/**/*.js', 'tests/**/*.js'].concat(excludes)
   });
 
   let transpiledTree = babelTranspiler(baseTree, babelOpts());

package.json

@@ -54,7 +54,7 @@
     "ember-cli-mirage": "~0.4.4",
     "ember-cli-moment-shim": "^2.2.1",
     "ember-cli-node-assets": "~0.2.2",
-    "ember-cli-qunit": "~4.0.0",
+    "ember-cli-qunit": "~4.3.0",
     "ember-cli-release": "1.0.0-beta.2",
     "ember-cli-sass": "^6.2.0",
     "ember-cli-shims": "~1.0.2",

yarn.lock

@@ -2,6 +2,14 @@
 # yarn lockfile v1
 
 
+"@ember/test-helpers@^0.7.18":
+  version "0.7.25"
+  resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-0.7.25.tgz#b4014c108b40ffaf74f3c4d5918800917541541d"
+  dependencies:
+    broccoli-funnel "^2.0.1"
+    ember-cli-babel "^6.12.0"
+    ember-cli-htmlbars-inline-precompile "^1.0.0"
+
 "@glimmer/di@^0.2.0":
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.2.0.tgz#73bfd4a6ee4148a80bf092e8a5d29bcac9d4ce7e"
@@ -2278,6 +2286,10 @@ commander@~2.14.1:
   version "2.14.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa"
 
+common-tags@^1.4.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
+
 commoner@~0.10.3:
   version "0.10.8"
   resolved "https://registry.yarnpkg.com/commoner/-/commoner-0.10.8.tgz#34fc3672cd24393e8bb47e70caa0293811f4f2c5"
@@ -3336,20 +3348,12 @@ ember-cli-preprocess-registry@^3.1.0:
     process-relative-require "^1.0.0"
     silent-error "^1.0.0"
 
-ember-cli-qunit@~4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/ember-cli-qunit/-/ember-cli-qunit-4.0.2.tgz#4d4d9cad106ccf1be658d35015d344efbbcf8951"
+ember-cli-qunit@~4.3.0:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/ember-cli-qunit/-/ember-cli-qunit-4.3.2.tgz#cfd89ad3b0dbc28a9c2223d532b52eeade7c602c"
   dependencies:
-    broccoli-funnel "^2.0.0"
-    broccoli-merge-trees "^2.0.0"
-    ember-cli-babel "^6.8.1"
-    ember-cli-test-loader "^2.2.0"
-    ember-cli-version-checker "^2.0.0"
-    ember-qunit "^2.2.0"
-    qunit "^2.4.1"
-    qunit-notifications "^0.1.1"
-    resolve "^1.4.0"
-    silent-error "^1.1.0"
+    ember-cli-babel "^6.11.0"
+    ember-qunit "^3.3.2"
 
 ember-cli-release@1.0.0-beta.2:
   version "1.0.0-beta.2"
@@ -3686,11 +3690,17 @@ ember-notify@^5.2.1:
     ember-string-ishtmlsafe-polyfill "^1.1.0"
     object-assign "^4.1.0"
 
-ember-qunit@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-2.2.0.tgz#3cdf400031c93a38de781a7304819738753b7f99"
+ember-qunit@^3.3.2:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-3.4.1.tgz#204a2d39a5d44d494c56bf17cf3fd12f06210359"
   dependencies:
-    ember-test-helpers "^0.6.3"
+    "@ember/test-helpers" "^0.7.18"
+    broccoli-funnel "^2.0.1"
+    broccoli-merge-trees "^2.0.0"
+    common-tags "^1.4.0"
+    ember-cli-babel "^6.8.2"
+    ember-cli-test-loader "^2.2.0"
+    qunit "^2.5.0"
 
 ember-resolver@^4.0.0:
   version "4.5.5"
@@ -3765,7 +3775,7 @@ ember-string-ishtmlsafe-polyfill@^1.1.0:
     ember-cli-babel "^5.1.7"
     ember-cli-version-checker "^1.2.0"
 
-ember-test-helpers@^0.6.3, ember-test-helpers@~0.6.3:
+ember-test-helpers@~0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/ember-test-helpers/-/ember-test-helpers-0.6.3.tgz#f864cdf6f4e75f3f8768d6537785b5ab6e82d907"
 
@@ -7953,11 +7963,7 @@ quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8:
     rimraf "^2.5.4"
     underscore.string "~3.3.4"
 
-qunit-notifications@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/qunit-notifications/-/qunit-notifications-0.1.1.tgz#3001afc6a6a77dfbd962ccbcddde12dec5286c09"
-
-qunit@^2.4.1:
+qunit@^2.5.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.6.1.tgz#3a2a5f05307f873174e0f5859010fb7380380e3c"
   dependencies: