Merge branch 'master' into v2

Author: dfreeman

azure-pipelines.yml

@@ -0,0 +1,38 @@
+# Node.js
+# Build a general Node.js project with npm.
+# Add steps that analyze code, save build artifacts, deploy, and more:
+# https://docs.microsoft.com/azure/devops/pipelines/languages/javascript
+pool:
+  vmImage: 'vs2017-win2016'
+
+trigger:
+  paths:
+    exclude:
+      - README.md
+      - CHANGELOG.md
+      - CODE_OF_CONDUCT.md
+steps:
+  - task: NodeTool@0
+    inputs:
+      versionSpec: '8.x'
+    displayName: 'Install Node.js'
+
+  - script: |
+      npm install -g yarn ember-cli ts-node mocha
+    displayName: 'Setup global tools'
+
+  - script: |
+      yarn install
+    displayName: 'Build'
+
+  - script: |
+      mocha --recursive node-tests -R xunit > node-tests.xml
+    displayName: 'Node Tests'
+  - script: |
+      echo " --- NODE TESTS --- " && cat node-tests.xml
+    displayName: 'Log test output files'
+
+  - task: PublishTestResults@2
+    inputs:
+      testResultsFormat: 'jUnit'
+      testResultsFiles: '*-tests.xml'

blueprints/acceptance-test/index.js

@@ -1,9 +1,9 @@
 'use strict';
 
+const fs = require('fs');
 const path = require('path');
 const pathUtil = require('ember-cli-path-utils');
 const stringUtils = require('ember-cli-string-utils');
-const existsSync = require('exists-sync');
 
 const useTestFrameworkDetector = require('../test-framework-detector');
 
@@ -17,7 +17,7 @@ module.exports = useTestFrameworkDetector({
       testFolderRoot = pathUtil.getRelativeParentPath(options.entity.name, -1, false);
     }
 
-    let destroyAppExists = existsSync(
+    let destroyAppExists = fs.existsSync(
       path.join(this.project.root, '/tests/helpers/destroy-app.js')
     );
 
@@ -29,7 +29,7 @@ module.exports = useTestFrameworkDetector({
     return {
       testFolderRoot: testFolderRoot,
       friendlyTestName,
-      destroyAppExists: destroyAppExists,
+      destroyAppExists,
     };
   },
 });

blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.ts

@@ -0,0 +1,13 @@
+import { describe, it } from 'mocha';
+import { expect } from 'chai';
+import { setupApplicationTest } from 'ember-mocha';
+import { visit, currentURL } from '@ember/test-helpers';
+
+describe('<%= friendlyTestName %>', function() {
+  setupApplicationTest();
+
+  it('can visit /<%= dasherizedModuleName %>', async function() {
+    await visit('/<%= dasherizedModuleName %>');
+    expect(currentURL()).to.equal('/<%= dasherizedModuleName %>');
+  });
+});

blueprints/component-test/index.js

@@ -6,7 +6,7 @@ const isPackageMissing = require('ember-cli-is-package-missing');
 const getPathOption = require('ember-cli-get-component-path-option');
 
 const useTestFrameworkDetector = require('../test-framework-detector');
-const { isModuleUnificationProject } = require('../module-unification');
+const isModuleUnificationProject = require('../module-unification').isModuleUnificationProject;
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates a component integration or unit test.',
@@ -17,12 +17,12 @@ module.exports = useTestFrameworkDetector({
       type: ['integration', 'unit'],
       default: 'integration',
       aliases: [
-        { 'i': 'integration' },
-        { 'u': 'unit' },
-        { 'integration': 'integration' },
-        { 'unit': 'unit' }
-      ]
-    }
+        { i: 'integration' },
+        { u: 'unit' },
+        { integration: 'integration' },
+        { unit: 'unit' },
+      ],
+    },
   ],
 
   fileMapTokens: function() {
@@ -39,16 +39,17 @@ module.exports = useTestFrameworkDetector({
         },
         __testType__(options) {
           if (options.locals.testType === 'unit') {
-            throw new Error('The --unit flag isn\'t supported within a module unification app');
+            throw new Error("The --unit flag isn't supported within a module unification app");
           }
+
           return '';
         },
         __path__(options) {
           if (options.pod) {
-            throw new Error('Pods aren\'t supported within a module unification app');
+            throw new Error("Pods aren't supported within a module unification app");
           }
           return path.join('ui', 'components', options.dasherizedModuleName);
-        }
+        },
       };
     } else {
       return {
@@ -63,10 +64,11 @@ module.exports = useTestFrameworkDetector({
             return path.join(options.podPath, options.locals.path, options.dasherizedModuleName);
           }
           return 'components';
-        }
+        },
       };
     }
   },
