Merge pull request #702 from Gaurav0/update_test_blueprints

Update test blueprints

Author: Gaurav0

app/mixins/test-files.js

@@ -1,22 +1,11 @@
 import Mixin from '@ember/object/mixin';
+import { camelize } from '@ember/string';
 
 export default Mixin.create({
   ensureTestHelperExists() {
     this._ensureExists('tests/test-helper.js', 'test-helper');
   },
 
-  ensureTestStartAppHelperExists() {
-    this._ensureExists('tests/helpers/start-app.js', 'test-start-app');
-  },
-
-  ensureTestDestroyAppHelperExists() {
-    this._ensureExists('tests/helpers/destroy-app.js', 'test-destroy-app');
-  },
-
-  ensureTestModuleForAcceptanceHelperExists() {
-    this._ensureExists('tests/helpers/module-for-acceptance.js', 'test-module-for-acceptance');
-  },
-
   _ensureExists(filePath, blueprint) {
     if (!this.hasPath(filePath)) {
       const fileProperties = this.emberCli.buildProperties(blueprint);
@@ -30,7 +19,9 @@ export default Mixin.create({
     const splitFilePath = filePath.split('/');
     const file = splitFilePath[splitFilePath.length - 1];
     const name = file.replace('-test.js', '');
-    return { filePath, name };
+    let camelizedName = camelize(name);
+    camelizedName = setCharAt(camelizedName, 0, name[0].toUpperCase());
+    return { filePath, name, camelizedName };
   },
 
   ensureTestingEnabled() {
@@ -44,7 +35,11 @@ export default Mixin.create({
 
     const fileProperties = this.emberCli.buildProperties(blueprint, {
       dasherizedModuleName: name,
-      friendlyTestDescription: 'TODO: put something here'
+      moduleName: name,
+      friendlyTestDescription: 'TODO: put something here',
+      routePathName: name,
+      controllerPathName: name,
+      servicePathName: name,
     });
 
     if (this.isPathInvalid(blueprint, filePath)) {
@@ -56,12 +51,19 @@ export default Mixin.create({
   createIntegrationTestFile(type) {
     this.ensureTestHelperExists();
     const blueprint = type + '-test';
-    const { filePath, name } = this.calculateFileVarsForTests(blueprint);
+    const { filePath, camelizedName } = this.calculateFileVarsForTests(blueprint);
+
+    let openComponent = descriptor => `<${descriptor}>`;
+    let closeComponent = descriptor => `</${descriptor}>`;
+    let selfCloseComponent = descriptor => `<${descriptor} />`;
 
     const fileProperties = this.emberCli.buildProperties(blueprint, {
       testType: 'integration',
-      componentPathName: name,
-      friendlyTestDescription: 'TODO: put something here'
+      componentName: camelizedName,
+      friendlyTestDescription: 'TODO: put something here',
+      openComponent,
+      closeComponent,
+      selfCloseComponent
     });
 
     if (this.isPathInvalid(blueprint, filePath)) {
@@ -72,9 +74,6 @@ export default Mixin.create({
 
   createAcceptanceTestFile() {
     this.ensureTestHelperExists();
-    this.ensureTestStartAppHelperExists();
-    this.ensureTestDestroyAppHelperExists();
-    this.ensureTestModuleForAcceptanceHelperExists();
     const blueprint = 'acceptance-test';
     const { filePath, name } = this.calculateFileVarsForTests(blueprint);
 
@@ -90,3 +89,8 @@ export default Mixin.create({
     this.createFile(filePath, fileProperties);
   }
 });
+
+function setCharAt(str, index, char) {
+  if(index > str.length-1) return str;
+  return str.substr(0,index) + char + str.substr(index+1);
+}

app/services/ember-cli.js

@@ -112,18 +112,6 @@ const availableBlueprints = {
     blueprint: 'test-helper',
     filePath: 'tests/test-helper.js'
   },
-  'test-start-app': {
-    blueprint: 'test-start-app',
-    filePath: 'tests/helpers/start-app.js'
-  },
-  'test-destroy-app': {
-    blueprint: 'test-destroy-app',
-    filePath: 'tests/helpers/destroy-app.js'
-  },
-  'test-module-for-acceptance': {
-    blueprint: 'test-module-for-acceptance',
-    filePath: 'tests/helpers/module-for-acceptance.js'
-  },
   'controller-test': {
     blueprint: 'controller-test',
     filePath: 'tests/unit/controllers/my-controller-test.js'

blueprints/tests/helpers/destroy-app.js

@@ -1,10 +1,16 @@
 import Application from '../app';
 import config from '../config/environment';
 import { setApplication } from '@ember/test-helpers';
-import { start } from 'ember-qunit';
 import { assign } from '@ember/polyfills';
+import { start } from 'ember-qunit';
+
+let attributes = {
+  rootElement: '#test-root',
+  autoboot: false
+};
+attributes = assign(attributes, config.APP);
 
-let attributes = assign({ rootElement: '#main' }, config.APP);
-setApplication(Application.create(attributes));
+let application = Application.create(attributes);
+setApplication(application);
 
 start();

blueprints/tests/helpers/module-for-acceptance.js

@@ -16,6 +16,16 @@ function getEmberCLIBlueprints() {
         "router": "app/files/app/router.js"
       }
     },
+    "emberBlueprintFiles": {
+      "path": "node_modules/ember-source",
+      "files": {
+        'controller-test': 'controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js',
+        'route-test': 'route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js',
+        'service-test': 'service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js',
+        'component-test': 'component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js',
+        'acceptance-test': 'acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js'
+      }
+    },
     "legacyBlueprintFiles": {
       "path": path.dirname(require.resolve('ember-cli-legacy-blueprints')),
       "files": {
@@ -25,12 +35,7 @@ function getEmberCLIBlueprints() {
         'route': 'route/files/__root__/__path__/__name__.js',
         'service': 'service/files/__root__/__path__/__name__.js',
         'template': 'template/files/__root__/__path__/__name__.hbs',
-        'helper': 'helper/files/__root__/helpers/__name__.js',
-        'controller-test': 'controller-test/qunit-files/tests/unit/__path__/__test__.js',
-        'route-test': 'route-test/qunit-files/tests/unit/__path__/__test__.js',
-        'service-test': 'service-test/qunit-files/tests/unit/__path__/__test__.js',
-        'component-test': 'component-test/qunit-files/tests/__testType__/__path__/__test__.js',
-        'acceptance-test': 'acceptance-test/qunit-files/tests/acceptance/__name__-test.js'
+        'helper': 'helper/files/__root__/helpers/__name__.js'
       }
     }
   }
@@ -56,9 +61,6 @@ function getEmberCLIBlueprints() {
   fileMap['app.css'] = fs.readFileSync('blueprints/app.css').toString();
   fileMap['index.html'] = fs.readFileSync('blueprints/index.html').toString();
   fileMap['test-helper'] = fs.readFileSync('blueprints/tests/test-helper.js').toString();
-  fileMap['test-start-app'] = fs.readFileSync('blueprints/tests/helpers/start-app.js').toString();
-  fileMap['test-destroy-app'] = fs.readFileSync('blueprints/tests/helpers/destroy-app.js').toString();
-  fileMap['test-module-for-acceptance'] = fs.readFileSync('blueprints/tests/helpers/module-for-acceptance.js').toString();
   fileMap['model'] = fs.readFileSync('blueprints/model.js').toString();
 
   return 'export default ' + JSON.stringify(fileMap);

blueprints/tests/helpers/start-app.js

@@ -289,7 +289,7 @@ module('Acceptance | gist', function(hooks) {
     await click(firstFilePicker());
 
     let numFiles = firstFilePickerFiles().length;
-    assert.equal(numFiles, origFileCount + 5, 'Added 5 test files');
+    assert.equal(numFiles, origFileCount + 2, 'Added 2 test files');
 
     let fileNames = firstFilePickerFileNames();
     assert.equal(fileNames[fileNames.length - 1], promptValue, 'Added the file with the right name');