diff --git a/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.ts b/blueprints/acceptance-test/files/tests/acceptance/__name__-test.ts similarity index 100% rename from blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.ts rename to blueprints/acceptance-test/files/tests/acceptance/__name__-test.ts diff --git a/blueprints/acceptance-test/index.js b/blueprints/acceptance-test/index.js index 8e162278770..bb9420f413f 100644 --- a/blueprints/acceptance-test/index.js +++ b/blueprints/acceptance-test/index.js @@ -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, }; }, -}); +}; diff --git a/blueprints/acceptance-test/qunit-files/tests/acceptance/__name__-test.js b/blueprints/acceptance-test/qunit-files/tests/acceptance/__name__-test.js deleted file mode 100644 index 35b4c18f65b..00000000000 --- a/blueprints/acceptance-test/qunit-files/tests/acceptance/__name__-test.js +++ /dev/null @@ -1,12 +0,0 @@ -import { test } from 'qunit'; -import moduleForAcceptance from '<%= testFolderRoot %>/tests/helpers/module-for-acceptance'; - -moduleForAcceptance('<%= friendlyTestName %>'); - -test('visiting /<%= dasherizedModuleName %>', function (assert) { - visit('/<%= dasherizedModuleName %>'); - - andThen(function () { - assert.strictEqual(currentURL(), '/<%= dasherizedModuleName %>'); - }); -}); diff --git a/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts b/blueprints/component-test/files/__root__/__testType__/__path__/__test__.ts similarity index 100% rename from blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts rename to blueprints/component-test/files/__root__/__testType__/__path__/__test__.ts diff --git a/blueprints/component-test/index.js b/blueprints/component-test/index.js index 87341a99bd3..6178bed0e84 100644 --- a/blueprints/component-test/index.js +++ b/blueprints/component-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({ ]); } }, -}); +}; diff --git a/blueprints/component-test/qunit-files/__root__/__testType__/__path__/__test__.js b/blueprints/component-test/qunit-files/__root__/__testType__/__path__/__test__.js deleted file mode 100644 index 29c6b4e042b..00000000000 --- a/blueprints/component-test/qunit-files/__root__/__testType__/__path__/__test__.js +++ /dev/null @@ -1,31 +0,0 @@ -import { moduleForComponent, test } from 'ember-qunit';<% if (testType === 'integration') { %> -import hbs from 'htmlbars-inline-precompile';<% } %> - -moduleForComponent('<%= componentPathName %>', '<%= friendlyTestDescription %>', { - <% if (testType === 'integration' ) { %>integration: true,<% } else if(testType === 'unit') { %>// Specify the other units that are required for this test - // needs: ['component:foo', 'helper:bar'], - unit: true,<% } %> -}); - -test('it renders', function (assert) {<% if (testType === 'integration' ) { %> - // Set any properties with this.set('myProperty', 'value'); - // Handle any actions with this.on('myAction', function(val) { ... }); - - this.render(hbs`<%= selfCloseComponent(componentName) %>`); - - assert.strictEqual(this.$().text().trim(), ''); - - // Template block usage: - this.render(hbs` - <%= openComponent(componentName) %> - template block text - <%= closeComponent(componentName) %> - `); - - assert.strictEqual(this.$().text().trim(), 'template block text');<% } else if(testType === 'unit') { %> - // Creates the component instance - /*let component =*/ this.subject(); - // Renders the component to the page - this.render(); - assert.strictEqual(this.$().text().trim(), '');<% } %> -}); diff --git a/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts b/blueprints/controller-test/files/__root__/__testType__/__path__/__test__.ts similarity index 100% rename from blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts rename to blueprints/controller-test/files/__root__/__testType__/__path__/__test__.ts diff --git a/blueprints/controller-test/index.js b/blueprints/controller-test/index.js index 7a7bddb27c9..182f731a977 100644 --- a/blueprints/controller-test/index.js +++ b/blueprints/controller-test/index.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({ }, }; }, -}); +}; diff --git a/blueprints/controller-test/qunit-files/__root__/__testType__/__path__/__test__.js b/blueprints/controller-test/qunit-files/__root__/__testType__/__path__/__test__.js deleted file mode 100644 index 8d274ae5f3b..00000000000 --- a/blueprints/controller-test/qunit-files/__root__/__testType__/__path__/__test__.js +++ /dev/null @@ -1,12 +0,0 @@ -import { moduleFor, test } from 'ember-qunit'; - -moduleFor('controller:<%= dasherizedModuleName %>', '<%= friendlyTestDescription %>', { - // Specify the other units that are required for this test. - // needs: ['controller:foo'] -}); - -// TODO: Replace this with your real tests. -test('it exists', function (assert) { - let controller = this.subject(); - assert.ok(controller); -}); diff --git a/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/helpers/__name__-test.ts b/blueprints/helper-test/files/__root__/__testType__/helpers/__name__-test.ts similarity index 100% rename from blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/helpers/__name__-test.ts rename to blueprints/helper-test/files/__root__/__testType__/helpers/__name__-test.ts diff --git a/blueprints/helper-test/index.js b/blueprints/helper-test/index.js index 5a4f0c7a306..801b29c18e1 100644 --- a/blueprints/helper-test/index.js +++ b/blueprints/helper-test/index.js @@ -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({ ]); } }, -}); +}; diff --git a/blueprints/helper-test/qunit-files/__root__/__testType__/helpers/__name__-test.js b/blueprints/helper-test/qunit-files/__root__/__testType__/helpers/__name__-test.js deleted file mode 100644 index 45b8e177f2c..00000000000 --- a/blueprints/helper-test/qunit-files/__root__/__testType__/helpers/__name__-test.js +++ /dev/null @@ -1,15 +0,0 @@ -import { moduleForComponent, test } from 'ember-qunit'; -import hbs from 'htmlbars-inline-precompile'; - -moduleForComponent('<%= dasherizedModuleName %>', 'helper:<%= dasherizedModuleName %>', { - integration: true, -}); - -// TODO: Replace this with your real tests. -test('it renders', function (assert) { - this.set('inputValue', '1234'); - - this.render(hbs`{{<%= dasherizedModuleName %> this.inputValue}}`); - - assert.strictEqual(this.$().text().trim(), '1234'); -}); diff --git a/blueprints/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts b/blueprints/initializer-test/files/__root__/__testType__/__path__/__name__-test.ts similarity index 100% rename from blueprints/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts rename to blueprints/initializer-test/files/__root__/__testType__/__path__/__name__-test.ts diff --git a/blueprints/initializer-test/index.js b/blueprints/initializer-test/index.js index f17fd865020..b3795542b13 100644 --- a/blueprints/initializer-test/index.js +++ b/blueprints/initializer-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({ ), }; }, -}); +}; diff --git a/blueprints/initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js b/blueprints/initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js deleted file mode 100644 index 4a3131618ea..00000000000 --- a/blueprints/initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js +++ /dev/null @@ -1,25 +0,0 @@ -import Application from '@ember/application'; -import { run } from '@ember/runloop'; - -import { initialize } from '<%= modulePrefix %>/initializers/<%= dasherizedModuleName %>'; -import { module, test } from 'qunit'; -<% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';\n<% } %> -module('<%= friendlyTestName %>', { - beforeEach() { - run(() => { - this.application = Application.create(); - this.application.deferReadiness(); - }); - }, - afterEach() { - <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %> - }, -}); - -// TODO: Replace this with your real tests. -test('it works', function (assert) { - initialize(this.application); - - // you would normally confirm the results of the initializer here - assert.ok(true); -}); diff --git a/blueprints/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts b/blueprints/instance-initializer-test/files/__root__/__testType__/__path__/__name__-test.ts similarity index 100% rename from blueprints/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts rename to blueprints/instance-initializer-test/files/__root__/__testType__/__path__/__name__-test.ts diff --git a/blueprints/instance-initializer-test/index.js b/blueprints/instance-initializer-test/index.js index 9fade3a2196..f9774f9cc6f 100644 --- a/blueprints/instance-initializer-test/index.js +++ b/blueprints/instance-initializer-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 instance initializer unit test.', shouldTransformTypeScript: true, @@ -36,4 +35,4 @@ module.exports = useTestFrameworkDetector({ ), }; }, -}); +}; diff --git a/blueprints/instance-initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js b/blueprints/instance-initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js deleted file mode 100644 index 9f056812709..00000000000 --- a/blueprints/instance-initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js +++ /dev/null @@ -1,26 +0,0 @@ -import Application from '@ember/application'; -import { run } from '@ember/runloop'; -import { initialize } from '<%= modulePrefix %>/instance-initializers/<%= dasherizedModuleName %>'; -import { module, test } from 'qunit';<% if (destroyAppExists) { %> -import destroyApp from '../../helpers/destroy-app';<% } %> - -module('<%= friendlyTestName %>', { - beforeEach() { - run(() => { - this.application = Application.create(); - this.appInstance = this.application.buildInstance(); - }); - }, - afterEach() { - run(this.appInstance, 'destroy'); - <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %> - }, -}); - -// TODO: Replace this with your real tests. -test('it works', function (assert) { - initialize(this.appInstance); - - // you would normally confirm the results of the initializer here - assert.ok(true); -}); diff --git a/blueprints/mixin-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js b/blueprints/mixin-test/files/__root__/__testType__/__name__-test.js similarity index 100% rename from blueprints/mixin-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js rename to blueprints/mixin-test/files/__root__/__testType__/__name__-test.js diff --git a/blueprints/mixin-test/index.js b/blueprints/mixin-test/index.js index 73067ea9d0c..8660219174d 100644 --- a/blueprints/mixin-test/index.js +++ b/blueprints/mixin-test/index.js @@ -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(' | '), }; }, -}); +}; diff --git a/blueprints/mixin-test/qunit-files/__root__/__testType__/__name__-test.js b/blueprints/mixin-test/qunit-files/__root__/__testType__/__name__-test.js deleted file mode 100644 index 00579ff7c02..00000000000 --- a/blueprints/mixin-test/qunit-files/__root__/__testType__/__name__-test.js +++ /dev/null @@ -1,12 +0,0 @@ -import EmberObject from '@ember/object'; -import <%= classifiedModuleName %>Mixin from '<%= projectName %>/mixins/<%= dasherizedModuleName %>'; -import { module, test } from 'qunit'; - -module('<%= friendlyTestName %>'); - -// TODO: Replace this with your real tests. -test('it works', function (assert) { - let <%= classifiedModuleName %>Object = EmberObject.extend(<%= classifiedModuleName %>Mixin); - let subject = <%= classifiedModuleName %>Object.create(); - assert.ok(subject); -}); diff --git a/blueprints/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts b/blueprints/route-test/files/__root__/__testType__/__path__/__test__.ts similarity index 100% rename from blueprints/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts rename to blueprints/route-test/files/__root__/__testType__/__path__/__test__.ts diff --git a/blueprints/route-test/index.js b/blueprints/route-test/index.js index afb0981bdc9..616ff073d27 100644 --- a/blueprints/route-test/index.js +++ b/blueprints/route-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), }; }, -}); +}; diff --git a/blueprints/route-test/qunit-files/__root__/__testType__/__path__/__test__.js b/blueprints/route-test/qunit-files/__root__/__testType__/__path__/__test__.js deleted file mode 100644 index 44232623e38..00000000000 --- a/blueprints/route-test/qunit-files/__root__/__testType__/__path__/__test__.js +++ /dev/null @@ -1,11 +0,0 @@ -import { moduleFor, test } from 'ember-qunit'; - -moduleFor('route:<%= moduleName %>', '<%= friendlyTestDescription %>', { - // Specify the other units that are required for this test. - // needs: ['controller:foo'] -}); - -test('it exists', function (assert) { - let route = this.subject(); - assert.ok(route); -}); diff --git a/blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts b/blueprints/service-test/files/__root__/__testType__/__path__/__test__.ts similarity index 100% rename from blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts rename to blueprints/service-test/files/__root__/__testType__/__path__/__test__.ts diff --git a/blueprints/service-test/index.js b/blueprints/service-test/index.js index 765a622310c..61ceb9491d7 100644 --- a/blueprints/service-test/index.js +++ b/blueprints/service-test/index.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(' | '), }; }, -}); +}; diff --git a/blueprints/service-test/qunit-files/__root__/__testType__/__path__/__test__.js b/blueprints/service-test/qunit-files/__root__/__testType__/__path__/__test__.js deleted file mode 100644 index 1f42bc8820f..00000000000 --- a/blueprints/service-test/qunit-files/__root__/__testType__/__path__/__test__.js +++ /dev/null @@ -1,12 +0,0 @@ -import { moduleFor, test } from 'ember-qunit'; - -moduleFor('service:<%= dasherizedModuleName %>', '<%= friendlyTestDescription %>', { - // Specify the other units that are required for this test. - // needs: ['service:foo'] -}); - -// TODO: Replace this with your real tests. -test('it exists', function (assert) { - let service = this.subject(); - assert.ok(service); -}); diff --git a/blueprints/test-framework-detector.js b/blueprints/test-framework-detector.js deleted file mode 100644 index d45b018b6ff..00000000000 --- a/blueprints/test-framework-detector.js +++ /dev/null @@ -1,38 +0,0 @@ -'use strict'; - -const fs = require('fs'); -const path = require('path'); -const VersionChecker = require('ember-cli-version-checker'); - -module.exports = function (blueprint) { - blueprint.supportsAddon = function () { - return false; - }; - - blueprint.filesPath = function () { - let type; - const qunitRfcVersion = 'qunit-rfc-232'; - - let dependencies = this.project.dependencies(); - if ('ember-qunit' in dependencies) { - type = qunitRfcVersion; - } else if ('ember-cli-qunit' in dependencies) { - let checker = new VersionChecker(this.project); - if ( - fs.existsSync(`${this.path}/${qunitRfcVersion}-files`) && - checker.for('ember-cli-qunit', 'npm').gte('4.2.0') - ) { - type = qunitRfcVersion; - } else { - type = 'qunit'; - } - } else { - this.ui.writeLine("Couldn't determine test style - using QUnit"); - type = 'qunit'; - } - - return path.join(this.path, type + '-files'); - }; - - return blueprint; -}; diff --git a/blueprints/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.ts b/blueprints/util-test/files/__root__/__testType__/__name__-test.ts similarity index 100% rename from blueprints/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.ts rename to blueprints/util-test/files/__root__/__testType__/__name__-test.ts diff --git a/blueprints/util-test/index.js b/blueprints/util-test/index.js index 7cc016954c9..9cc813ef29c 100644 --- a/blueprints/util-test/index.js +++ b/blueprints/util-test/index.js @@ -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), }; }, -}); +}; diff --git a/blueprints/util-test/qunit-files/__root__/__testType__/__name__-test.js b/blueprints/util-test/qunit-files/__root__/__testType__/__name__-test.js deleted file mode 100644 index 2a10306510e..00000000000 --- a/blueprints/util-test/qunit-files/__root__/__testType__/__name__-test.js +++ /dev/null @@ -1,10 +0,0 @@ -import <%= camelizedModuleName %> from '<%= modulePrefix %>/utils/<%= dasherizedModuleName %>'; -import { module, test } from 'qunit'; - -module('<%= friendlyTestName %>'); - -// TODO: Replace this with your real tests. -test('it works', function (assert) { - let result = <%= camelizedModuleName %>(); - assert.ok(result); -}); diff --git a/node-tests/blueprints/acceptance-test-test.js b/node-tests/blueprints/acceptance-test-test.js index f30b8d3829c..c0195e90248 100644 --- a/node-tests/blueprints/acceptance-test-test.js +++ b/node-tests/blueprints/acceptance-test-test.js @@ -4,12 +4,10 @@ const blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers'); const setupTestHooks = blueprintHelpers.setupTestHooks; const emberNew = blueprintHelpers.emberNew; const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy; -const modifyPackages = blueprintHelpers.modifyPackages; const chai = require('ember-cli-blueprint-test-helpers/chai'); const expect = chai.expect; -const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest'); const fixture = require('../helpers/fixture'); describe('Blueprint: acceptance-test', function () { @@ -20,39 +18,9 @@ describe('Blueprint: acceptance-test', function () { return emberNew(); }); - describe('with ember-cli-qunit@4.1.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.1.0'); - }); - - it('acceptance-test foo', function () { - return emberGenerateDestroy(['acceptance-test', 'foo'], (_file) => { - expect(_file('tests/acceptance/foo-test.js')).to.equal( - fixture('acceptance-test/default.js') - ); - }); - }); - }); - - describe('with ember-cli-qunit@4.2.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.2.0'); - }); - - it('acceptance-test foo', function () { - return emberGenerateDestroy(['acceptance-test', 'foo'], (_file) => { - expect(_file('tests/acceptance/foo-test.js')).to.equal( - fixture('acceptance-test/qunit-rfc268.js') - ); - }); + it('acceptance-test foo', function () { + return emberGenerateDestroy(['acceptance-test', 'foo'], (_file) => { + expect(_file('tests/acceptance/foo-test.js')).to.equal(fixture('acceptance-test/app.js')); }); }); }); @@ -62,51 +30,9 @@ describe('Blueprint: acceptance-test', function () { return emberNew({ target: 'addon' }); }); - describe('with ember-cli-qunit@4.1.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.1.0'); - }); - - it('acceptance-test foo', function () { - return emberGenerateDestroy(['acceptance-test', 'foo'], (_file) => { - expect(_file('tests/acceptance/foo-test.js')).to.equal( - fixture('acceptance-test/addon-default.js') - ); - - expect(_file('app/acceptance-tests/foo.js')).to.not.exist; - }); - }); - - it('acceptance-test foo/bar', function () { - return emberGenerateDestroy(['acceptance-test', 'foo/bar'], (_file) => { - expect(_file('tests/acceptance/foo/bar-test.js')).to.equal( - fixture('acceptance-test/addon-nested.js') - ); - - expect(_file('app/acceptance-tests/foo/bar.js')).to.not.exist; - }); - }); - }); - - describe('with ember-cli-qunit@4.2.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.2.0'); - }); - - it('acceptance-test foo', function () { - return emberGenerateDestroy(['acceptance-test', 'foo'], (_file) => { - expect(_file('tests/acceptance/foo-test.js')).to.equal( - fixture('acceptance-test/qunit-rfc268-addon.js') - ); - }); + it('acceptance-test foo', function () { + return emberGenerateDestroy(['acceptance-test', 'foo'], (_file) => { + expect(_file('tests/acceptance/foo-test.js')).to.equal(fixture('acceptance-test/addon.js')); }); }); }); diff --git a/node-tests/blueprints/component-class-test.js b/node-tests/blueprints/component-class-test.js index 524294a768d..ac86561ebaa 100644 --- a/node-tests/blueprints/component-class-test.js +++ b/node-tests/blueprints/component-class-test.js @@ -4,13 +4,10 @@ const blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers'); const setupTestHooks = blueprintHelpers.setupTestHooks; const emberNew = blueprintHelpers.emberNew; const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy; -const modifyPackages = blueprintHelpers.modifyPackages; const chai = require('ember-cli-blueprint-test-helpers/chai'); const expect = chai.expect; -const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest'); - const glimmerComponentContents = `import Component from '@glimmer/component'; export default class Foo extends Component {} @@ -31,14 +28,7 @@ describe('Blueprint: component-class', function () { describe('in app', function () { beforeEach(function () { - return emberNew() - .then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]) - ) - .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0')); + return emberNew(); }); it('component-class foo', function () { @@ -147,14 +137,7 @@ describe('Blueprint: component-class', function () { describe('in addon', function () { beforeEach(function () { - return emberNew({ target: 'addon' }) - .then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]) - ) - .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0')); + return emberNew({ target: 'addon' }); }); it('component-class foo', function () { @@ -209,14 +192,7 @@ describe('Blueprint: component-class', function () { describe('in in-repo-addon', function () { beforeEach(function () { - return emberNew({ target: 'in-repo-addon' }) - .then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]) - ) - .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0')); + return emberNew({ target: 'in-repo-addon' }); }); it('component-class foo --in-repo-addon=my-addon', function () { diff --git a/node-tests/blueprints/component-test-test.js b/node-tests/blueprints/component-test-test.js index 4c0b903af83..cc6416543ed 100644 --- a/node-tests/blueprints/component-test-test.js +++ b/node-tests/blueprints/component-test-test.js @@ -1,17 +1,13 @@ 'use strict'; -const fs = require('fs-extra'); - const blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers'); const setupTestHooks = blueprintHelpers.setupTestHooks; const emberNew = blueprintHelpers.emberNew; const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy; -const modifyPackages = blueprintHelpers.modifyPackages; const chai = require('ember-cli-blueprint-test-helpers/chai'); const expect = chai.expect; -const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest'); const fixture = require('../helpers/fixture'); describe('Blueprint: component-test', function () { @@ -22,93 +18,24 @@ describe('Blueprint: component-test', function () { return emberNew(); }); - describe('with default setup', function () { - it('component-test x-foo', function () { - return emberGenerateDestroy(['component-test', 'x-foo'], (_file) => { - expect(_file('tests/integration/components/x-foo-test.js')).to.equal( - fixture('component-test/rfc232.js') - ); - }); - }); - - it('component-test x-foo --unit', function () { - return emberGenerateDestroy(['component-test', 'x-foo', '--unit'], (_file) => { - expect(_file('tests/unit/components/x-foo-test.js')).to.equal( - fixture('component-test/rfc232-unit.js') - ); - }); - }); - }); - - describe('with ember-cli-qunit@4.1.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.1.0'); - }); - - it('component-test x-foo', function () { - return emberGenerateDestroy(['component-test', 'x-foo'], (_file) => { - expect(_file('tests/integration/components/x-foo-test.js')).to.equal( - fixture('component-test/default.js') - ); - }); - }); - - it('component-test x-foo --unit', function () { - return emberGenerateDestroy(['component-test', 'x-foo', '--unit'], (_file) => { - expect(_file('tests/unit/components/x-foo-test.js')).to.equal( - fixture('component-test/unit.js') - ); - }); - }); - - describe('with usePods=true', function () { - beforeEach(function () { - fs.writeFileSync( - '.ember-cli', - `{ - "disableAnalytics": false, - "usePods": true - }` - ); - }); - - it('component-test x-foo', function () { - return emberGenerateDestroy(['component-test', 'x-foo'], (_file) => { - expect(_file('tests/integration/components/x-foo/component-test.js')).to.equal( - fixture('component-test/default.js') - ); - }); - }); + it('component-test foo', function () { + return emberGenerateDestroy(['component-test', 'foo'], (_file) => { + expect(_file('tests/integration/components/foo-test.js')).to.equal( + fixture('component-test/app.js', { + replace: { + component: 'foo', + componentInvocation: 'Foo', + }, + }) + ); }); }); - describe('with ember-cli-qunit@4.2.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.2.0'); - }); - - it('component-test x-foo', function () { - return emberGenerateDestroy(['component-test', 'x-foo'], (_file) => { - expect(_file('tests/integration/components/x-foo-test.js')).to.equal( - fixture('component-test/rfc232.js') - ); - }); - }); - - it('component-test x-foo --unit', function () { - return emberGenerateDestroy(['component-test', 'x-foo', '--unit'], (_file) => { - expect(_file('tests/unit/components/x-foo-test.js')).to.equal( - fixture('component-test/rfc232-unit.js') - ); - }); + it('component-test x-foo --unit', function () { + return emberGenerateDestroy(['component-test', 'x-foo', '--unit'], (_file) => { + expect(_file('tests/unit/components/x-foo-test.js')).to.equal( + fixture('component-test/unit.js') + ); }); }); }); @@ -118,83 +45,44 @@ describe('Blueprint: component-test', function () { return emberNew({ target: 'addon' }); }); - describe('with ember-cli-qunit@4.1.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.1.0'); - }); - - it('component-test x-foo', function () { - return emberGenerateDestroy(['component-test', 'x-foo'], (_file) => { - expect(_file('tests/integration/components/x-foo-test.js')).to.equal( - fixture('component-test/default.js') - ); - - expect(_file('app/component-test/x-foo.js')).to.not.exist; - }); - }); - - it('component-test x-foo --unit', function () { - return emberGenerateDestroy(['component-test', 'x-foo', '--unit'], (_file) => { - expect(_file('tests/unit/components/x-foo-test.js')).to.equal( - fixture('component-test/unit.js') - ); - - expect(_file('app/component-test/x-foo.js')).to.not.exist; - }); - }); - - it('component-test x-foo --dummy', function () { - return emberGenerateDestroy(['component-test', 'x-foo', '--dummy'], (_file) => { - expect(_file('tests/integration/components/x-foo-test.js')).to.equal( - fixture('component-test/default.js') - ); - - expect(_file('app/component-test/x-foo.js')).to.not.exist; - }); + it('component-test foo', function () { + return emberGenerateDestroy(['component-test', 'foo'], (_file) => { + expect(_file('tests/integration/components/foo-test.js')).to.equal( + fixture('component-test/addon.js', { + replace: { + component: 'foo', + componentInvocation: 'Foo', + }, + }) + ); }); }); - describe('with ember-qunit (default)', function () { - it('component-test foo', function () { - return emberGenerateDestroy(['component-test', 'foo'], (_file) => { - expect(_file('tests/integration/components/foo-test.js')).to.equal( - fixture('component-test/rfc232-addon.js') - ); - }); - }); - - it('component-test foo --unit', function () { - return emberGenerateDestroy(['component-test', 'foo', '--unit'], (_file) => { - expect(_file('tests/unit/components/foo-test.js')).to.equal( - fixture('component-test/rfc232-unit-addon.js') - ); - }); + it('component-test foo --unit', function () { + return emberGenerateDestroy(['component-test', 'foo', '--unit'], (_file) => { + expect(_file('tests/unit/components/foo-test.js')).to.equal( + fixture('component-test/addon-unit.js') + ); }); }); }); describe('in in-repo-addon', function () { beforeEach(function () { - return emberNew({ target: 'in-repo-addon' }) - .then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]) - ) - .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0')); + return emberNew({ target: 'in-repo-addon' }); }); - it('component-test x-foo --in-repo-addon=my-addon', function () { + it('component-test foo --in-repo-addon=my-addon', function () { return emberGenerateDestroy( - ['component-test', 'x-foo', '--in-repo-addon=my-addon'], + ['component-test', 'foo', '--in-repo-addon=my-addon'], (_file) => { - expect(_file('tests/integration/components/x-foo-test.js')).to.equal( - fixture('component-test/default.js') + expect(_file('tests/integration/components/foo-test.js')).to.equal( + fixture('component-test/app.js', { + replace: { + component: 'foo', + componentInvocation: 'Foo', + }, + }) ); } ); diff --git a/node-tests/blueprints/component-test.js b/node-tests/blueprints/component-test.js index 279792e36e9..ccecd0f7d99 100644 --- a/node-tests/blueprints/component-test.js +++ b/node-tests/blueprints/component-test.js @@ -4,12 +4,10 @@ const blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers'); const setupTestHooks = blueprintHelpers.setupTestHooks; const emberNew = blueprintHelpers.emberNew; const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy; -const modifyPackages = blueprintHelpers.modifyPackages; const chai = require('ember-cli-blueprint-test-helpers/chai'); const expect = chai.expect; -const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest'); const fixture = require('../helpers/fixture'); const glimmerComponentContents = `import Component from '@glimmer/component'; @@ -32,14 +30,7 @@ describe('Blueprint: component', function () { describe('in app', function () { beforeEach(function () { - return emberNew() - .then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]) - ) - .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0')); + return emberNew(); }); it('component foo', function () { @@ -48,7 +39,7 @@ describe('Blueprint: component', function () { expect(_file('app/components/foo.hbs')).to.equal('{{yield}}'); expect(_file('tests/integration/components/foo-test.js')).to.equal( - fixture('component-test/default-template.js', { + fixture('component-test/app.js', { replace: { component: 'foo', componentInvocation: 'Foo', @@ -74,7 +65,7 @@ describe('Blueprint: component', function () { expect(_file('app/components/foo.hbs')).to.equal('{{yield}}'); expect(_file('tests/integration/components/foo-test.js')).to.equal( - fixture('component-test/default-template.js', { + fixture('component-test/app.js', { replace: { component: 'foo', componentInvocation: 'Foo', @@ -92,7 +83,7 @@ describe('Blueprint: component', function () { expect(_file('app/components/foo.hbs')).to.equal('{{yield}}'); expect(_file('tests/integration/components/foo-test.js')).to.equal( - fixture('component-test/default-template.js', { + fixture('component-test/app.js', { replace: { component: 'foo', componentInvocation: 'Foo', @@ -110,7 +101,7 @@ describe('Blueprint: component', function () { expect(_file('app/components/foo/index.hbs')).to.equal('{{yield}}'); expect(_file('tests/integration/components/foo-test.js')).to.equal( - fixture('component-test/default-template.js', { + fixture('component-test/app.js', { replace: { component: 'foo', componentInvocation: 'Foo', @@ -130,7 +121,7 @@ describe('Blueprint: component', function () { expect(_file('app/components/foo.hbs')).to.equal('{{yield}}'); expect(_file('tests/integration/components/foo-test.js')).to.equal( - fixture('component-test/default-template.js', { + fixture('component-test/app.js', { replace: { component: 'foo', componentInvocation: 'Foo', @@ -150,7 +141,7 @@ describe('Blueprint: component', function () { expect(_file('app/components/foo.hbs')).to.equal('{{yield}}'); expect(_file('tests/integration/components/foo-test.js')).to.equal( - fixture('component-test/default-template.js', { + fixture('component-test/app.js', { replace: { component: 'foo', componentInvocation: 'Foo', @@ -170,7 +161,7 @@ describe('Blueprint: component', function () { expect(_file('app/components/foo.hbs')).to.equal('{{yield}}'); expect(_file('tests/integration/components/foo-test.js')).to.equal( - fixture('component-test/default-template.js', { + fixture('component-test/app.js', { replace: { component: 'foo', componentInvocation: 'Foo', @@ -188,7 +179,7 @@ describe('Blueprint: component', function () { expect(_file('app/components/foo.hbs')).to.equal('{{yield}}'); expect(_file('tests/integration/components/foo-test.js')).to.equal( - fixture('component-test/default-template.js', { + fixture('component-test/app.js', { replace: { component: 'foo', componentInvocation: 'Foo', @@ -204,7 +195,7 @@ describe('Blueprint: component', function () { expect(_file('app/components/x-foo.hbs')).to.equal('{{yield}}'); expect(_file('tests/integration/components/x-foo-test.js')).to.equal( - fixture('component-test/default-template.js', { + fixture('component-test/app.js', { replace: { component: 'x-foo', componentInvocation: 'XFoo', @@ -224,7 +215,7 @@ describe('Blueprint: component', function () { expect(_file('app/components/x-foo.hbs')).to.equal('{{yield}}'); expect(_file('tests/integration/components/x-foo-test.js')).to.equal( - fixture('component-test/default-template.js', { + fixture('component-test/app.js', { replace: { component: 'x-foo', componentInvocation: 'XFoo', @@ -240,7 +231,7 @@ describe('Blueprint: component', function () { expect(_file('app/components/foo/x-foo.hbs')).to.equal('{{yield}}'); expect(_file('tests/integration/components/foo/x-foo-test.js')).to.equal( - fixture('component-test/default-template.js', { + fixture('component-test/app.js', { replace: { component: 'foo/x-foo', componentInvocation: 'Foo::XFoo', @@ -260,7 +251,7 @@ describe('Blueprint: component', function () { expect(_file('app/components/foo/x-foo.hbs')).to.equal('{{yield}}'); expect(_file('tests/integration/components/foo/x-foo-test.js')).to.equal( - fixture('component-test/default-template.js', { + fixture('component-test/app.js', { replace: { component: 'foo/x-foo', componentInvocation: 'Foo::XFoo', @@ -274,14 +265,7 @@ describe('Blueprint: component', function () { describe('in addon', function () { beforeEach(function () { - return emberNew({ target: 'addon' }) - .then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]) - ) - .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0')); + return emberNew({ target: 'addon' }); }); it('component foo', function () { @@ -297,7 +281,7 @@ describe('Blueprint: component', function () { expect(_file('app/templates/components/foo.js')).to.not.exist; expect(_file('tests/integration/components/foo-test.js')).to.equal( - fixture('component-test/default-template.js', { + fixture('component-test/addon.js', { replace: { component: 'foo', componentInvocation: 'Foo', @@ -321,7 +305,7 @@ describe('Blueprint: component', function () { expect(_file('app/components/x-foo.hbs')).to.not.exist; expect(_file('tests/integration/components/x-foo-test.js')).to.equal( - fixture('component-test/default-template.js', { + fixture('component-test/addon.js', { replace: { component: 'x-foo', componentInvocation: 'XFoo', @@ -344,7 +328,7 @@ describe('Blueprint: component', function () { expect(_file('app/templates/components/foo/x-foo.js')).to.not.exist; expect(_file('tests/integration/components/foo/x-foo-test.js')).to.equal( - fixture('component-test/default-template.js', { + fixture('component-test/addon.js', { replace: { component: 'foo/x-foo', componentInvocation: 'Foo::XFoo', @@ -386,14 +370,7 @@ describe('Blueprint: component', function () { describe('in in-repo-addon', function () { beforeEach(function () { - return emberNew({ target: 'in-repo-addon' }) - .then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]) - ) - .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0')); + return emberNew({ target: 'in-repo-addon' }); }); it('component foo --in-repo-addon=my-addon', function () { @@ -410,7 +387,7 @@ describe('Blueprint: component', function () { expect(_file('lib/my-addon/app/components/foo.hbs')).to.not.exist; expect(_file('tests/integration/components/foo-test.js')).to.equal( - fixture('component-test/default-template.js', { + fixture('component-test/app.js', { replace: { component: 'foo', componentInvocation: 'Foo', @@ -434,7 +411,7 @@ describe('Blueprint: component', function () { expect(_file('lib/my-addon/app/components/x-foo.hbs')).to.not.exist; expect(_file('tests/integration/components/x-foo-test.js')).to.equal( - fixture('component-test/default-template.js', { + fixture('component-test/app.js', { replace: { component: 'x-foo', componentInvocation: 'XFoo', diff --git a/node-tests/blueprints/controller-test-test.js b/node-tests/blueprints/controller-test-test.js index 32ce7981e43..bb20edabf2a 100644 --- a/node-tests/blueprints/controller-test-test.js +++ b/node-tests/blueprints/controller-test-test.js @@ -4,12 +4,10 @@ const blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers'); const setupTestHooks = blueprintHelpers.setupTestHooks; const emberNew = blueprintHelpers.emberNew; const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy; -const modifyPackages = blueprintHelpers.modifyPackages; const chai = require('ember-cli-blueprint-test-helpers/chai'); const expect = chai.expect; -const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest'); const fixture = require('../helpers/fixture'); describe('Blueprint: controller-test', function () { @@ -20,55 +18,19 @@ describe('Blueprint: controller-test', function () { return emberNew(); }); - describe('with ember-cli-qunit@4.1.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.1.0'); - }); - - it('controller-test foo', function () { - return emberGenerateDestroy(['controller-test', 'foo'], (_file) => { - expect(_file('tests/unit/controllers/foo-test.js')).to.equal( - fixture('controller-test/default.js') - ); - }); - }); - - it('controller-test foo/bar', function () { - return emberGenerateDestroy(['controller-test', 'foo/bar'], (_file) => { - expect(_file('tests/unit/controllers/foo/bar-test.js')).to.equal( - fixture('controller-test/default-nested.js') - ); - }); + it('controller-test foo', function () { + return emberGenerateDestroy(['controller-test', 'foo'], (_file) => { + expect(_file('tests/unit/controllers/foo-test.js')).to.equal( + fixture('controller-test/app.js') + ); }); }); - describe('with ember-cli-qunit@4.2.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.2.0'); - }); - - it('controller-test foo', function () { - return emberGenerateDestroy(['controller-test', 'foo'], (_file) => { - expect(_file('tests/unit/controllers/foo-test.js')).to.equal( - fixture('controller-test/rfc232.js') - ); - }); - }); - - it('controller-test foo/bar', function () { - return emberGenerateDestroy(['controller-test', 'foo/bar'], (_file) => { - expect(_file('tests/unit/controllers/foo/bar-test.js')).to.equal( - fixture('controller-test/rfc232-nested.js') - ); - }); + it('controller-test foo/bar', function () { + return emberGenerateDestroy(['controller-test', 'foo/bar'], (_file) => { + expect(_file('tests/unit/controllers/foo/bar-test.js')).to.equal( + fixture('controller-test/nested.js') + ); }); }); }); @@ -78,39 +40,11 @@ describe('Blueprint: controller-test', function () { return emberNew({ target: 'addon' }); }); - describe('with ember-cli-qunit@4.1.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.1.0'); - }); - - it('controller-test foo', function () { - return emberGenerateDestroy(['controller-test', 'foo'], (_file) => { - expect(_file('tests/unit/controllers/foo-test.js')).to.equal( - fixture('controller-test/default.js') - ); - }); - }); - - it('controller-test foo/bar', function () { - return emberGenerateDestroy(['controller-test', 'foo/bar'], (_file) => { - expect(_file('tests/unit/controllers/foo/bar-test.js')).to.equal( - fixture('controller-test/default-nested.js') - ); - }); - }); - }); - - describe('with ember-qunit (default)', function () { - it('controller-test foo', function () { - return emberGenerateDestroy(['controller-test', 'foo'], (_file) => { - expect(_file('tests/unit/controllers/foo-test.js')).to.equal( - fixture('controller-test/rfc232-addon.js') - ); - }); + it('controller-test foo', function () { + return emberGenerateDestroy(['controller-test', 'foo'], (_file) => { + expect(_file('tests/unit/controllers/foo-test.js')).to.equal( + fixture('controller-test/addon.js') + ); }); }); }); diff --git a/node-tests/blueprints/controller-test.js b/node-tests/blueprints/controller-test.js index ff4d615677c..9b00e9936d7 100644 --- a/node-tests/blueprints/controller-test.js +++ b/node-tests/blueprints/controller-test.js @@ -5,12 +5,10 @@ const setupTestHooks = blueprintHelpers.setupTestHooks; const emberNew = blueprintHelpers.emberNew; const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy; const setupPodConfig = blueprintHelpers.setupPodConfig; -const modifyPackages = blueprintHelpers.modifyPackages; const chai = require('ember-cli-blueprint-test-helpers/chai'); const expect = chai.expect; -const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest'); const fixture = require('../helpers/fixture'); describe('Blueprint: controller', function () { @@ -18,14 +16,7 @@ describe('Blueprint: controller', function () { describe('in app', function () { beforeEach(function () { - return emberNew() - .then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]) - ) - .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0')); + return emberNew(); }); it('controller foo', function () { @@ -33,7 +24,7 @@ describe('Blueprint: controller', function () { expect(_file('app/controllers/foo.js')).to.equal(fixture('controller/controller.js')); expect(_file('tests/unit/controllers/foo-test.js')).to.equal( - fixture('controller-test/default.js') + fixture('controller-test/app.js') ); }); }); @@ -46,7 +37,7 @@ describe('Blueprint: controller', function () { expect(_file('app/controllers/foo.js')).to.equal(fixture('controller/controller.js')); expect(_file('tests/unit/controllers/foo-test.js')).to.equal( - fixture('controller-test/default.js') + fixture('controller-test/app.js') ); }); }); @@ -58,7 +49,7 @@ describe('Blueprint: controller', function () { ); expect(_file('tests/unit/controllers/foo/bar-test.js')).to.equal( - fixture('controller-test/default-nested.js') + fixture('controller-test/nested.js') ); }); }); @@ -68,7 +59,7 @@ describe('Blueprint: controller', function () { expect(_file('app/foo/controller.js')).to.equal(fixture('controller/controller.js')); expect(_file('tests/unit/foo/controller-test.js')).to.equal( - fixture('controller-test/default.js') + fixture('controller-test/app.js') ); }); }); @@ -81,7 +72,7 @@ describe('Blueprint: controller', function () { expect(_file('app/foo/controller.js')).to.equal(fixture('controller/controller.js')); expect(_file('tests/unit/foo/controller-test.js')).to.equal( - fixture('controller-test/default.js') + fixture('controller-test/app.js') ); }); }); @@ -93,7 +84,7 @@ describe('Blueprint: controller', function () { ); expect(_file('tests/unit/foo/bar/controller-test.js')).to.equal( - fixture('controller-test/default-nested.js') + fixture('controller-test/nested.js') ); }); }); @@ -108,7 +99,7 @@ describe('Blueprint: controller', function () { expect(_file('app/pods/foo/controller.js')).to.equal(fixture('controller/controller.js')); expect(_file('tests/unit/pods/foo/controller-test.js')).to.equal( - fixture('controller-test/default.js') + fixture('controller-test/app.js') ); }); }); @@ -120,7 +111,7 @@ describe('Blueprint: controller', function () { expect(_file('app/pods/foo/controller.js')).to.equal(fixture('controller/controller.js')); expect(_file('tests/unit/pods/foo/controller-test.js')).to.equal( - fixture('controller-test/default.js') + fixture('controller-test/app.js') ); }); }); @@ -132,7 +123,7 @@ describe('Blueprint: controller', function () { ); expect(_file('tests/unit/pods/foo/bar/controller-test.js')).to.equal( - fixture('controller-test/default-nested.js') + fixture('controller-test/nested.js') ); }); }); @@ -141,14 +132,7 @@ describe('Blueprint: controller', function () { describe('in addon', function () { beforeEach(function () { - return emberNew({ target: 'addon' }) - .then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]) - ) - .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0')); + return emberNew({ target: 'addon' }); }); it('controller foo', function () { @@ -160,7 +144,7 @@ describe('Blueprint: controller', function () { ); expect(_file('tests/unit/controllers/foo-test.js')).to.equal( - fixture('controller-test/default.js') + fixture('controller-test/addon.js') ); }); }); @@ -178,7 +162,7 @@ describe('Blueprint: controller', function () { ); expect(_file('tests/unit/controllers/foo-test.js')).to.equal( - fixture('controller-test/default.js') + fixture('controller-test/addon.js') ); }); }); @@ -194,7 +178,7 @@ describe('Blueprint: controller', function () { ); expect(_file('tests/unit/controllers/foo/bar-test.js')).to.equal( - fixture('controller-test/default-nested.js') + fixture('controller-test/addon-nested.js') ); }); }); @@ -240,14 +224,7 @@ describe('Blueprint: controller', function () { describe('in in-repo-addon', function () { beforeEach(function () { - return emberNew({ target: 'in-repo-addon' }) - .then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]) - ) - .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0')); + return emberNew({ target: 'in-repo-addon' }); }); it('controller foo --in-repo-addon=my-addon', function () { @@ -261,7 +238,7 @@ describe('Blueprint: controller', function () { ); expect(_file('tests/unit/controllers/foo-test.js')).to.equal( - fixture('controller-test/default.js') + fixture('controller-test/app.js') ); }); }); @@ -281,7 +258,7 @@ describe('Blueprint: controller', function () { ); expect(_file('tests/unit/controllers/foo-test.js')).to.equal( - fixture('controller-test/default.js') + fixture('controller-test/app.js') ); }); }); @@ -299,7 +276,7 @@ describe('Blueprint: controller', function () { ); expect(_file('tests/unit/controllers/foo/bar-test.js')).to.equal( - fixture('controller-test/default-nested.js') + fixture('controller-test/nested.js') ); } ); diff --git a/node-tests/blueprints/helper-test-test.js b/node-tests/blueprints/helper-test-test.js index 248078c3ad2..ba30efb6ac8 100644 --- a/node-tests/blueprints/helper-test-test.js +++ b/node-tests/blueprints/helper-test-test.js @@ -4,12 +4,10 @@ const blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers'); const setupTestHooks = blueprintHelpers.setupTestHooks; const emberNew = blueprintHelpers.emberNew; const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy; -const modifyPackages = blueprintHelpers.modifyPackages; const chai = require('ember-cli-blueprint-test-helpers/chai'); const expect = chai.expect; -const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest'); const fixture = require('../helpers/fixture'); describe('Blueprint: helper-test', function () { @@ -20,47 +18,19 @@ describe('Blueprint: helper-test', function () { return emberNew(); }); - describe('with ember-cli-qunit@4.1.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.1.0'); - }); - - it('helper-test foo/bar-baz', function () { - return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], (_file) => { - expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal( - fixture('helper-test/integration.js') - ); - }); - }); - - it('helper-test foo/bar-baz', function () { - return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], (_file) => { - expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal( - fixture('helper-test/integration.js') - ); - }); + it('helper-test foo', function () { + return emberGenerateDestroy(['helper-test', 'foo'], (_file) => { + expect(_file('tests/integration/helpers/foo-test.js')).to.equal( + fixture('helper-test/app.js') + ); }); }); - describe('with ember-cli-qunit@4.2.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.2.0'); - }); - - it('helper-test foo/bar-baz', function () { - return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], (_file) => { - expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal( - fixture('helper-test/rfc232.js') - ); - }); + it('helper-test foo/bar-baz', function () { + return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], (_file) => { + expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal( + fixture('helper-test/nested.js') + ); }); }); }); @@ -70,31 +40,19 @@ describe('Blueprint: helper-test', function () { return emberNew({ target: 'addon' }); }); - describe('with ember-cli-qunit@4.1.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.1.0'); - }); - - it('helper-test foo/bar-baz', function () { - return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], (_file) => { - expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal( - fixture('helper-test/integration.js') - ); - }); + it('helper-test foo', function () { + return emberGenerateDestroy(['helper-test', 'foo'], (_file) => { + expect(_file('tests/integration/helpers/foo-test.js')).to.equal( + fixture('helper-test/addon.js') + ); }); }); - describe('with ember-qunit (default)', function () { - it('helper-test foo', function () { - return emberGenerateDestroy(['helper-test', 'foo'], (_file) => { - expect(_file('tests/integration/helpers/foo-test.js')).to.equal( - fixture('helper-test/rfc232-addon.js') - ); - }); + it('helper-test foo/bar-baz', function () { + return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], (_file) => { + expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal( + fixture('helper-test/addon-nested.js') + ); }); }); }); diff --git a/node-tests/blueprints/helper-test.js b/node-tests/blueprints/helper-test.js index 165687c2827..5187828a36b 100644 --- a/node-tests/blueprints/helper-test.js +++ b/node-tests/blueprints/helper-test.js @@ -5,12 +5,10 @@ const setupTestHooks = blueprintHelpers.setupTestHooks; const emberNew = blueprintHelpers.emberNew; const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy; const setupPodConfig = blueprintHelpers.setupPodConfig; -const modifyPackages = blueprintHelpers.modifyPackages; const chai = require('ember-cli-blueprint-test-helpers/chai'); const expect = chai.expect; -const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest'); const fixture = require('../helpers/fixture'); describe('Blueprint: helper', function () { @@ -18,20 +16,14 @@ describe('Blueprint: helper', function () { describe('in app', function () { beforeEach(function () { - return emberNew().then(() => { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.1.0'); - }); + return emberNew(); }); it('helper foo/bar-baz', function () { return emberGenerateDestroy(['helper', 'foo/bar-baz'], (_file) => { expect(_file('app/helpers/foo/bar-baz.js')).to.equal(fixture('helper/helper.js')); expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal( - fixture('helper-test/integration.js') + fixture('helper-test/nested.js') ); }); }); @@ -43,7 +35,7 @@ describe('Blueprint: helper', function () { expect(_file('app/helpers/foo/bar-baz.js')).to.equal(fixture('helper/helper.js')); expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal( - fixture('helper-test/integration.js') + fixture('helper-test/nested.js') ); }); }); @@ -52,7 +44,7 @@ describe('Blueprint: helper', function () { return emberGenerateDestroy(['helper', 'foo/bar-baz', '--pod'], (_file) => { expect(_file('app/helpers/foo/bar-baz.js')).to.equal(fixture('helper/helper.js')); expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal( - fixture('helper-test/integration.js') + fixture('helper-test/nested.js') ); }); }); @@ -64,7 +56,7 @@ describe('Blueprint: helper', function () { expect(_file('app/helpers/foo/bar-baz.js')).to.equal(fixture('helper/helper.js')); expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal( - fixture('helper-test/integration.js') + fixture('helper-test/nested.js') ); }); }); @@ -78,7 +70,7 @@ describe('Blueprint: helper', function () { return emberGenerateDestroy(['helper', 'foo/bar-baz', '--pod'], (_file) => { expect(_file('app/helpers/foo/bar-baz.js')).to.equal(fixture('helper/helper.js')); expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal( - fixture('helper-test/integration.js') + fixture('helper-test/nested.js') ); }); }); @@ -90,7 +82,7 @@ describe('Blueprint: helper', function () { expect(_file('app/helpers/foo/bar-baz.js')).to.equal(fixture('helper/helper.js')); expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal( - fixture('helper-test/integration.js') + fixture('helper-test/nested.js') ); }); }); @@ -99,13 +91,7 @@ describe('Blueprint: helper', function () { describe('in addon', function () { beforeEach(function () { - return emberNew({ target: 'addon' }).then(() => { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.1.0'); - }); + return emberNew({ target: 'addon' }); }); it('helper foo/bar-baz', function () { @@ -113,7 +99,7 @@ describe('Blueprint: helper', function () { expect(_file('addon/helpers/foo/bar-baz.js')).to.equal(fixture('helper/helper.js')); expect(_file('app/helpers/foo/bar-baz.js')).to.equal(fixture('helper/helper-addon.js')); expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal( - fixture('helper-test/integration.js') + fixture('helper-test/addon-nested.js') ); }); }); @@ -127,7 +113,7 @@ describe('Blueprint: helper', function () { expect(_file('addon/helpers/foo/bar-baz.js')).to.equal(fixture('helper/helper.js')); expect(_file('app/helpers/foo/bar-baz.js')).to.equal(fixture('helper/helper-addon.js')); expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal( - fixture('helper-test/integration.js') + fixture('helper-test/addon-nested.js') ); }); }); @@ -157,13 +143,7 @@ describe('Blueprint: helper', function () { describe('in in-repo-addon', function () { beforeEach(function () { - return emberNew({ target: 'in-repo-addon' }).then(() => { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.1.0'); - }); + return emberNew({ target: 'in-repo-addon' }); }); it('helper foo/bar-baz --in-repo-addon=my-addon', function () { @@ -177,7 +157,7 @@ describe('Blueprint: helper', function () { fixture('helper/helper-addon.js') ); expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal( - fixture('helper-test/integration.js') + fixture('helper-test/nested.js') ); } ); @@ -198,7 +178,7 @@ describe('Blueprint: helper', function () { fixture('helper/helper-addon.js') ); expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal( - fixture('helper-test/integration.js') + fixture('helper-test/nested.js') ); } ); diff --git a/node-tests/blueprints/initializer-test-test.js b/node-tests/blueprints/initializer-test-test.js index 76baf54f09f..e074a21a9d7 100644 --- a/node-tests/blueprints/initializer-test-test.js +++ b/node-tests/blueprints/initializer-test-test.js @@ -4,12 +4,10 @@ const blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers'); const setupTestHooks = blueprintHelpers.setupTestHooks; const emberNew = blueprintHelpers.emberNew; const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy; -const modifyPackages = blueprintHelpers.modifyPackages; const chai = require('ember-cli-blueprint-test-helpers/chai'); const expect = chai.expect; -const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest'); const fixture = require('../helpers/fixture'); describe('Blueprint: initializer-test', function () { @@ -20,39 +18,11 @@ describe('Blueprint: initializer-test', function () { return emberNew(); }); - describe('with ember-cli-qunit@4.1.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.1.0'); - }); - - it('initializer-test foo', function () { - return emberGenerateDestroy(['initializer-test', 'foo'], (_file) => { - expect(_file('tests/unit/initializers/foo-test.js')).to.equal( - fixture('initializer-test/default.js') - ); - }); - }); - }); - - describe('with ember-cli-qunit@4.2.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.2.0'); - }); - - it('initializer-test foo', function () { - return emberGenerateDestroy(['initializer-test', 'foo'], (_file) => { - expect(_file('tests/unit/initializers/foo-test.js')).to.equal( - fixture('initializer-test/rfc232.js') - ); - }); + it('initializer-test foo', function () { + return emberGenerateDestroy(['initializer-test', 'foo'], (_file) => { + expect(_file('tests/unit/initializers/foo-test.js')).to.equal( + fixture('initializer-test/app.js') + ); }); }); }); @@ -62,21 +32,11 @@ describe('Blueprint: initializer-test', function () { return emberNew({ target: 'addon' }); }); - describe('with ember-cli-qunit@4.1.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.1.0'); - }); - - it('initializer-test foo', function () { - return emberGenerateDestroy(['initializer-test', 'foo'], (_file) => { - expect(_file('tests/unit/initializers/foo-test.js')).to.equal( - fixture('initializer-test/dummy.js') - ); - }); + it('initializer-test foo', function () { + return emberGenerateDestroy(['initializer-test', 'foo'], (_file) => { + expect(_file('tests/unit/initializers/foo-test.js')).to.equal( + fixture('initializer-test/addon.js') + ); }); }); }); diff --git a/node-tests/blueprints/initializer-test.js b/node-tests/blueprints/initializer-test.js index 29b4337e14b..48154bdd436 100644 --- a/node-tests/blueprints/initializer-test.js +++ b/node-tests/blueprints/initializer-test.js @@ -5,12 +5,10 @@ const setupTestHooks = blueprintHelpers.setupTestHooks; const emberNew = blueprintHelpers.emberNew; const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy; const setupPodConfig = blueprintHelpers.setupPodConfig; -const modifyPackages = blueprintHelpers.modifyPackages; const chai = require('ember-cli-blueprint-test-helpers/chai'); const expect = chai.expect; -const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest'); const fixture = require('../helpers/fixture'); describe('Blueprint: initializer', function () { @@ -18,14 +16,7 @@ describe('Blueprint: initializer', function () { describe('in app', function () { beforeEach(function () { - return emberNew() - .then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]) - ) - .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0')); + return emberNew(); }); it('initializer foo', function () { @@ -87,14 +78,7 @@ describe('Blueprint: initializer', function () { describe('in addon', function () { beforeEach(function () { - return emberNew({ target: 'addon' }) - .then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]) - ) - .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0')); + return emberNew({ target: 'addon' }); }); it('initializer foo', function () { @@ -150,14 +134,7 @@ describe('Blueprint: initializer', function () { describe('in in-repo-addon', function () { beforeEach(function () { - return emberNew({ target: 'in-repo-addon' }) - .then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]) - ) - .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0')); + return emberNew({ target: 'in-repo-addon' }); }); it('initializer foo --in-repo-addon=my-addon', function () { diff --git a/node-tests/blueprints/instance-initializer-test-test.js b/node-tests/blueprints/instance-initializer-test-test.js index d9c3ae641a6..1e82ce2ab50 100644 --- a/node-tests/blueprints/instance-initializer-test-test.js +++ b/node-tests/blueprints/instance-initializer-test-test.js @@ -4,12 +4,10 @@ const blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers'); const setupTestHooks = blueprintHelpers.setupTestHooks; const emberNew = blueprintHelpers.emberNew; const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy; -const modifyPackages = blueprintHelpers.modifyPackages; const chai = require('ember-cli-blueprint-test-helpers/chai'); const expect = chai.expect; -const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest'); const fixture = require('../helpers/fixture'); describe('Blueprint: instance-initializer-test', function () { @@ -20,39 +18,11 @@ describe('Blueprint: instance-initializer-test', function () { return emberNew(); }); - describe('with ember-cli-qunit@4.1.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.1.0'); - }); - - it('instance-initializer-test foo', function () { - return emberGenerateDestroy(['instance-initializer-test', 'foo'], (_file) => { - expect(_file('tests/unit/instance-initializers/foo-test.js')).to.equal( - fixture('instance-initializer-test/default.js') - ); - }); - }); - }); - - describe('with ember-cli-qunit@4.2.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.2.0'); - }); - - it('instance-initializer-test foo', function () { - return emberGenerateDestroy(['instance-initializer-test', 'foo'], (_file) => { - expect(_file('tests/unit/instance-initializers/foo-test.js')).to.equal( - fixture('instance-initializer-test/rfc232.js') - ); - }); + it('instance-initializer-test foo', function () { + return emberGenerateDestroy(['instance-initializer-test', 'foo'], (_file) => { + expect(_file('tests/unit/instance-initializers/foo-test.js')).to.equal( + fixture('instance-initializer-test/app.js') + ); }); }); }); @@ -62,21 +32,11 @@ describe('Blueprint: instance-initializer-test', function () { return emberNew({ target: 'addon' }); }); - describe('with ember-cli-qunit@4.1.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.1.0'); - }); - - it('instance-initializer-test foo', function () { - return emberGenerateDestroy(['instance-initializer-test', 'foo'], (_file) => { - expect(_file('tests/unit/instance-initializers/foo-test.js')).to.equal( - fixture('instance-initializer-test/dummy.js') - ); - }); + it('instance-initializer-test foo', function () { + return emberGenerateDestroy(['instance-initializer-test', 'foo'], (_file) => { + expect(_file('tests/unit/instance-initializers/foo-test.js')).to.equal( + fixture('instance-initializer-test/addon.js') + ); }); }); }); diff --git a/node-tests/blueprints/instance-initializer-test.js b/node-tests/blueprints/instance-initializer-test.js index 7783a5ddee3..9f61c09b969 100644 --- a/node-tests/blueprints/instance-initializer-test.js +++ b/node-tests/blueprints/instance-initializer-test.js @@ -5,12 +5,10 @@ const setupTestHooks = blueprintHelpers.setupTestHooks; const emberNew = blueprintHelpers.emberNew; const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy; const setupPodConfig = blueprintHelpers.setupPodConfig; -const modifyPackages = blueprintHelpers.modifyPackages; const chai = require('ember-cli-blueprint-test-helpers/chai'); const expect = chai.expect; -const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest'); const fixture = require('../helpers/fixture'); describe('Blueprint: instance-initializer', function () { @@ -18,14 +16,7 @@ describe('Blueprint: instance-initializer', function () { describe('in app', function () { beforeEach(function () { - return emberNew() - .then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]) - ) - .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0')); + return emberNew(); }); it('instance-initializer foo', function () { @@ -93,14 +84,7 @@ describe('Blueprint: instance-initializer', function () { describe('in addon', function () { beforeEach(function () { - return emberNew({ target: 'addon' }) - .then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]) - ) - .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0')); + return emberNew({ target: 'addon' }); }); it('instance-initializer foo', function () { @@ -158,14 +142,7 @@ describe('Blueprint: instance-initializer', function () { describe('in in-repo-addon', function () { beforeEach(function () { - return emberNew({ target: 'in-repo-addon' }) - .then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]) - ) - .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0')); + return emberNew({ target: 'in-repo-addon' }); }); it('instance-initializer foo --in-repo-addon=my-addon', function () { diff --git a/node-tests/blueprints/mixin-test-test.js b/node-tests/blueprints/mixin-test-test.js index 7028ea61deb..d5c34984f04 100644 --- a/node-tests/blueprints/mixin-test-test.js +++ b/node-tests/blueprints/mixin-test-test.js @@ -4,12 +4,10 @@ const blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers'); const setupTestHooks = blueprintHelpers.setupTestHooks; const emberNew = blueprintHelpers.emberNew; const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy; -const modifyPackages = blueprintHelpers.modifyPackages; const chai = require('ember-cli-blueprint-test-helpers/chai'); const expect = chai.expect; -const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest'); const fixture = require('../helpers/fixture'); describe('Blueprint: mixin-test', function () { @@ -20,47 +18,16 @@ describe('Blueprint: mixin-test', function () { return emberNew(); }); - describe('with ember-cli-qunit@4.1.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.1.0'); - }); - - it('mixin-test foo', function () { - return emberGenerateDestroy(['mixin-test', 'foo'], (_file) => { - expect(_file('tests/unit/mixins/foo-test.js')).to.equal(fixture('mixin-test/default.js')); - }); - }); - }); - - describe('with ember-cli-qunit@4.2.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.2.0'); - }); - - it('mixin-test foo', function () { - return emberGenerateDestroy(['mixin-test', 'foo'], (_file) => { - expect(_file('tests/unit/mixins/foo-test.js')).to.equal(fixture('mixin-test/rfc232.js')); - }); + it('mixin-test foo', function () { + return emberGenerateDestroy(['mixin-test', 'foo'], (_file) => { + expect(_file('tests/unit/mixins/foo-test.js')).to.equal(fixture('mixin-test/app.js')); }); }); }); describe('in addon', function () { beforeEach(function () { - return emberNew({ target: 'addon' }).then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]) - ); + return emberNew({ target: 'addon' }); }); it('mixin-test foo', function () { @@ -72,12 +39,7 @@ describe('Blueprint: mixin-test', function () { describe('in in-repo-addon', function () { beforeEach(function () { - return emberNew({ target: 'in-repo-addon' }).then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]) - ); + return emberNew({ target: 'in-repo-addon' }); }); it('mixin-test foo --in-repo-addon=my-addon', function () { diff --git a/node-tests/blueprints/route-test-test.js b/node-tests/blueprints/route-test-test.js index 649c3846f36..1985e035918 100644 --- a/node-tests/blueprints/route-test-test.js +++ b/node-tests/blueprints/route-test-test.js @@ -4,12 +4,10 @@ const blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers'); const setupTestHooks = blueprintHelpers.setupTestHooks; const emberNew = blueprintHelpers.emberNew; const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy; -const modifyPackages = blueprintHelpers.modifyPackages; const chai = require('ember-cli-blueprint-test-helpers/chai'); const expect = chai.expect; -const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest'); const fixture = require('../helpers/fixture'); describe('Blueprint: route-test', function () { @@ -20,35 +18,9 @@ describe('Blueprint: route-test', function () { return emberNew(); }); - describe('with ember-cli-qunit@4.1.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.1.0'); - }); - - it('route-test foo', function () { - return emberGenerateDestroy(['route-test', 'foo'], (_file) => { - expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/default.js')); - }); - }); - }); - - describe('with ember-cli-qunit@4.2.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.2.0'); - }); - - it('route-test foo', function () { - return emberGenerateDestroy(['route-test', 'foo'], (_file) => { - expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/rfc232.js')); - }); + it('route-test foo', function () { + return emberGenerateDestroy(['route-test', 'foo'], (_file) => { + expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/app.js')); }); }); }); @@ -58,29 +30,9 @@ describe('Blueprint: route-test', function () { return emberNew({ target: 'addon' }); }); - describe('with ember-cli-qunit@4.1.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.1.0'); - }); - - it('route-test foo', function () { - return emberGenerateDestroy(['route-test', 'foo'], (_file) => { - expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/default.js')); - }); - }); - }); - - describe('with ember-qunit (default)', function () { - it('route-test foo', function () { - return emberGenerateDestroy(['route-test', 'foo'], (_file) => { - expect(_file('tests/unit/routes/foo-test.js')).to.equal( - fixture('route-test/rfc232-addon.js') - ); - }); + it('route-test foo', function () { + return emberGenerateDestroy(['route-test', 'foo'], (_file) => { + expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/addon.js')); }); }); }); diff --git a/node-tests/blueprints/route-test.js b/node-tests/blueprints/route-test.js index c8b0517c8e9..7c7b521f291 100644 --- a/node-tests/blueprints/route-test.js +++ b/node-tests/blueprints/route-test.js @@ -14,7 +14,6 @@ const expect = chai.expect; const file = chai.file; const fs = require('fs-extra'); -const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest'); const fixture = require('../helpers/fixture'); describe('Blueprint: route', function () { @@ -22,15 +21,7 @@ describe('Blueprint: route', function () { describe('in app', function () { beforeEach(function () { - return emberNew() - .then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - { name: 'ember-page-title', dev: true }, - ]) - ) - .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0')); + return emberNew(); }); it('route foo', function () { @@ -39,7 +30,7 @@ describe('Blueprint: route', function () { expect(_file('app/templates/foo.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}'); - expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/default.js')); + expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/app.js')); expect(file('app/router.js')).to.contain("this.route('foo')"); }).then(() => { @@ -57,7 +48,7 @@ describe('Blueprint: route', function () { expect(_file('app/templates/foo.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}'); - expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/default.js')); + expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/app.js')); expect(file('app/router.js')).to.contain("this.route('foo')"); expect(file('app/router.js')).to.not.contain("this.route('foo.js')"); @@ -83,7 +74,7 @@ describe('Blueprint: route', function () { expect(_file('app/templates/foo.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}'); - expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/default.js')); + expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/app.js')); expect(file('app/router.js')) .to.contain("this.route('foo', {") @@ -102,9 +93,7 @@ describe('Blueprint: route', function () { expect(_file('app/templates/child.hbs')).to.equal('{{page-title "Child"}}\n{{outlet}}'); - expect(_file('tests/unit/routes/child-test.js')).to.equal( - fixture('route-test/default-child.js') - ); + expect(_file('tests/unit/routes/child-test.js')).to.equal(fixture('route-test/child.js')); expect(file('app/router.js')) .to.contain("this.route('parent', {") @@ -122,9 +111,7 @@ describe('Blueprint: route', function () { expect(_file('app/child/template.hbs')).to.equal('{{page-title "Child"}}\n{{outlet}}'); - expect(_file('tests/unit/child/route-test.js')).to.equal( - fixture('route-test/default-child.js') - ); + expect(_file('tests/unit/child/route-test.js')).to.equal(fixture('route-test/child.js')); expect(file('app/router.js')) .to.contain("this.route('parent', {") @@ -172,7 +159,7 @@ describe('Blueprint: route', function () { expect(_file('app/foo/template.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}'); - expect(_file('tests/unit/foo/route-test.js')).to.equal(fixture('route-test/default.js')); + expect(_file('tests/unit/foo/route-test.js')).to.equal(fixture('route-test/app.js')); expect(file('app/router.js')).to.contain("this.route('foo')"); }).then(() => { @@ -190,7 +177,7 @@ describe('Blueprint: route', function () { expect(_file('app/foo/template.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}'); - expect(_file('tests/unit/foo/route-test.js')).to.equal(fixture('route-test/default.js')); + expect(_file('tests/unit/foo/route-test.js')).to.equal(fixture('route-test/app.js')); expect(file('app/router.js')).to.contain("this.route('foo')"); expect(file('app/router.js')).to.not.contain("this.route('foo.js')"); @@ -247,9 +234,7 @@ describe('Blueprint: route', function () { expect(_file('app/pods/foo/template.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}'); - expect(_file('tests/unit/pods/foo/route-test.js')).to.equal( - fixture('route-test/default.js') - ); + expect(_file('tests/unit/pods/foo/route-test.js')).to.equal(fixture('route-test/app.js')); expect(file('app/router.js')).to.contain("this.route('foo')"); }).then(() => { @@ -267,9 +252,7 @@ describe('Blueprint: route', function () { expect(_file('app/pods/foo/template.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}'); - expect(_file('tests/unit/pods/foo/route-test.js')).to.equal( - fixture('route-test/default.js') - ); + expect(_file('tests/unit/pods/foo/route-test.js')).to.equal(fixture('route-test/app.js')); expect(file('app/router.js')).to.contain("this.route('foo')"); expect(file('app/router.js')).to.not.contain("this.route('foo.js')"); @@ -326,15 +309,7 @@ describe('Blueprint: route', function () { describe('in addon', function () { beforeEach(function () { - return emberNew({ target: 'addon' }) - .then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - { name: 'ember-page-title', dev: true }, - ]) - ) - .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0')); + return emberNew({ target: 'addon' }); }); it('route foo', function () { @@ -351,7 +326,7 @@ describe('Blueprint: route', function () { "export { default } from 'my-addon/templates/foo';" ); - expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/default.js')); + expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/addon.js')); expect(file('tests/dummy/app/router.js')).to.not.contain("this.route('foo')"); }).then(() => { @@ -379,7 +354,7 @@ describe('Blueprint: route', function () { "export { default } from 'my-addon/templates/foo';" ); - expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/default.js')); + expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/addon.js')); expect(file('tests/dummy/app/router.js')).to.not.contain("this.route('foo')"); expect(file('tests/dummy/app/router.js')).to.not.contain("this.route('foo.js')"); @@ -403,7 +378,7 @@ describe('Blueprint: route', function () { ); expect(_file('tests/unit/routes/foo/bar-test.js')).to.equal( - fixture('route-test/default-nested.js') + fixture('route-test/addon-nested.js') ); expect(file('tests/dummy/app/router.js')).to.not.contain("this.route('bar')"); @@ -488,7 +463,7 @@ describe('Blueprint: route', function () { "export { default } from 'my-addon/foo/template';" ); - expect(_file('tests/unit/foo/route-test.js')).to.equal(fixture('route-test/default.js')); + expect(_file('tests/unit/foo/route-test.js')).to.equal(fixture('route-test/addon.js')); }); }); @@ -512,7 +487,7 @@ describe('Blueprint: route', function () { "export { default } from 'my-addon/foo/template';" ); - expect(_file('tests/unit/foo/route-test.js')).to.equal(fixture('route-test/default.js')); + expect(_file('tests/unit/foo/route-test.js')).to.equal(fixture('route-test/addon.js')); }); }); @@ -563,15 +538,7 @@ describe('Blueprint: route', function () { describe('in in-repo-addon', function () { beforeEach(function () { - return emberNew({ target: 'in-repo-addon' }) - .then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - { name: 'ember-page-title', dev: true }, - ]) - ) - .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0')); + return emberNew({ target: 'in-repo-addon' }); }); it('route foo --in-repo-addon=my-addon', function () { @@ -590,7 +557,7 @@ describe('Blueprint: route', function () { "export { default } from 'my-addon/templates/foo';" ); - expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/default.js')); + expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/app.js')); }); }); @@ -616,7 +583,7 @@ describe('Blueprint: route', function () { "export { default } from 'my-addon/templates/foo';" ); - expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/default.js')); + expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/app.js')); }); }); @@ -639,7 +606,7 @@ describe('Blueprint: route', function () { ); expect(_file('tests/unit/routes/foo/bar-test.js')).to.equal( - fixture('route-test/default-nested.js') + fixture('route-test/nested.js') ); }); }); diff --git a/node-tests/blueprints/service-test-test.js b/node-tests/blueprints/service-test-test.js index 410d4931231..29c7fdb6d8b 100644 --- a/node-tests/blueprints/service-test-test.js +++ b/node-tests/blueprints/service-test-test.js @@ -4,12 +4,10 @@ const blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers'); const setupTestHooks = blueprintHelpers.setupTestHooks; const emberNew = blueprintHelpers.emberNew; const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy; -const modifyPackages = blueprintHelpers.modifyPackages; const chai = require('ember-cli-blueprint-test-helpers/chai'); const expect = chai.expect; -const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest'); const fixture = require('../helpers/fixture'); describe('Blueprint: service-test', function () { @@ -20,39 +18,9 @@ describe('Blueprint: service-test', function () { return emberNew(); }); - describe('with ember-cli-qunit@4.1.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.1.0'); - }); - - it('service-test foo', function () { - return emberGenerateDestroy(['service-test', 'foo'], (_file) => { - expect(_file('tests/unit/services/foo-test.js')).to.equal( - fixture('service-test/default.js') - ); - }); - }); - }); - - describe('with ember-cli-qunit@4.2.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.2.0'); - }); - - it('service-test foo', function () { - return emberGenerateDestroy(['service-test', 'foo'], (_file) => { - expect(_file('tests/unit/services/foo-test.js')).to.equal( - fixture('service-test/rfc232.js') - ); - }); + it('service-test foo', function () { + return emberGenerateDestroy(['service-test', 'foo'], (_file) => { + expect(_file('tests/unit/services/foo-test.js')).to.equal(fixture('service-test/app.js')); }); }); }); @@ -62,33 +30,9 @@ describe('Blueprint: service-test', function () { return emberNew({ target: 'addon' }); }); - describe('with ember-cli-qunit@4.1.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.1.0'); - }); - - it('service-test foo', function () { - return emberGenerateDestroy(['service-test', 'foo'], (_file) => { - expect(_file('tests/unit/services/foo-test.js')).to.equal( - fixture('service-test/default.js') - ); - - expect(_file('app/service-test/foo.js')).to.not.exist; - }); - }); - }); - - describe('with ember-qunit (default)', function () { - it('service-test foo', function () { - return emberGenerateDestroy(['service-test', 'foo'], (_file) => { - expect(_file('tests/unit/services/foo-test.js')).to.equal( - fixture('service-test/rfc232-addon.js') - ); - }); + it('service-test foo', function () { + return emberGenerateDestroy(['service-test', 'foo'], (_file) => { + expect(_file('tests/unit/services/foo-test.js')).to.equal(fixture('service-test/addon.js')); }); }); }); diff --git a/node-tests/blueprints/service-test.js b/node-tests/blueprints/service-test.js index dfb5896b01e..79e225af6d5 100644 --- a/node-tests/blueprints/service-test.js +++ b/node-tests/blueprints/service-test.js @@ -5,12 +5,10 @@ const setupTestHooks = blueprintHelpers.setupTestHooks; const emberNew = blueprintHelpers.emberNew; const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy; const setupPodConfig = blueprintHelpers.setupPodConfig; -const modifyPackages = blueprintHelpers.modifyPackages; const chai = require('ember-cli-blueprint-test-helpers/chai'); const expect = chai.expect; -const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest'); const fixture = require('../helpers/fixture'); describe('Blueprint: service', function () { @@ -18,23 +16,14 @@ describe('Blueprint: service', function () { describe('in app', function () { beforeEach(function () { - return emberNew() - .then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]) - ) - .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0')); + return emberNew(); }); it('service foo', function () { return emberGenerateDestroy(['service', 'foo'], (_file) => { expect(_file('app/services/foo.js')).to.equal(fixture('service/service.js')); - expect(_file('tests/unit/services/foo-test.js')).to.equal( - fixture('service-test/default.js') - ); + expect(_file('tests/unit/services/foo-test.js')).to.equal(fixture('service-test/app.js')); }); }); @@ -45,9 +34,7 @@ describe('Blueprint: service', function () { expect(_file('app/services/foo.js')).to.equal(fixture('service/service.js')); - expect(_file('tests/unit/services/foo-test.js')).to.equal( - fixture('service-test/default.js') - ); + expect(_file('tests/unit/services/foo-test.js')).to.equal(fixture('service-test/app.js')); }); }); @@ -56,7 +43,7 @@ describe('Blueprint: service', function () { expect(_file('app/services/foo/bar.js')).to.equal(fixture('service/service-nested.js')); expect(_file('tests/unit/services/foo/bar-test.js')).to.equal( - fixture('service-test/default-nested.js') + fixture('service-test/nested.js') ); }); }); @@ -65,9 +52,7 @@ describe('Blueprint: service', function () { return emberGenerateDestroy(['service', 'foo', '--pod'], (_file) => { expect(_file('app/foo/service.js')).to.equal(fixture('service/service.js')); - expect(_file('tests/unit/foo/service-test.js')).to.equal( - fixture('service-test/default.js') - ); + expect(_file('tests/unit/foo/service-test.js')).to.equal(fixture('service-test/app.js')); }); }); @@ -78,9 +63,7 @@ describe('Blueprint: service', function () { expect(_file('app/foo/service.js')).to.equal(fixture('service/service.js')); - expect(_file('tests/unit/foo/service-test.js')).to.equal( - fixture('service-test/default.js') - ); + expect(_file('tests/unit/foo/service-test.js')).to.equal(fixture('service-test/app.js')); }); }); @@ -89,7 +72,7 @@ describe('Blueprint: service', function () { expect(_file('app/foo/bar/service.js')).to.equal(fixture('service/service-nested.js')); expect(_file('tests/unit/foo/bar/service-test.js')).to.equal( - fixture('service-test/default-nested.js') + fixture('service-test/nested.js') ); }); }); @@ -104,7 +87,7 @@ describe('Blueprint: service', function () { expect(_file('app/pods/foo/service.js')).to.equal(fixture('service/service.js')); expect(_file('tests/unit/pods/foo/service-test.js')).to.equal( - fixture('service-test/default.js') + fixture('service-test/app.js') ); }); }); @@ -117,7 +100,7 @@ describe('Blueprint: service', function () { expect(_file('app/pods/foo/service.js')).to.equal(fixture('service/service.js')); expect(_file('tests/unit/pods/foo/service-test.js')).to.equal( - fixture('service-test/default.js') + fixture('service-test/app.js') ); }); }); @@ -129,7 +112,7 @@ describe('Blueprint: service', function () { ); expect(_file('tests/unit/pods/foo/bar/service-test.js')).to.equal( - fixture('service-test/default-nested.js') + fixture('service-test/nested.js') ); }); }); @@ -138,14 +121,7 @@ describe('Blueprint: service', function () { describe('in addon', function () { beforeEach(function () { - return emberNew({ target: 'addon' }) - .then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]) - ) - .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0')); + return emberNew({ target: 'addon' }); }); it('service foo', function () { @@ -156,9 +132,7 @@ describe('Blueprint: service', function () { "export { default } from 'my-addon/services/foo';" ); - expect(_file('tests/unit/services/foo-test.js')).to.equal( - fixture('service-test/default.js') - ); + expect(_file('tests/unit/services/foo-test.js')).to.equal(fixture('service-test/addon.js')); }); }); @@ -174,9 +148,7 @@ describe('Blueprint: service', function () { "export { default } from 'my-addon/services/foo';" ); - expect(_file('tests/unit/services/foo-test.js')).to.equal( - fixture('service-test/default.js') - ); + expect(_file('tests/unit/services/foo-test.js')).to.equal(fixture('service-test/addon.js')); }); }); @@ -189,7 +161,7 @@ describe('Blueprint: service', function () { ); expect(_file('tests/unit/services/foo/bar-test.js')).to.equal( - fixture('service-test/default-nested.js') + fixture('service-test/addon-nested.js') ); }); }); @@ -217,14 +189,7 @@ describe('Blueprint: service', function () { describe('in in-repo-addon', function () { beforeEach(function () { - return emberNew({ target: 'in-repo-addon' }) - .then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]) - ) - .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0')); + return emberNew({ target: 'in-repo-addon' }); }); it('service foo --in-repo-addon=my-addon', function () { @@ -235,9 +200,7 @@ describe('Blueprint: service', function () { "export { default } from 'my-addon/services/foo';" ); - expect(_file('tests/unit/services/foo-test.js')).to.equal( - fixture('service-test/default.js') - ); + expect(_file('tests/unit/services/foo-test.js')).to.equal(fixture('service-test/app.js')); }); }); @@ -253,9 +216,7 @@ describe('Blueprint: service', function () { "export { default } from 'my-addon/services/foo';" ); - expect(_file('tests/unit/services/foo-test.js')).to.equal( - fixture('service-test/default.js') - ); + expect(_file('tests/unit/services/foo-test.js')).to.equal(fixture('service-test/app.js')); }); }); @@ -270,7 +231,7 @@ describe('Blueprint: service', function () { ); expect(_file('tests/unit/services/foo/bar-test.js')).to.equal( - fixture('service-test/default-nested.js') + fixture('service-test/nested.js') ); }); }); diff --git a/node-tests/blueprints/util-test-test.js b/node-tests/blueprints/util-test-test.js index 6a3fd5a6d82..4135e235315 100644 --- a/node-tests/blueprints/util-test-test.js +++ b/node-tests/blueprints/util-test-test.js @@ -4,12 +4,10 @@ const blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers'); const setupTestHooks = blueprintHelpers.setupTestHooks; const emberNew = blueprintHelpers.emberNew; const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy; -const modifyPackages = blueprintHelpers.modifyPackages; const chai = require('ember-cli-blueprint-test-helpers/chai'); const expect = chai.expect; -const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest'); const fixture = require('../helpers/fixture'); describe('Blueprint: util-test', function () { @@ -20,39 +18,9 @@ describe('Blueprint: util-test', function () { return emberNew(); }); - describe('with ember-cli-qunit@4.1.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.1.0'); - }); - - it('util-test foo-bar', function () { - return emberGenerateDestroy(['util-test', 'foo-bar'], (_file) => { - expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal( - fixture('util-test/default.js') - ); - }); - }); - }); - - describe('with ember-cli-qunit@4.2.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.2.0'); - }); - - it('util-test foo-bar', function () { - return emberGenerateDestroy(['util-test', 'foo-bar'], (_file) => { - expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal( - fixture('util-test/rfc232.js') - ); - }); + it('util-test foo-bar', function () { + return emberGenerateDestroy(['util-test', 'foo-bar'], (_file) => { + expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(fixture('util-test/app.js')); }); }); }); @@ -62,19 +30,9 @@ describe('Blueprint: util-test', function () { return emberNew({ target: 'addon' }); }); - describe('with ember-cli-qunit@4.1.0', function () { - beforeEach(function () { - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]); - generateFakePackageManifest('ember-cli-qunit', '4.1.0'); - }); - - it('util-test foo-bar', function () { - return emberGenerateDestroy(['util-test', 'foo-bar'], (_file) => { - expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(fixture('util-test/dummy.js')); - }); + it('util-test foo-bar', function () { + return emberGenerateDestroy(['util-test', 'foo-bar'], (_file) => { + expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(fixture('util-test/addon.js')); }); }); }); diff --git a/node-tests/blueprints/util-test.js b/node-tests/blueprints/util-test.js index cc9d9d91641..584a5760edc 100644 --- a/node-tests/blueprints/util-test.js +++ b/node-tests/blueprints/util-test.js @@ -5,12 +5,10 @@ const setupTestHooks = blueprintHelpers.setupTestHooks; const emberNew = blueprintHelpers.emberNew; const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy; const setupPodConfig = blueprintHelpers.setupPodConfig; -const modifyPackages = blueprintHelpers.modifyPackages; const chai = require('ember-cli-blueprint-test-helpers/chai'); const expect = chai.expect; -const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest'); const fixture = require('../helpers/fixture'); describe('Blueprint: util', function () { @@ -18,21 +16,14 @@ describe('Blueprint: util', function () { describe('in app', function () { beforeEach(function () { - return emberNew() - .then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]) - ) - .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0')); + return emberNew(); }); it('util foo-bar', function () { return emberGenerateDestroy(['util', 'foo-bar'], (_file) => { expect(_file('app/utils/foo-bar.js')).to.equal(fixture('util/util.js')); - expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(fixture('util-test/default.js')); + expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(fixture('util-test/app.js')); }); }); @@ -43,7 +34,7 @@ describe('Blueprint: util', function () { expect(_file('app/utils/foo-bar.js')).to.equal(fixture('util/util.js')); - expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(fixture('util-test/default.js')); + expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(fixture('util-test/app.js')); }); }); @@ -52,7 +43,7 @@ describe('Blueprint: util', function () { expect(_file('app/utils/foo/bar-baz.js')).to.equal(fixture('util/util-nested.js')); expect(_file('tests/unit/utils/foo/bar-baz-test.js')).to.equal( - fixture('util-test/default-nested.js') + fixture('util-test/nested.js') ); }); }); @@ -61,7 +52,7 @@ describe('Blueprint: util', function () { return emberGenerateDestroy(['util', 'foo-bar', '--pod'], (_file) => { expect(_file('app/utils/foo-bar.js')).to.equal(fixture('util/util.js')); - expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(fixture('util-test/default.js')); + expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(fixture('util-test/app.js')); }); }); @@ -72,7 +63,7 @@ describe('Blueprint: util', function () { expect(_file('app/utils/foo-bar.js')).to.equal(fixture('util/util.js')); - expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(fixture('util-test/default.js')); + expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(fixture('util-test/app.js')); }); }); @@ -81,7 +72,7 @@ describe('Blueprint: util', function () { expect(_file('app/utils/foo/bar-baz.js')).to.equal(fixture('util/util-nested.js')); expect(_file('tests/unit/utils/foo/bar-baz-test.js')).to.equal( - fixture('util-test/default-nested.js') + fixture('util-test/nested.js') ); }); }); @@ -95,9 +86,7 @@ describe('Blueprint: util', function () { return emberGenerateDestroy(['util', 'foo-bar', '--pod'], (_file) => { expect(_file('app/utils/foo-bar.js')).to.equal(fixture('util/util.js')); - expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal( - fixture('util-test/default.js') - ); + expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(fixture('util-test/app.js')); }); }); @@ -108,9 +97,7 @@ describe('Blueprint: util', function () { expect(_file('app/utils/foo-bar.js')).to.equal(fixture('util/util.js')); - expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal( - fixture('util-test/default.js') - ); + expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(fixture('util-test/app.js')); }); }); }); @@ -118,14 +105,7 @@ describe('Blueprint: util', function () { describe('in addon', function () { beforeEach(function () { - return emberNew({ target: 'addon' }) - .then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]) - ) - .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0')); + return emberNew({ target: 'addon' }); }); it('util foo-bar', function () { @@ -136,9 +116,7 @@ describe('Blueprint: util', function () { "export { default } from 'my-addon/utils/foo-bar';" ); - expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal( - fixture('util-test/addon-default.js') - ); + expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(fixture('util-test/addon.js')); }); }); @@ -154,9 +132,7 @@ describe('Blueprint: util', function () { "export { default } from 'my-addon/utils/foo-bar';" ); - expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal( - fixture('util-test/addon-default.js') - ); + expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(fixture('util-test/addon.js')); }); }); @@ -169,7 +145,7 @@ describe('Blueprint: util', function () { ); expect(_file('tests/unit/utils/foo/bar-baz-test.js')).to.equal( - fixture('util-test/addon-default-nested.js') + fixture('util-test/addon-nested.js') ); }); }); @@ -187,14 +163,7 @@ describe('Blueprint: util', function () { describe('in in-repo-addon', function () { beforeEach(function () { - return emberNew({ target: 'in-repo-addon' }) - .then(() => - modifyPackages([ - { name: 'ember-qunit', delete: true }, - { name: 'ember-cli-qunit', dev: true }, - ]) - ) - .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0')); + return emberNew({ target: 'in-repo-addon' }); }); it('util foo-bar --in-repo-addon=my-addon', function () { @@ -205,7 +174,7 @@ describe('Blueprint: util', function () { "export { default } from 'my-addon/utils/foo-bar';" ); - expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(fixture('util-test/default.js')); + expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(fixture('util-test/app.js')); }); }); @@ -221,7 +190,7 @@ describe('Blueprint: util', function () { "export { default } from 'my-addon/utils/foo-bar';" ); - expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(fixture('util-test/default.js')); + expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(fixture('util-test/app.js')); }); }); @@ -236,7 +205,7 @@ describe('Blueprint: util', function () { ); expect(_file('tests/unit/utils/foo/bar-baz-test.js')).to.equal( - fixture('util-test/default-nested.js') + fixture('util-test/nested.js') ); }); }); diff --git a/node-tests/fixtures/acceptance-test/addon-default.js b/node-tests/fixtures/acceptance-test/addon-default.js deleted file mode 100644 index 3ca96b784a0..00000000000 --- a/node-tests/fixtures/acceptance-test/addon-default.js +++ /dev/null @@ -1,12 +0,0 @@ -import { test } from 'qunit'; -import moduleForAcceptance from '../../tests/helpers/module-for-acceptance'; - -moduleForAcceptance('Acceptance | foo'); - -test('visiting /foo', function (assert) { - visit('/foo'); - - andThen(function () { - assert.strictEqual(currentURL(), '/foo'); - }); -}); diff --git a/node-tests/fixtures/acceptance-test/addon-nested.js b/node-tests/fixtures/acceptance-test/addon-nested.js deleted file mode 100644 index ccb4342836c..00000000000 --- a/node-tests/fixtures/acceptance-test/addon-nested.js +++ /dev/null @@ -1,12 +0,0 @@ -import { test } from 'qunit'; -import moduleForAcceptance from '../../../tests/helpers/module-for-acceptance'; - -moduleForAcceptance('Acceptance | foo/bar'); - -test('visiting /foo/bar', function (assert) { - visit('/foo/bar'); - - andThen(function () { - assert.strictEqual(currentURL(), '/foo/bar'); - }); -}); diff --git a/node-tests/fixtures/acceptance-test/qunit-rfc268-addon.js b/node-tests/fixtures/acceptance-test/addon.js similarity index 100% rename from node-tests/fixtures/acceptance-test/qunit-rfc268-addon.js rename to node-tests/fixtures/acceptance-test/addon.js diff --git a/node-tests/fixtures/acceptance-test/qunit-rfc268.js b/node-tests/fixtures/acceptance-test/app.js similarity index 100% rename from node-tests/fixtures/acceptance-test/qunit-rfc268.js rename to node-tests/fixtures/acceptance-test/app.js diff --git a/node-tests/fixtures/acceptance-test/default.js b/node-tests/fixtures/acceptance-test/default.js deleted file mode 100644 index 0662fdc1bc1..00000000000 --- a/node-tests/fixtures/acceptance-test/default.js +++ /dev/null @@ -1,12 +0,0 @@ -import { test } from 'qunit'; -import moduleForAcceptance from 'my-app/tests/helpers/module-for-acceptance'; - -moduleForAcceptance('Acceptance | foo'); - -test('visiting /foo', function (assert) { - visit('/foo'); - - andThen(function () { - assert.strictEqual(currentURL(), '/foo'); - }); -}); diff --git a/node-tests/fixtures/component-test/rfc232-unit-addon.js b/node-tests/fixtures/component-test/addon-unit.js similarity index 100% rename from node-tests/fixtures/component-test/rfc232-unit-addon.js rename to node-tests/fixtures/component-test/addon-unit.js diff --git a/node-tests/fixtures/component-test/rfc232-addon.js b/node-tests/fixtures/component-test/addon.js similarity index 74% rename from node-tests/fixtures/component-test/rfc232-addon.js rename to node-tests/fixtures/component-test/addon.js index ecb40dcf7bc..1ecaa3f24ec 100644 --- a/node-tests/fixtures/component-test/rfc232-addon.js +++ b/node-tests/fixtures/component-test/addon.js @@ -3,22 +3,22 @@ import { setupRenderingTest } from 'dummy/tests/helpers'; import { render } from '@ember/test-helpers'; import hbs from 'htmlbars-inline-precompile'; -module('Integration | Component | foo', function (hooks) { +module('Integration | Component | <%= component =%>', function (hooks) { setupRenderingTest(hooks); test('it renders', async function (assert) { // Set any properties with this.set('myProperty', 'value'); // Handle any actions with this.set('myAction', function(val) { ... }); - await render(hbs``); + await render(hbs`<<%= componentInvocation =%> />`); assert.dom().hasText(''); // Template block usage: await render(hbs` - + <<%= componentInvocation =%>> template block text - + > `); assert.dom().hasText('template block text'); diff --git a/node-tests/fixtures/component-test/rfc232.js b/node-tests/fixtures/component-test/app.js similarity index 74% rename from node-tests/fixtures/component-test/rfc232.js rename to node-tests/fixtures/component-test/app.js index 9dc61f120d6..597e1b7cb32 100644 --- a/node-tests/fixtures/component-test/rfc232.js +++ b/node-tests/fixtures/component-test/app.js @@ -3,22 +3,22 @@ import { setupRenderingTest } from 'my-app/tests/helpers'; import { render } from '@ember/test-helpers'; import hbs from 'htmlbars-inline-precompile'; -module('Integration | Component | x-foo', function (hooks) { +module('Integration | Component | <%= component =%>', function (hooks) { setupRenderingTest(hooks); test('it renders', async function (assert) { // Set any properties with this.set('myProperty', 'value'); // Handle any actions with this.set('myAction', function(val) { ... }); - await render(hbs``); + await render(hbs`<<%= componentInvocation =%> />`); assert.dom().hasText(''); // Template block usage: await render(hbs` - + <<%= componentInvocation =%>> template block text - + > `); assert.dom().hasText('template block text'); diff --git a/node-tests/fixtures/component-test/default-template.js b/node-tests/fixtures/component-test/default-template.js deleted file mode 100644 index caf12d3460a..00000000000 --- a/node-tests/fixtures/component-test/default-template.js +++ /dev/null @@ -1,24 +0,0 @@ -import { moduleForComponent, test } from 'ember-qunit'; -import hbs from 'htmlbars-inline-precompile'; - -moduleForComponent('<%= path =%><%= component =%>', 'Integration | Component | <%= component =%>', { - integration: true, -}); - -test('it renders', function (assert) { - // Set any properties with this.set('myProperty', 'value'); - // Handle any actions with this.on('myAction', function(val) { ... }); - - this.render(hbs`<<%= componentInvocation =%> />`); - - assert.strictEqual(this.$().text().trim(), ''); - - // Template block usage: - this.render(hbs` - <<%= componentInvocation =%>> - template block text - > - `); - - assert.strictEqual(this.$().text().trim(), 'template block text'); -}); diff --git a/node-tests/fixtures/component-test/default.js b/node-tests/fixtures/component-test/default.js deleted file mode 100644 index e3ac770ec05..00000000000 --- a/node-tests/fixtures/component-test/default.js +++ /dev/null @@ -1,24 +0,0 @@ -import { moduleForComponent, test } from 'ember-qunit'; -import hbs from 'htmlbars-inline-precompile'; - -moduleForComponent('x-foo', 'Integration | Component | x-foo', { - integration: true, -}); - -test('it renders', function (assert) { - // Set any properties with this.set('myProperty', 'value'); - // Handle any actions with this.on('myAction', function(val) { ... }); - - this.render(hbs``); - - assert.strictEqual(this.$().text().trim(), ''); - - // Template block usage: - this.render(hbs` - - template block text - - `); - - assert.strictEqual(this.$().text().trim(), 'template block text'); -}); diff --git a/node-tests/fixtures/component-test/unit.js b/node-tests/fixtures/component-test/unit.js index e0315a88335..404bf3f9409 100644 --- a/node-tests/fixtures/component-test/unit.js +++ b/node-tests/fixtures/component-test/unit.js @@ -1,15 +1,11 @@ -import { moduleForComponent, test } from 'ember-qunit'; +import { module, test } from 'qunit'; +import { setupTest } from 'my-app/tests/helpers'; -moduleForComponent('x-foo', 'Unit | Component | x-foo', { - // Specify the other units that are required for this test - // needs: ['component:foo', 'helper:bar'], - unit: true, -}); +module('Unit | Component | x-foo', function (hooks) { + setupTest(hooks); -test('it renders', function (assert) { - // Creates the component instance - /*let component =*/ this.subject(); - // Renders the component to the page - this.render(); - assert.strictEqual(this.$().text().trim(), ''); + test('it exists', function (assert) { + let component = this.owner.factoryFor('component:x-foo').create(); + assert.ok(component); + }); }); diff --git a/node-tests/fixtures/controller-test/addon-nested.js b/node-tests/fixtures/controller-test/addon-nested.js new file mode 100644 index 00000000000..6e59864e529 --- /dev/null +++ b/node-tests/fixtures/controller-test/addon-nested.js @@ -0,0 +1,12 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'dummy/tests/helpers'; + +module('Unit | Controller | foo/bar', function (hooks) { + setupTest(hooks); + + // TODO: Replace this with your real tests. + test('it exists', function (assert) { + let controller = this.owner.lookup('controller:foo/bar'); + assert.ok(controller); + }); +}); diff --git a/node-tests/fixtures/controller-test/rfc232-addon.js b/node-tests/fixtures/controller-test/addon.js similarity index 100% rename from node-tests/fixtures/controller-test/rfc232-addon.js rename to node-tests/fixtures/controller-test/addon.js diff --git a/node-tests/fixtures/controller-test/rfc232.js b/node-tests/fixtures/controller-test/app.js similarity index 100% rename from node-tests/fixtures/controller-test/rfc232.js rename to node-tests/fixtures/controller-test/app.js diff --git a/node-tests/fixtures/controller-test/default-nested.js b/node-tests/fixtures/controller-test/default-nested.js deleted file mode 100644 index d7ee67d9bf4..00000000000 --- a/node-tests/fixtures/controller-test/default-nested.js +++ /dev/null @@ -1,12 +0,0 @@ -import { moduleFor, test } from 'ember-qunit'; - -moduleFor('controller:foo/bar', 'Unit | Controller | foo/bar', { - // Specify the other units that are required for this test. - // needs: ['controller:foo'] -}); - -// TODO: Replace this with your real tests. -test('it exists', function (assert) { - let controller = this.subject(); - assert.ok(controller); -}); diff --git a/node-tests/fixtures/controller-test/default.js b/node-tests/fixtures/controller-test/default.js deleted file mode 100644 index ce293abaebd..00000000000 --- a/node-tests/fixtures/controller-test/default.js +++ /dev/null @@ -1,12 +0,0 @@ -import { moduleFor, test } from 'ember-qunit'; - -moduleFor('controller:foo', 'Unit | Controller | foo', { - // Specify the other units that are required for this test. - // needs: ['controller:foo'] -}); - -// TODO: Replace this with your real tests. -test('it exists', function (assert) { - let controller = this.subject(); - assert.ok(controller); -}); diff --git a/node-tests/fixtures/controller-test/rfc232-nested.js b/node-tests/fixtures/controller-test/nested.js similarity index 100% rename from node-tests/fixtures/controller-test/rfc232-nested.js rename to node-tests/fixtures/controller-test/nested.js diff --git a/node-tests/fixtures/helper-test/addon-nested.js b/node-tests/fixtures/helper-test/addon-nested.js new file mode 100644 index 00000000000..1681f0a14fb --- /dev/null +++ b/node-tests/fixtures/helper-test/addon-nested.js @@ -0,0 +1,17 @@ +import { module, test } from 'qunit'; +import { setupRenderingTest } from 'dummy/tests/helpers'; +import { render } from '@ember/test-helpers'; +import hbs from 'htmlbars-inline-precompile'; + +module('Integration | Helper | foo/bar-baz', function (hooks) { + setupRenderingTest(hooks); + + // TODO: Replace this with your real tests. + test('it renders', async function (assert) { + this.set('inputValue', '1234'); + + await render(hbs`{{foo/bar-baz this.inputValue}}`); + + assert.dom().hasText('1234'); + }); +}); diff --git a/node-tests/fixtures/helper-test/rfc232-addon.js b/node-tests/fixtures/helper-test/addon.js similarity index 100% rename from node-tests/fixtures/helper-test/rfc232-addon.js rename to node-tests/fixtures/helper-test/addon.js diff --git a/node-tests/fixtures/helper-test/app.js b/node-tests/fixtures/helper-test/app.js new file mode 100644 index 00000000000..041fd557bb4 --- /dev/null +++ b/node-tests/fixtures/helper-test/app.js @@ -0,0 +1,17 @@ +import { module, test } from 'qunit'; +import { setupRenderingTest } from 'my-app/tests/helpers'; +import { render } from '@ember/test-helpers'; +import hbs from 'htmlbars-inline-precompile'; + +module('Integration | Helper | foo', function (hooks) { + setupRenderingTest(hooks); + + // TODO: Replace this with your real tests. + test('it renders', async function (assert) { + this.set('inputValue', '1234'); + + await render(hbs`{{foo this.inputValue}}`); + + assert.dom().hasText('1234'); + }); +}); diff --git a/node-tests/fixtures/helper-test/integration.js b/node-tests/fixtures/helper-test/integration.js deleted file mode 100644 index 232b3af1558..00000000000 --- a/node-tests/fixtures/helper-test/integration.js +++ /dev/null @@ -1,15 +0,0 @@ -import { moduleForComponent, test } from 'ember-qunit'; -import hbs from 'htmlbars-inline-precompile'; - -moduleForComponent('foo/bar-baz', 'helper:foo/bar-baz', { - integration: true, -}); - -// TODO: Replace this with your real tests. -test('it renders', function (assert) { - this.set('inputValue', '1234'); - - this.render(hbs`{{foo/bar-baz this.inputValue}}`); - - assert.strictEqual(this.$().text().trim(), '1234'); -}); diff --git a/node-tests/fixtures/helper-test/rfc232.js b/node-tests/fixtures/helper-test/nested.js similarity index 100% rename from node-tests/fixtures/helper-test/rfc232.js rename to node-tests/fixtures/helper-test/nested.js diff --git a/node-tests/fixtures/initializer-test/addon.js b/node-tests/fixtures/initializer-test/addon.js new file mode 100644 index 00000000000..e7713a1cfd7 --- /dev/null +++ b/node-tests/fixtures/initializer-test/addon.js @@ -0,0 +1,37 @@ +import Application from '@ember/application'; + +import config from 'dummy/config/environment'; +import { initialize } from 'dummy/initializers/foo'; +import { module, test } from 'qunit'; +import Resolver from 'ember-resolver'; +import { run } from '@ember/runloop'; + +module('Unit | Initializer | foo', function (hooks) { + hooks.beforeEach(function () { + this.TestApplication = class TestApplication extends Application { + modulePrefix = config.modulePrefix; + podModulePrefix = config.podModulePrefix; + Resolver = Resolver; + }; + + this.TestApplication.initializer({ + name: 'initializer under test', + initialize, + }); + + this.application = this.TestApplication.create({ + autoboot: false, + }); + }); + + hooks.afterEach(function () { + run(this.application, 'destroy'); + }); + + // TODO: Replace this with your real tests. + test('it works', async function (assert) { + await this.application.boot(); + + assert.ok(true); + }); +}); diff --git a/node-tests/fixtures/initializer-test/rfc232.js b/node-tests/fixtures/initializer-test/app.js similarity index 100% rename from node-tests/fixtures/initializer-test/rfc232.js rename to node-tests/fixtures/initializer-test/app.js diff --git a/node-tests/fixtures/initializer-test/default.js b/node-tests/fixtures/initializer-test/default.js deleted file mode 100644 index 3cc5b0c3db0..00000000000 --- a/node-tests/fixtures/initializer-test/default.js +++ /dev/null @@ -1,25 +0,0 @@ -import Application from '@ember/application'; -import { run } from '@ember/runloop'; - -import { initialize } from 'my-app/initializers/foo'; -import { module, test } from 'qunit'; - -module('Unit | Initializer | foo', { - beforeEach() { - run(() => { - this.application = Application.create(); - this.application.deferReadiness(); - }); - }, - afterEach() { - run(this.application, 'destroy'); - }, -}); - -// TODO: Replace this with your real tests. -test('it works', function (assert) { - initialize(this.application); - - // you would normally confirm the results of the initializer here - assert.ok(true); -}); diff --git a/node-tests/fixtures/initializer-test/dummy.js b/node-tests/fixtures/initializer-test/dummy.js deleted file mode 100644 index 4ef19373903..00000000000 --- a/node-tests/fixtures/initializer-test/dummy.js +++ /dev/null @@ -1,25 +0,0 @@ -import Application from '@ember/application'; -import { run } from '@ember/runloop'; - -import { initialize } from 'dummy/initializers/foo'; -import { module, test } from 'qunit'; - -module('Unit | Initializer | foo', { - beforeEach() { - run(() => { - this.application = Application.create(); - this.application.deferReadiness(); - }); - }, - afterEach() { - run(this.application, 'destroy'); - }, -}); - -// TODO: Replace this with your real tests. -test('it works', function (assert) { - initialize(this.application); - - // you would normally confirm the results of the initializer here - assert.ok(true); -}); diff --git a/node-tests/fixtures/instance-initializer-test/addon.js b/node-tests/fixtures/instance-initializer-test/addon.js new file mode 100644 index 00000000000..d86dcb171c9 --- /dev/null +++ b/node-tests/fixtures/instance-initializer-test/addon.js @@ -0,0 +1,39 @@ +import Application from '@ember/application'; + +import config from 'dummy/config/environment'; +import { initialize } from 'dummy/instance-initializers/foo'; +import { module, test } from 'qunit'; +import Resolver from 'ember-resolver'; +import { run } from '@ember/runloop'; + +module('Unit | Instance Initializer | foo', function (hooks) { + hooks.beforeEach(function () { + this.TestApplication = class TestApplication extends Application { + modulePrefix = config.modulePrefix; + podModulePrefix = config.podModulePrefix; + Resolver = Resolver; + }; + + this.TestApplication.instanceInitializer({ + name: 'initializer under test', + initialize, + }); + + this.application = this.TestApplication.create({ + autoboot: false, + }); + + this.instance = this.application.buildInstance(); + }); + hooks.afterEach(function () { + run(this.instance, 'destroy'); + run(this.application, 'destroy'); + }); + + // TODO: Replace this with your real tests. + test('it works', async function (assert) { + await this.instance.boot(); + + assert.ok(true); + }); +}); diff --git a/node-tests/fixtures/instance-initializer-test/rfc232.js b/node-tests/fixtures/instance-initializer-test/app.js similarity index 100% rename from node-tests/fixtures/instance-initializer-test/rfc232.js rename to node-tests/fixtures/instance-initializer-test/app.js diff --git a/node-tests/fixtures/instance-initializer-test/default.js b/node-tests/fixtures/instance-initializer-test/default.js deleted file mode 100644 index a9c9927c0f4..00000000000 --- a/node-tests/fixtures/instance-initializer-test/default.js +++ /dev/null @@ -1,25 +0,0 @@ -import Application from '@ember/application'; -import { run } from '@ember/runloop'; -import { initialize } from 'my-app/instance-initializers/foo'; -import { module, test } from 'qunit'; - -module('Unit | Instance Initializer | foo', { - beforeEach() { - run(() => { - this.application = Application.create(); - this.appInstance = this.application.buildInstance(); - }); - }, - afterEach() { - run(this.appInstance, 'destroy'); - run(this.application, 'destroy'); - }, -}); - -// TODO: Replace this with your real tests. -test('it works', function (assert) { - initialize(this.appInstance); - - // you would normally confirm the results of the initializer here - assert.ok(true); -}); diff --git a/node-tests/fixtures/instance-initializer-test/dummy.js b/node-tests/fixtures/instance-initializer-test/dummy.js deleted file mode 100644 index 55d16cccb36..00000000000 --- a/node-tests/fixtures/instance-initializer-test/dummy.js +++ /dev/null @@ -1,25 +0,0 @@ -import Application from '@ember/application'; -import { run } from '@ember/runloop'; -import { initialize } from 'dummy/instance-initializers/foo'; -import { module, test } from 'qunit'; - -module('Unit | Instance Initializer | foo', { - beforeEach() { - run(() => { - this.application = Application.create(); - this.appInstance = this.application.buildInstance(); - }); - }, - afterEach() { - run(this.appInstance, 'destroy'); - run(this.application, 'destroy'); - }, -}); - -// TODO: Replace this with your real tests. -test('it works', function (assert) { - initialize(this.appInstance); - - // you would normally confirm the results of the initializer here - assert.ok(true); -}); diff --git a/node-tests/fixtures/mixin-test/addon.js b/node-tests/fixtures/mixin-test/addon.js index 73ed2ccabe6..3045653f793 100644 --- a/node-tests/fixtures/mixin-test/addon.js +++ b/node-tests/fixtures/mixin-test/addon.js @@ -2,11 +2,11 @@ import EmberObject from '@ember/object'; import FooMixin from 'my-addon/mixins/foo'; import { module, test } from 'qunit'; -module('Unit | Mixin | foo'); - -// TODO: Replace this with your real tests. -test('it works', function (assert) { - let FooObject = EmberObject.extend(FooMixin); - let subject = FooObject.create(); - assert.ok(subject); +module('Unit | Mixin | foo', function () { + // TODO: Replace this with your real tests. + test('it works', function (assert) { + let FooObject = EmberObject.extend(FooMixin); + let subject = FooObject.create(); + assert.ok(subject); + }); }); diff --git a/node-tests/fixtures/mixin-test/rfc232.js b/node-tests/fixtures/mixin-test/app.js similarity index 100% rename from node-tests/fixtures/mixin-test/rfc232.js rename to node-tests/fixtures/mixin-test/app.js diff --git a/node-tests/fixtures/mixin-test/default.js b/node-tests/fixtures/mixin-test/default.js deleted file mode 100644 index 070c444471d..00000000000 --- a/node-tests/fixtures/mixin-test/default.js +++ /dev/null @@ -1,12 +0,0 @@ -import EmberObject from '@ember/object'; -import FooMixin from 'my-app/mixins/foo'; -import { module, test } from 'qunit'; - -module('Unit | Mixin | foo'); - -// TODO: Replace this with your real tests. -test('it works', function (assert) { - let FooObject = EmberObject.extend(FooMixin); - let subject = FooObject.create(); - assert.ok(subject); -}); diff --git a/node-tests/fixtures/route-test/addon-nested.js b/node-tests/fixtures/route-test/addon-nested.js new file mode 100644 index 00000000000..2e5d0b4a9ba --- /dev/null +++ b/node-tests/fixtures/route-test/addon-nested.js @@ -0,0 +1,11 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'dummy/tests/helpers'; + +module('Unit | Route | foo/bar', function (hooks) { + setupTest(hooks); + + test('it exists', function (assert) { + let route = this.owner.lookup('route:foo/bar'); + assert.ok(route); + }); +}); diff --git a/node-tests/fixtures/route-test/rfc232-addon.js b/node-tests/fixtures/route-test/addon.js similarity index 100% rename from node-tests/fixtures/route-test/rfc232-addon.js rename to node-tests/fixtures/route-test/addon.js diff --git a/node-tests/fixtures/route-test/rfc232.js b/node-tests/fixtures/route-test/app.js similarity index 100% rename from node-tests/fixtures/route-test/rfc232.js rename to node-tests/fixtures/route-test/app.js diff --git a/node-tests/fixtures/component-test/rfc232-unit.js b/node-tests/fixtures/route-test/child.js similarity index 51% rename from node-tests/fixtures/component-test/rfc232-unit.js rename to node-tests/fixtures/route-test/child.js index 404bf3f9409..cb9c4743181 100644 --- a/node-tests/fixtures/component-test/rfc232-unit.js +++ b/node-tests/fixtures/route-test/child.js @@ -1,11 +1,11 @@ import { module, test } from 'qunit'; import { setupTest } from 'my-app/tests/helpers'; -module('Unit | Component | x-foo', function (hooks) { +module('Unit | Route | parent/child', function (hooks) { setupTest(hooks); test('it exists', function (assert) { - let component = this.owner.factoryFor('component:x-foo').create(); - assert.ok(component); + let route = this.owner.lookup('route:child'); + assert.ok(route); }); }); diff --git a/node-tests/fixtures/route-test/default-child.js b/node-tests/fixtures/route-test/default-child.js deleted file mode 100644 index 6e0f2ea37a3..00000000000 --- a/node-tests/fixtures/route-test/default-child.js +++ /dev/null @@ -1,11 +0,0 @@ -import { moduleFor, test } from 'ember-qunit'; - -moduleFor('route:child', 'Unit | Route | parent/child', { - // Specify the other units that are required for this test. - // needs: ['controller:foo'] -}); - -test('it exists', function (assert) { - let route = this.subject(); - assert.ok(route); -}); diff --git a/node-tests/fixtures/route-test/default-nested.js b/node-tests/fixtures/route-test/default-nested.js deleted file mode 100644 index 8bea0da02a6..00000000000 --- a/node-tests/fixtures/route-test/default-nested.js +++ /dev/null @@ -1,11 +0,0 @@ -import { moduleFor, test } from 'ember-qunit'; - -moduleFor('route:foo/bar', 'Unit | Route | foo/bar', { - // Specify the other units that are required for this test. - // needs: ['controller:foo'] -}); - -test('it exists', function (assert) { - let route = this.subject(); - assert.ok(route); -}); diff --git a/node-tests/fixtures/route-test/default.js b/node-tests/fixtures/route-test/default.js deleted file mode 100644 index d8b44fbee47..00000000000 --- a/node-tests/fixtures/route-test/default.js +++ /dev/null @@ -1,11 +0,0 @@ -import { moduleFor, test } from 'ember-qunit'; - -moduleFor('route:foo', 'Unit | Route | foo', { - // Specify the other units that are required for this test. - // needs: ['controller:foo'] -}); - -test('it exists', function (assert) { - let route = this.subject(); - assert.ok(route); -}); diff --git a/node-tests/fixtures/route-test/nested.js b/node-tests/fixtures/route-test/nested.js new file mode 100644 index 00000000000..d231167507c --- /dev/null +++ b/node-tests/fixtures/route-test/nested.js @@ -0,0 +1,11 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'my-app/tests/helpers'; + +module('Unit | Route | foo/bar', function (hooks) { + setupTest(hooks); + + test('it exists', function (assert) { + let route = this.owner.lookup('route:foo/bar'); + assert.ok(route); + }); +}); diff --git a/node-tests/fixtures/service-test/addon-nested.js b/node-tests/fixtures/service-test/addon-nested.js new file mode 100644 index 00000000000..c835e15e67c --- /dev/null +++ b/node-tests/fixtures/service-test/addon-nested.js @@ -0,0 +1,12 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'dummy/tests/helpers'; + +module('Unit | Service | foo/bar', function (hooks) { + setupTest(hooks); + + // TODO: Replace this with your real tests. + test('it exists', function (assert) { + let service = this.owner.lookup('service:foo/bar'); + assert.ok(service); + }); +}); diff --git a/node-tests/fixtures/service-test/rfc232-addon.js b/node-tests/fixtures/service-test/addon.js similarity index 100% rename from node-tests/fixtures/service-test/rfc232-addon.js rename to node-tests/fixtures/service-test/addon.js diff --git a/node-tests/fixtures/service-test/rfc232.js b/node-tests/fixtures/service-test/app.js similarity index 100% rename from node-tests/fixtures/service-test/rfc232.js rename to node-tests/fixtures/service-test/app.js diff --git a/node-tests/fixtures/service-test/default-nested.js b/node-tests/fixtures/service-test/default-nested.js deleted file mode 100644 index e0200f9c32b..00000000000 --- a/node-tests/fixtures/service-test/default-nested.js +++ /dev/null @@ -1,12 +0,0 @@ -import { moduleFor, test } from 'ember-qunit'; - -moduleFor('service:foo/bar', 'Unit | Service | foo/bar', { - // Specify the other units that are required for this test. - // needs: ['service:foo'] -}); - -// TODO: Replace this with your real tests. -test('it exists', function (assert) { - let service = this.subject(); - assert.ok(service); -}); diff --git a/node-tests/fixtures/service-test/default.js b/node-tests/fixtures/service-test/default.js deleted file mode 100644 index e3edff4a145..00000000000 --- a/node-tests/fixtures/service-test/default.js +++ /dev/null @@ -1,12 +0,0 @@ -import { moduleFor, test } from 'ember-qunit'; - -moduleFor('service:foo', 'Unit | Service | foo', { - // Specify the other units that are required for this test. - // needs: ['service:foo'] -}); - -// TODO: Replace this with your real tests. -test('it exists', function (assert) { - let service = this.subject(); - assert.ok(service); -}); diff --git a/node-tests/fixtures/service-test/nested.js b/node-tests/fixtures/service-test/nested.js new file mode 100644 index 00000000000..cdec39da29c --- /dev/null +++ b/node-tests/fixtures/service-test/nested.js @@ -0,0 +1,12 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'my-app/tests/helpers'; + +module('Unit | Service | foo/bar', function (hooks) { + setupTest(hooks); + + // TODO: Replace this with your real tests. + test('it exists', function (assert) { + let service = this.owner.lookup('service:foo/bar'); + assert.ok(service); + }); +}); diff --git a/node-tests/fixtures/util-test/addon-default-nested.js b/node-tests/fixtures/util-test/addon-default-nested.js deleted file mode 100644 index 6d88f77241d..00000000000 --- a/node-tests/fixtures/util-test/addon-default-nested.js +++ /dev/null @@ -1,10 +0,0 @@ -import fooBarBaz from 'dummy/utils/foo/bar-baz'; -import { module, test } from 'qunit'; - -module('Unit | Utility | foo/bar-baz'); - -// TODO: Replace this with your real tests. -test('it works', function (assert) { - let result = fooBarBaz(); - assert.ok(result); -}); diff --git a/node-tests/fixtures/util-test/addon-default.js b/node-tests/fixtures/util-test/addon-default.js deleted file mode 100644 index ce2487e6193..00000000000 --- a/node-tests/fixtures/util-test/addon-default.js +++ /dev/null @@ -1,10 +0,0 @@ -import fooBar from 'dummy/utils/foo-bar'; -import { module, test } from 'qunit'; - -module('Unit | Utility | foo-bar'); - -// TODO: Replace this with your real tests. -test('it works', function (assert) { - let result = fooBar(); - assert.ok(result); -}); diff --git a/node-tests/fixtures/util-test/addon-nested.js b/node-tests/fixtures/util-test/addon-nested.js new file mode 100644 index 00000000000..ff3040d5b48 --- /dev/null +++ b/node-tests/fixtures/util-test/addon-nested.js @@ -0,0 +1,10 @@ +import fooBarBaz from 'dummy/utils/foo/bar-baz'; +import { module, test } from 'qunit'; + +module('Unit | Utility | foo/bar-baz', function () { + // TODO: Replace this with your real tests. + test('it works', function (assert) { + let result = fooBarBaz(); + assert.ok(result); + }); +}); diff --git a/node-tests/fixtures/util-test/addon.js b/node-tests/fixtures/util-test/addon.js new file mode 100644 index 00000000000..676176ad57e --- /dev/null +++ b/node-tests/fixtures/util-test/addon.js @@ -0,0 +1,10 @@ +import fooBar from 'dummy/utils/foo-bar'; +import { module, test } from 'qunit'; + +module('Unit | Utility | foo-bar', function () { + // TODO: Replace this with your real tests. + test('it works', function (assert) { + let result = fooBar(); + assert.ok(result); + }); +}); diff --git a/node-tests/fixtures/util-test/rfc232.js b/node-tests/fixtures/util-test/app.js similarity index 100% rename from node-tests/fixtures/util-test/rfc232.js rename to node-tests/fixtures/util-test/app.js diff --git a/node-tests/fixtures/util-test/default-nested.js b/node-tests/fixtures/util-test/default-nested.js deleted file mode 100644 index 26f82416b54..00000000000 --- a/node-tests/fixtures/util-test/default-nested.js +++ /dev/null @@ -1,10 +0,0 @@ -import fooBarBaz from 'my-app/utils/foo/bar-baz'; -import { module, test } from 'qunit'; - -module('Unit | Utility | foo/bar-baz'); - -// TODO: Replace this with your real tests. -test('it works', function (assert) { - let result = fooBarBaz(); - assert.ok(result); -}); diff --git a/node-tests/fixtures/util-test/default.js b/node-tests/fixtures/util-test/default.js deleted file mode 100644 index dc3851312bb..00000000000 --- a/node-tests/fixtures/util-test/default.js +++ /dev/null @@ -1,10 +0,0 @@ -import fooBar from 'my-app/utils/foo-bar'; -import { module, test } from 'qunit'; - -module('Unit | Utility | foo-bar'); - -// TODO: Replace this with your real tests. -test('it works', function (assert) { - let result = fooBar(); - assert.ok(result); -}); diff --git a/node-tests/fixtures/util-test/dummy.js b/node-tests/fixtures/util-test/dummy.js deleted file mode 100644 index ce2487e6193..00000000000 --- a/node-tests/fixtures/util-test/dummy.js +++ /dev/null @@ -1,10 +0,0 @@ -import fooBar from 'dummy/utils/foo-bar'; -import { module, test } from 'qunit'; - -module('Unit | Utility | foo-bar'); - -// TODO: Replace this with your real tests. -test('it works', function (assert) { - let result = fooBar(); - assert.ok(result); -}); diff --git a/node-tests/fixtures/util-test/nested.js b/node-tests/fixtures/util-test/nested.js new file mode 100644 index 00000000000..8b974fb7216 --- /dev/null +++ b/node-tests/fixtures/util-test/nested.js @@ -0,0 +1,10 @@ +import fooBarBaz from 'my-app/utils/foo/bar-baz'; +import { module, test } from 'qunit'; + +module('Unit | Utility | foo/bar-baz', function () { + // TODO: Replace this with your real tests. + test('it works', function (assert) { + let result = fooBarBaz(); + assert.ok(result); + }); +});