+
   locals: function(options) {
     let dasherizedModuleName = stringUtil.dasherize(options.entity.name);
     let componentPathName = dasherizedModuleName;
@@ -80,20 +82,31 @@ module.exports = useTestFrameworkDetector({
 
     if (options.pod && options.path !== 'components' && options.path !== '') {
       componentPathName = [options.path, dasherizedModuleName].filter(Boolean).join('/');
+    } else if (isModuleUnificationProject(this.project)) {
+      if (options.inRepoAddon) {
+        componentPathName = `${options.inRepoAddon}::${dasherizedModuleName}`;
+      } else if (this.project.isEmberCLIAddon()) {
+        componentPathName = `${this.project.pkg.name}::${dasherizedModuleName}`;
+      }
     }
 
     return {
       path: getPathOption(options),
       testType: testType,
       componentPathName: componentPathName,
-      friendlyTestDescription: friendlyTestDescription
+      friendlyTestDescription: friendlyTestDescription,
     };
   },
+
   afterInstall: function(options) {
-    if (!options.dryRun && options.testType === 'integration' && isPackageMissing(this, 'ember-cli-htmlbars-inline-precompile')) {
+    if (
+      !options.dryRun &&
+      options.testType === 'integration' &&
+      isPackageMissing(this, 'ember-cli-htmlbars-inline-precompile')
+    ) {
       return this.addPackagesToProject([
-        { name: 'ember-cli-htmlbars-inline-precompile', target: '^0.3.1' }
+        { name: 'ember-cli-htmlbars-inline-precompile', target: '^0.3.1' },
       ]);
     }
-  }
+  },
 });

blueprints/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts

@@ -0,0 +1,38 @@
+<% if (testType === 'integration') { %>import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupRenderingTest } from 'ember-mocha';
+import { render } from '@ember/test-helpers';
+import hbs from 'htmlbars-inline-precompile';
+
+describe('<%= friendlyTestDescription %>', function() {
+  setupRenderingTest();
+
+  it('renders', async function() {
+    // Set any properties with this.set('myProperty', 'value');
+    // Handle any actions with this.set('myAction', function(val) { ... });
+
+    await render(hbs`{{<%= componentPathName %>}}`);
+
+    expect(this.element.textContent.trim()).to.equal('');
+
+    // Template block usage:
+    await render(hbs`
+      {{#<%= componentPathName %>}}
+        template block text
+      {{/<%= componentPathName %>}}
+    `);
+
+    expect(this.element.textContent.trim()).to.equal('template block text');
+  });
+});<% } else if (testType === 'unit') { %>import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupTest } from 'ember-mocha';
+
+describe('<%= friendlyTestDescription %>', function() {
+  setupTest();
+
+  it('exists', function() {
+    let component = this.owner.factoryFor('component:<%= componentPathName %>').create();
+    expect(component).to.be.ok;
+  });
+});<% } %>

blueprints/component/index.js

@@ -3,23 +3,21 @@
 const path = require('path');
 const stringUtil = require('ember-cli-string-utils');
 const pathUtil = require('ember-cli-path-utils');
-const validComponentName = require('ember-cli-valid-component-name');
 const getPathOption = require('ember-cli-get-component-path-option');
 const normalizeEntityName = require('ember-cli-normalize-entity-name');
 const isModuleUnificationProject = require('../module-unification').isModuleUnificationProject;
