Run embroider tests without FastBoot

Due to embroider-build/embroider#160
ember-bootstrap · Jan 7, 2020 · 0817211 · 0817211
1 parent edf3e98
commit 0817211
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -114,10 +114,10 @@ module.exports = function() {
               '@embroider/core': '*',
               '@embroider/webpack': '*',
               '@embroider/compat': '*',
-              // remove fastboot dependencies until https://github.com/embroider-build/embroider/issues/160 is resolved.
-              'ember-cli-fastboot': null,
-              'ember-cli-fastboot-testing': null
             }
+          },
+          env: {
+            FASTBOOT_DISABLED: true
           }
         }
       ]

diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -3,13 +3,28 @@
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {
+  let trees = {};
+
+  // Exclude FastBoot tests if FASTBOOT_DISABLED is set,
+  // to enable Embroider tests until https://github.com/embroider-build/embroider/issues/160 is resolved.
+  if (process.env.FASTBOOT_DISABLED) {
+    const Funnel = require('broccoli-funnel');
+    trees.tests = new Funnel('tests', {
+      exclude: ['fastboot/**'],
+    });
+  }
+
   let app = new EmberAddon(defaults, {
     'ember-cli-babel': {
       includePolyfill: !!process.env.BABELPOLYFILL
     },
     autoImport: {
       forbidEval: true
-    }
+    },
+    trees,
+    addons: {
+      blacklist: process.env.FASTBOOT_DISABLED ? ['ember-cli-fastboot-testing'] : []
+    },
   });
 
   /*