feat: support for test-support and addon-test-support

Author: mike-north

blueprints/ember-cli-typescript/index.js

@@ -33,10 +33,11 @@ module.exports = {
     let hasMirage = 'ember-cli-mirage' in (this.project.pkg.devDependencies || {});
     let isAddon = this.project.isEmberCLIAddon();
     let isMU = this._detectMU();
-    let includes = isMU ? ['src'] : ['app', isAddon && 'addon'].filter(Boolean);
-
-    includes = includes.concat(['tests', 'types']).concat(inRepoAddons);
+    let includes = isMU ? ['src'] : ['app', 'tests', 'types'].filter(Boolean);
 
+    if (isAddon) {
+      includes.push('addon', 'test-support', 'addon-test-support');
+    }
     // Mirage is already covered for addons because it's under `tests/`
     if (hasMirage && !isAddon) {
       includes.push('mirage');
@@ -71,6 +72,8 @@ module.exports = {
           if (isAddon) {
             paths[dasherizedName] = ['addon'];
             paths[`${dasherizedName}/*`] = ['addon/*'];
+            paths[`${dasherizedName}/test-support`] = ['addon-test-support'];
+            paths[`${dasherizedName}/test-support/*`] = ['addon-test-support/*'];
           }
         }
 

index.js

@@ -57,22 +57,32 @@ module.exports = {
       return this._super.treeForApp.call(this, tree);
     }
   },
-
+  // We manually invoke Babel for treeForAddon, treeForTestSupport and treeForAddonTestSupport
+  // rather than calling _super because we're returning content on behalf of addons that aren't
+  // ember-cli-typescript, and the _super impl would namespace all the files under our own name.
   treeForAddon() {
     if (this.compiler) {
-      // We manually invoke Babel here rather than calling _super because we're returning
-      // content on behalf of addons that aren't ember-cli-typescript, and the _super impl
-      // would namespace all the files under our own name.
       let babel = this.project.addons.find(addon => addon.name === 'ember-cli-babel');
       let tree = this.compiler.treeForAddons();
       return babel.transpileTree(tree);
     }
   },
 
   treeForTestSupport() {
+    let trees = [this.compiler.treeForTests()];
+    if (this.compiler) {
+      let babel = this.project.addons.find(addon => addon.name === 'ember-cli-babel');
+      let tree = this.compiler.treeForTestSupport();
+      trees.push(babel.transpileTree(tree));
+    }
+    return this._super.treeForTestSupport.call(this, new MergeTrees(trees));
+  },
+
+  treeForAddonTestSupport() {
     if (this.compiler) {
-      let tree = this.compiler.treeForTests();
-      return this._super.treeForTestSupport.call(this, tree);
+      let babel = this.project.addons.find(addon => addon.name === 'ember-cli-babel');
+      let tree = this.compiler.treeForAddonTestSupport();
+      return babel.transpileTree(tree);
     }
   },
 };

lib/incremental-typescript-compiler/index.js

@@ -89,6 +89,22 @@ module.exports = class IncrementalTypescriptCompiler {
     return new TypescriptOutput(this, paths);
   }
 