+const EOL = require('os').EOL;
 
 module.exports = {
-  description: 'Generates a component. Name must contain a hyphen.',
+  description: 'Generates a component.',
 
   availableOptions: [
     {
       name: 'path',
       type: String,
       default: 'components',
-      aliases: [
-        { 'no-path': '' }
-      ]
-    }
+      aliases: [{ 'no-path': '' }],
+    },
   ],
 
   filesPath: function() {
@@ -53,8 +51,9 @@ module.exports = {
         __path__: function(options) {
           if (options.pod) {
             return path.join(options.podPath, options.locals.path, options.dasherizedModuleName);
+          } else {
+            return 'components';
           }
-          return 'components';
         },
         __templatepath__: function(options) {
           if (options.pod) {
@@ -67,37 +66,38 @@ module.exports = {
             return 'template';
           }
           return options.dasherizedModuleName;
-        }
+        },
       };
     }
   },
 
   normalizeEntityName: function(entityName) {
-    entityName = normalizeEntityName(entityName);
-
-    return validComponentName(entityName);
+    return normalizeEntityName(entityName);
   },
 
   locals: function(options) {
     let templatePath = '';
     let importTemplate = '';
     let contents = '';
+
     // if we're in an addon, build import statement
-    if (options.project.isEmberCLIAddon() || options.inRepoAddon && !options.inDummy) {
+    if (options.project.isEmberCLIAddon() || (options.inRepoAddon && !options.inDummy)) {
       if (options.pod) {
         templatePath = './template';
       } else {
-        templatePath = pathUtil.getRelativeParentPath(options.entity.name) +
-          'templates/components/' + stringUtil.dasherize(options.entity.name);
+        templatePath =
+          pathUtil.getRelativeParentPath(options.entity.name) +
+          'templates/components/' +
+          stringUtil.dasherize(options.entity.name);
       }
-      importTemplate = '// @ts-ignore: Ignore import of compiled template\nimport layout from \'' + templatePath + '\';\n';
-      contents = '\n  layout = layout;';
+      importTemplate = '// @ts-ignore: Ignore import of compiled template' + EOL + 'import layout from \'' + templatePath + '\';' + EOL;
+      contents = EOL + '  layout = layout;';
     }
 
     return {
       importTemplate: importTemplate,
       contents: contents,
-      path: getPathOption(options)
+      path: getPathOption(options),
     };
-  }
+  },
 };

blueprints/controller-test/index.js

@@ -3,15 +3,54 @@
 const stringUtil = require('ember-cli-string-utils');
 
 const useTestFrameworkDetector = require('../test-framework-detector');
+const isModuleUnificationProject = require('../module-unification').isModuleUnificationProject;
+const path = require('path');
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates a controller unit test.',
   locals: function(options) {
     let dasherizedModuleName = stringUtil.dasherize(options.entity.name);
     let controllerPathName = dasherizedModuleName;
+
     return {
       controllerPathName: controllerPathName,
-      friendlyTestDescription: ['Unit', 'Controller', dasherizedModuleName].join(' | ')
+      friendlyTestDescription: ['Unit', 'Controller', dasherizedModuleName].join(' | '),
     };
-  }
-});
+  },
+  fileMapTokens: function() {
+    if (isModuleUnificationProject(this.project)) {
+      return {
+        __test__() {
+          return 'controller-test';
+        },
+        __testType__() {
+          return '';
+        },
+        __root__(options) {
+          if (options.pod) {
+            throw new Error("Pods aren't supported within a module unification app");
+          }
+          return 'src';
+        },
+        __path__(options) {
+          return path.join('ui', 'routes', options.dasherizedModuleName);
+        },
+      };
+    } else {
+      return {
+        __root__() {
+          return 'tests';
+        },
+        __testType__() {
+          return 'unit';
+        },
+        __path__(options) {
+          if (options.pod) {
+            return path.join(options.podPath, options.dasherizedModuleName);
+          }
+          return 'controllers';
+        },
+      };
+    }
+  },
+});

blueprints/controller-test/mocha-0.12-files/tests/unit/__path__/__test__.ts renamed to blueprints/controller-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.ts

@@ -0,0 +1,13 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupTest } from 'ember-mocha';
+
+describe('<%= friendlyTestDescription %>', function() {
+  setupTest();
+
+  // Replace this with your real tests.
+  it('exists', function() {
+    let controller = this.owner.lookup('controller:<%= controllerPathName %>');
+    expect(controller).to.be.ok;
+  });
+});