Merge pull request #117 from miguelcobain/handle-no-config

Handle no ownConfig scenario (for real)
miguelcobain · Nov 18, 2022 · 7d8c677 · 7d8c677
2 parents d963b93 + 9aec22e
commit 7d8c677
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 15 deletions.
diff --git a/ember-css-transitions/src/modifiers/css-transition.js b/ember-css-transitions/src/modifiers/css-transition.js
@@ -9,16 +9,20 @@ import { buildWaiter } from '@ember/test-waiters';
 
 import { nextTick, sleep, computeTimeout } from '../utils/transition-utils';
 
-const waiter = (getOwnConfig() || {}).useTestWaiters
-  ? buildWaiter('ember-css-transitions')
-  : {
-      beginAsync() {
-        /* fake */
-      },
-      endAsync() {
-        /* fake */
-      },
-    };
+let waiter;
+
+if (macroCondition(getOwnConfig()?.useTestWaiters)) {
+  waiter = buildWaiter('ember-css-transitions');
+} else {
+  waiter = {
+    beginAsync() {
+      /* fake */
+    },
+    endAsync() {
+      /* fake */
+    },
+  };
+}
 
 let modifier;
 

diff --git a/test-app/ember-cli-build.js b/test-app/ember-cli-build.js
@@ -2,18 +2,31 @@
 
 const EmberApp = require('ember-cli/lib/broccoli/ember-app');
 
-module.exports = function (defaults) {
-  const app = new EmberApp(defaults, {
-    autoImport: {
-      watchDependencies: ['ember-css-transitions'],
-    },
+let macrosConfig;
+
+// Intentionally not add macros config if env variable not set
+// so that we test in CI all the scenarios:
+//  - USE_TEST_WAITERS=true
+//  - USE_TEST_WAITERS=false
+//  - USE_TEST_WAITERS not set
+if (process.env.USE_TEST_WAITERS !== undefined) {
+  macrosConfig = {
     '@embroider/macros': {
       setConfig: {
         'ember-css-transitions': {
           useTestWaiters: process.env.USE_TEST_WAITERS !== 'false',
         },
       },
     },
+  };
+}
+
+module.exports = function (defaults) {
+  const app = new EmberApp(defaults, {
+    autoImport: {
+      watchDependencies: ['ember-css-transitions'],
+    },
+    ...macrosConfig,
   });
 
   // Use `app.import` to add additional libraries to the generated