fixing ember try cases to remove qunit in mocha branch

config/ember-try.js

@@ -2,6 +2,18 @@
 
 const getChannelURL = require('ember-source-channel-url');
 const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
+const mergeWith = require('lodash.mergewith');
+
+function mochaScenario(scenario = {}) {
+  return mergeWith({}, scenario, {
+    devDependencies: {
+      'chai-dom': '*',
+      'ember-cli-chai': '*',
+      'ember-mocha': '*',
+      'ember-qunit': null
+    }
+  });
+}
 
 const command = [
   'ember',
@@ -88,14 +100,9 @@ module.exports = async function() {
           }
         }
       },
-      {
-        name: 'ember-default-with-mocha',
-        npm: {
-          devDependencies: {
-            'ember-mocha': '*'
-          }
-        }
-      },
+      mochaScenario({
+        name: 'ember-default-with-mocha'
+      }),
       {
         name: 'ember-classic',
         env: {
@@ -112,29 +119,17 @@ module.exports = async function() {
         }
       },
       embroiderSafe(),
-      embroiderSafe({
-        name: 'embroider-safe-with-mocha',
-        env: {
-          EMBROIDER_TEST_SETUP_OPTIONS: 'safe'
-        },
-        npm: {
-          devDependencies: {
-            'ember-mocha': '*',
-          },
-        },
-      }),
+      embroiderSafe(
+        mochaScenario({
+          name: 'embroider-safe-with-mocha'
+        })
+      ),
       embroiderOptimized(),
-      embroiderOptimized({
-        name: 'embroider-optimized-with-mocha',
-        env: {
-          EMBROIDER_TEST_SETUP_OPTIONS: 'optimized'
-        },
-        npm: {
-          devDependencies: {
-            'ember-mocha': '*',
-          },
-        }
-      }),
+      embroiderOptimized(
+        mochaScenario({
+          name: 'embroider-optimized-with-mocha'
+        })
+      )
     ]
   };
 };

package.json

@@ -86,6 +86,7 @@
     "fixturify": "^1.2.0",
     "istanbul": "^0.4.3",
     "loader.js": "^4.7.0",
+    "lodash.mergewith": "^4.6.2",
     "mocha": "^8.1.0",
     "mocha-eslint": "^6.0.0",
     "npm-run-all": "^4.1.5",

yarn.lock

@@ -10540,6 +10540,11 @@ lodash.merge@^4.4.0, lodash.merge@^4.6.0, lodash.merge@^4.6.2:
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
+lodash.mergewith@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
+  integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
+
 lodash.omit@^4.1.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"