+  treeForAddonTestSupport() {
+    let paths = {};
+    for (let addon of this.addons) {
+      paths[`${this._relativeAddonRoot(addon)}/addon-test-support`] = `${addon.name}/test-support`;
+    }
+    return new TypescriptOutput(this, paths);
+  }
+
+  treeForTestSupport() {
+    let paths = {};
+    for (let addon of this.addons) {
+      paths[`${this._relativeAddonRoot(addon)}/test-support`] = `tests`;
+    }
+    return new TypescriptOutput(this, paths);
+  }
+
   treeForTests() {
     let tree = new TypescriptOutput(this, { tests: 'tests' });
     return new Funnel(tree, { srcDir: 'tests' });

lib/utilities/update-paths-for-addon.js

@@ -7,10 +7,11 @@ module.exports = function(paths, addonName, appName, options) {
   const addonAddonPath = [addonPath, 'addon'].join('/');
   const addonAppPath = [addonPath, 'app'].join('/');
   const appNameStar = [appName, '*'].join('/');
+  const addonTestSupportPath = [addonName, 'test-support'].join('/');
+  const addonTestSupportStarPath = `${addonTestSupportPath}/*`;
   let appStarPaths;
   paths = paths || {};
   appStarPaths = paths[appNameStar] = paths[appNameStar] || [];
-
   if (options.removePaths) {
     if (paths.hasOwnProperty(addonName)) {
       delete paths[addonName];
@@ -30,6 +31,12 @@ module.exports = function(paths, addonName, appName, options) {
     if (!paths.hasOwnProperty(addonNameStar)) {
       paths[addonNameStar] = [ [addonAddonPath, '*'].join('/') ];
     }
+    if (!paths.hasOwnProperty(addonTestSupportPath)) {
+      paths[addonTestSupportPath] = [ [addonPath, 'addon-test-support'].join('/') ];
+    }
+    if (!paths.hasOwnProperty(addonTestSupportStarPath)) {
+      paths[addonTestSupportStarPath] = [ [addonPath, 'addon-test-support', '*'].join('/') ];
+    }
     if (appStarPaths.indexOf(addonAppPath) === -1) {
       appStarPaths.push([addonAppPath, '*'].join('/'));
       paths[appNameStar] = appStarPaths;

node-tests/blueprints/ember-cli-typescript-test.js

@@ -114,10 +114,19 @@ describe('Acceptance: ember-cli-typescript generator', function() {
           'dummy/*': ['tests/dummy/app/*', 'app/*'],
           'my-addon': ['addon'],
           'my-addon/*': ['addon/*'],
+          'my-addon/test-support': ['addon-test-support'],
+          'my-addon/test-support/*': ['addon-test-support/*'],
           '*': ['types/*'],
         });
 
-        expect(tsconfigJson.include).to.deep.equal(['app/**/*', 'addon/**/*', 'tests/**/*', 'types/**/*']);
+        expect(tsconfigJson.include).to.deep.equal([
+          'app/**/*',
+          'tests/**/*',
+          'types/**/*',
+          'addon/**/*',
+          'test-support/**/*',
+          'addon-test-support/**/*'
+        ]);
 
         const projectTypes = file('types/dummy/index.d.ts');
         expect(projectTypes).to.exist;
@@ -257,8 +266,12 @@ describe('Acceptance: ember-cli-typescript generator', function() {
           'my-app/*': ['app/*', 'lib/my-addon-1/app/*', 'lib/my-addon-2/app/*'],
           'my-addon-1': ['lib/my-addon-1/addon'],
           'my-addon-1/*': ['lib/my-addon-1/addon/*'],
+          'my-addon-1/test-support': ['lib/my-addon-1/addon-test-support'],
+          'my-addon-1/test-support/*': ['lib/my-addon-1/addon-test-support/*'],
           'my-addon-2': ['lib/my-addon-2/addon'],
           'my-addon-2/*': ['lib/my-addon-2/addon/*'],
+          'my-addon-2/test-support': ['lib/my-addon-2/addon-test-support'],
+          'my-addon-2/test-support/*': ['lib/my-addon-2/addon-test-support/*'],
           '*': ['types/*'],
         });
 
@@ -324,10 +337,19 @@ describe('Acceptance: ember-cli-typescript generator', function() {
           'dummy/*': ['tests/dummy/app/*', 'app/*'],
           'my-addon': ['addon'],
           'my-addon/*': ['addon/*'],
+          'my-addon/test-support': ['addon-test-support'],
+          'my-addon/test-support/*': ['addon-test-support/*'],
           '*': ['types/*'],
         });
 
-        expect(json.include).to.deep.equal(['app/**/*', 'addon/**/*', 'tests/**/*', 'types/**/*']);
+        expect(json.include).to.deep.equal([
+          'app/**/*',
+          'tests/**/*',
+          'types/**/*',
+          'addon/**/*',
+          'test-support/**/*',
+          'addon-test-support/**/*'
+        ]);
       });
   });
 

node-tests/blueprints/in-repo-addon-test.js

@@ -56,6 +56,8 @@ describe('Acceptance: ember generate and destroy in-repo-addon', function() {
         const tsconfigJson = fs.readJsonSync('tsconfig.json');
         expect(tsconfigJson['compilerOptions']['paths']['foo-bar']).to.have.all.members(['lib/foo-bar/addon']);
         expect(tsconfigJson['compilerOptions']['paths']['foo-bar/*']).to.have.all.members(['lib/foo-bar/addon/*']);
+        expect(tsconfigJson['compilerOptions']['paths']['foo-bar/test-support']).to.have.all.members(['lib/foo-bar/addon-test-support']);
+        expect(tsconfigJson['compilerOptions']['paths']['foo-bar/test-support/*']).to.have.all.members(['lib/foo-bar/addon-test-support/*']);
         expect(tsconfigJson['compilerOptions']['paths'][nameStar]).to.include.members(['lib/foo-bar/app/*']);
         expect(tsconfigJson['include']).to.include.members(['lib/foo-bar']);
       })