fixing qunit vs mocha dep ordering resolution

Author: thoov

addon-test-support/-private/get-test-loader.js

@@ -8,12 +8,12 @@ import { dependencySatisfies, macroCondition, importSync } from '@embroider/macr
  * @return {Object}
  */
 export default function getTestLoader() {
-  if (macroCondition(dependencySatisfies('ember-qunit', '*'))){
-    const EmberExamQUnitTestLoader = importSync('./ember-exam-qunit-test-loader');
-    return EmberExamQUnitTestLoader['default'];
-  } else if (macroCondition(dependencySatisfies('ember-mocha', '*'))){
+  if (macroCondition(dependencySatisfies('ember-mocha', '*'))){
     const EmberExamMochaTestLoader = importSync('./ember-exam-mocha-test-loader');
     return EmberExamMochaTestLoader['default'];
+  } else if (macroCondition(dependencySatisfies('ember-qunit', '*'))){
+    const EmberExamQUnitTestLoader = importSync('./ember-exam-qunit-test-loader');
+    return EmberExamQUnitTestLoader['default'];
   }
 
   throw new Error(

addon-test-support/start.js

@@ -32,10 +32,10 @@ export default function start(qunitOptions) {
   loadTests(testLoader);
 
   let emberTestFramework;
-  if (macroCondition(dependencySatisfies('ember-qunit', '*'))){
-    emberTestFramework = importSync('ember-qunit');
-  } else if (macroCondition(dependencySatisfies('ember-mocha', '*'))) {
+  if (macroCondition(dependencySatisfies('ember-mocha', '*'))) {
     emberTestFramework = importSync('ember-mocha');
+  } else if (macroCondition(dependencySatisfies('ember-qunit', '*'))){
+    emberTestFramework = importSync('ember-qunit');
   }
 
   if (emberTestFramework.start) {

package.json

@@ -58,10 +58,12 @@
     "@ember/test-helpers": "^2.2.0",
     "@embroider/test-setup": "^0.36.0",
     "babel-eslint": "^10.1.0",
+    "chai-dom": "^1.8.2",
     "codeclimate-test-reporter": "^0.5.0",
     "ember-cli": "^3.21.2",
     "ember-cli-addon-docs": "^0.10.0",
     "ember-cli-addon-docs-yuidoc": "^0.2.4",
+    "ember-cli-chai": "^0.5.0",
     "ember-cli-dependency-checker": "^3.0.0",
     "ember-cli-deploy": "^1.0.2",
     "ember-cli-deploy-build": "^2.0.0",

tests/test-helper.js

@@ -5,7 +5,7 @@ import resolver from './helpers/resolver';
 import start from 'ember-exam/test-support/start';
 import { macroCondition, dependencySatisfies } from '@embroider/macros';
 
-const oppositeFramework = macroCondition(dependencySatisfies('ember-qunit', '*')) ? 'mocha': 'qunit';
+const oppositeFramework = macroCondition(dependencySatisfies('ember-mocha', '*')) ? 'qunit': 'mocha';
 
 Object.keys(require.entries).forEach((entry) => {
   if (entry.indexOf(oppositeFramework) !== -1) {