Merge pull request #430 from alexlafroscia/embroider-test-setup

Configure `@embroider/test-setup`

config/ember-try.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const getChannelURL = require('ember-source-channel-url');
+const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
 
 module.exports = async function () {
   return {
@@ -89,6 +90,8 @@ module.exports = async function () {
         },
         command: 'tsc',
       },
+      embroiderSafe(),
+      embroiderOptimized(),
     ],
   };
 };

ember-cli-build.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
+const { maybeEmbroider } = require('@embroider/test-setup');
 const urls = require('./lib/prember-urls');
 
 module.exports = function (defaults) {
@@ -47,5 +48,5 @@ module.exports = function (defaults) {
     behave. You most likely want to be modifying `./index.js` or app's build file
   */
 
-  return app.toTree();
+  return maybeEmbroider(app);
 };

package.json

@@ -22,7 +22,8 @@
     "@ember/jquery": "^0.6.1",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.2.3",
-    "@embroider/macros": "^0.10.0",
+    "@embroider/macros": "^0.41.0",
+    "@embroider/test-setup": "^0.41.0",
     "@glimmer/component": "^1.0.2",
     "@glimmer/tracking": "^1.0.2",
     "@types/ember": "^3.16.0",

tests/integration/no-render-breaking-test.js

@@ -38,9 +38,9 @@ module('Integration | no render breaking', function (hooks) {
       );
 
       await render(hbs`
-        {{#macroIf (macroDependencySatisfies "ember-source" ">= 3.15.0")}}
+        {{#if (macroCondition (macroDependencySatisfies "ember-source" ">= 3.15.0"))}}
           <ECTest {{autofocus}} />
-        {{/macroIf}}
+        {{/if}}
       `);
       assert.ok(true, 'Renders');
     });