Merge pull request #20880 from Windvis/cleanup-ember-cli-qunit-tests

Author: kategengler

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

@@ -7,9 +7,8 @@ const stringUtils = require('ember-cli-string-utils');
 
 const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 const { modulePrefixForProject } = require('../-utils');
-const useTestFrameworkDetector = require('../test-framework-detector');
 
-module.exports = useTestFrameworkDetector({
+module.exports = {
   description: 'Generates an acceptance test for a feature.',
 
   shouldTransformTypeScript: true,
@@ -42,4 +41,4 @@ module.exports = useTestFrameworkDetector({
       destroyAppExists,
     };
   },
-});
+};

blueprints/acceptance-test/index.js

@@ -8,14 +8,13 @@ const semver = require('semver');
 
 const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 const { modulePrefixForProject } = require('../-utils');
-const useTestFrameworkDetector = require('../test-framework-detector');
 
 function invocationFor(options) {
   let parts = options.entity.name.split('/');
   return parts.map((p) => stringUtil.classify(p)).join('::');
 }
 
-module.exports = useTestFrameworkDetector({
+module.exports = {
   description: 'Generates a component integration or unit test.',
 
   shouldTransformTypeScript: true,
@@ -118,4 +117,4 @@ module.exports = useTestFrameworkDetector({
       ]);
     }
   },
-});
+};

blueprints/acceptance-test/qunit-files/tests/acceptance/__name__-test.js

@@ -2,13 +2,12 @@
 
 const stringUtil = require('ember-cli-string-utils');
 
-const useTestFrameworkDetector = require('../test-framework-detector');
 const path = require('path');
 
 const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 const { modulePrefixForProject } = require('../-utils');
 
-module.exports = useTestFrameworkDetector({
+module.exports = {
   description: 'Generates a controller unit test.',
 
   shouldTransformTypeScript: true,
@@ -44,4 +43,4 @@ module.exports = useTestFrameworkDetector({
       },
     };
   },
-});
+};

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

@@ -6,9 +6,7 @@ const semver = require('semver');
 const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 const { modulePrefixForProject } = require('../-utils');
 
-const useTestFrameworkDetector = require('../test-framework-detector');
-
-module.exports = useTestFrameworkDetector({
+module.exports = {
   description: 'Generates a helper integration test.',
 
   shouldTransformTypeScript: true,
@@ -64,4 +62,4 @@ module.exports = useTestFrameworkDetector({
       ]);
     }
   },
-});
+};

blueprints/component-test/index.js

@@ -5,9 +5,8 @@ const path = require('path');
 
 const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 const { modulePrefixForProject } = require('../-utils');
-const useTestFrameworkDetector = require('../test-framework-detector');
 
-module.exports = useTestFrameworkDetector({
+module.exports = {
   description: 'Generates an initializer unit test.',
 
   shouldTransformTypeScript: true,
@@ -37,4 +36,4 @@ module.exports = useTestFrameworkDetector({
       ),
     };
   },
-});
+};

blueprints/component-test/qunit-files/__root__/__testType__/__path__/__test__.js

@@ -5,9 +5,8 @@ const path = require('path');
 
 const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 const { modulePrefixForProject } = require('../-utils');
-const useTestFrameworkDetector = require('../test-framework-detector');
 
-module.exports = useTestFrameworkDetector({
+module.exports = {
   description: 'Generates an instance initializer unit test.',
 
   shouldTransformTypeScript: true,
@@ -36,4 +35,4 @@ module.exports = useTestFrameworkDetector({
       ),
     };
   },
-});
+};

blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts blueprints/controller-test/files/__root__/__testType__/__path__/__test__.ts

@@ -2,9 +2,7 @@
 
 const path = require('path');
 
-const useTestFrameworkDetector = require('../test-framework-detector');
-
-module.exports = useTestFrameworkDetector({
+module.exports = {
   description: 'Generates a mixin unit test.',
 
   fileMapTokens() {
@@ -24,4 +22,4 @@ module.exports = useTestFrameworkDetector({
       friendlyTestName: ['Unit', 'Mixin', options.entity.name].join(' | '),
     };
   },
-});
+};

blueprints/controller-test/index.js

@@ -3,11 +3,10 @@
 const path = require('path');
 const stringUtil = require('ember-cli-string-utils');
 
-const useTestFrameworkDetector = require('../test-framework-detector');
 const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 const { modulePrefixForProject } = require('../-utils');
 
-module.exports = useTestFrameworkDetector({
+module.exports = {
   description: 'Generates a route unit test.',
 
   shouldTransformTypeScript: true,
@@ -63,4 +62,4 @@ module.exports = useTestFrameworkDetector({
       moduleName: stringUtil.dasherize(moduleName),
     };
   },
-});
+};

blueprints/controller-test/qunit-files/__root__/__testType__/__path__/__test__.js

@@ -2,9 +2,8 @@
 
 const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 const { modulePrefixForProject } = require('../-utils');
-const useTestFrameworkDetector = require('../test-framework-detector');
 
-module.exports = useTestFrameworkDetector({
+module.exports = {
   description: 'Generates a service unit test.',
 
   shouldTransformTypeScript: true,
@@ -31,4 +30,4 @@ module.exports = useTestFrameworkDetector({
       friendlyTestDescription: ['Unit', 'Service', options.entity.name].join(' | '),
     };
   },
-});
+};

blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/helpers/__name__-test.ts blueprints/helper-test/files/__root__/__testType__/helpers/__name__-test.ts

@@ -4,9 +4,8 @@ const path = require('path');
 
 const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 const { modulePrefixForProject } = require('../-utils');
-const useTestFrameworkDetector = require('../test-framework-detector');
 
-module.exports = useTestFrameworkDetector({
+module.exports = {
   description: 'Generates a util unit test.',
 
   shouldTransformTypeScript: true,
@@ -33,4 +32,4 @@ module.exports = useTestFrameworkDetector({
       modulePrefix: modulePrefixForProject(options.project),
     };
   },
-});
+};