diff --git a/blueprints/model-test/mocha-rfc-232-files/__root__/__path__/__test__.js b/blueprints/model-test/mocha-rfc-232-files/__root__/__path__/__test__.js new file mode 100644 index 00000000000..77576d6d45f --- /dev/null +++ b/blueprints/model-test/mocha-rfc-232-files/__root__/__path__/__test__.js @@ -0,0 +1,14 @@ +import { expect } from 'chai'; +import { describe, it } from 'mocha'; +import { setupTest } from 'ember-mocha'; + +describe('<%= friendlyTestDescription %>', function() { + setupTest(); + + // Replace this with your real tests. + it('exists', function() { + let store = this.owner.lookup('service:store'); + let model = store.createRecord('<%= dasherizedModuleName %>', {}); + expect(model).to.be.ok; + }); +}); diff --git a/blueprints/serializer-test/mocha-rfc-232-files/__root__/__path__/__test__.js b/blueprints/serializer-test/mocha-rfc-232-files/__root__/__path__/__test__.js new file mode 100644 index 00000000000..fcf277e607e --- /dev/null +++ b/blueprints/serializer-test/mocha-rfc-232-files/__root__/__path__/__test__.js @@ -0,0 +1,24 @@ +import { expect } from 'chai'; +import { describe, it } from 'mocha'; +import { setupTest } from 'ember-mocha'; + +describe('<%= friendlyTestDescription %>', function() { + setupTest(); + + // Replace this with your real tests. + it('exists', function() { + let store = this.owner.lookup('service:store'); + let serializer = store.serializerFor('<%= dasherizedModuleName %>'); + + expect(serializer).to.be.ok; + }); + + it('serializes records', function() { + let store = this.owner.lookup('service:store'); + let record = store.createRecord('<%= dasherizedModuleName %>', {}); + + let serializedRecord = record.serialize(); + + expect(serializedRecord).to.be.ok; + }); +}); diff --git a/blueprints/transform-test/mocha-rfc-232-files/__root__/__path__/__test__.js b/blueprints/transform-test/mocha-rfc-232-files/__root__/__path__/__test__.js new file mode 100644 index 00000000000..a7fbabdb805 --- /dev/null +++ b/blueprints/transform-test/mocha-rfc-232-files/__root__/__path__/__test__.js @@ -0,0 +1,13 @@ +import { expect } from 'chai'; +import { describe, it } from 'mocha'; +import { setupTest } from 'ember-mocha'; + +describe('<%= friendlyTestDescription %>', function() { + setupTest(); + + // Replace this with your real tests. + it('exists', function() { + let transform = this.owner.lookup('transform:<%= dasherizedModuleName %>'); + expect(transform).to.be.ok; + }); +}); diff --git a/node-tests/blueprints/adapter-test.js b/node-tests/blueprints/adapter-test.js index 7e37e5cc458..5366e86dea8 100644 --- a/node-tests/blueprints/adapter-test.js +++ b/node-tests/blueprints/adapter-test.js @@ -287,5 +287,29 @@ describe('Acceptance: generate and destroy adapter blueprints', function() { ); }); }); + + describe('with ember-mocha v0.14+', function() { + beforeEach(function() { + modifyPackages([ + { name: 'ember-cli-qunit', delete: true }, + { name: 'ember-mocha', dev: true }, + ]); + generateFakePackageManifest('ember-mocha', '0.14.0'); + }); + + it('adapter-test for mocha v0.14+', function() { + let args = ['adapter-test', 'foo']; + + return emberGenerateDestroy( + args, + _file => { + expect(_file('src/data/models/foo/adapter-test.js')).to.equal( + fixture('adapter-test/mocha-rfc232.js') + ); + }, + { isModuleUnification: true } + ); + }); + }); }); }); diff --git a/node-tests/blueprints/model-test.js b/node-tests/blueprints/model-test.js index cc480a79e78..b1c7f6f78c9 100644 --- a/node-tests/blueprints/model-test.js +++ b/node-tests/blueprints/model-test.js @@ -140,6 +140,26 @@ describe('Acceptance: generate and destroy model blueprints', function() { }); }); }); + + describe('with ember-mocha v0.14+', function() { + beforeEach(function() { + modifyPackages([ + { name: 'ember-cli-qunit', delete: true }, + { name: 'ember-mocha', dev: true }, + ]); + generateFakePackageManifest('ember-mocha', '0.14.0'); + }); + + it('model-test for mocha v0.14+', function() { + let args = ['model-test', 'foo']; + + return emberGenerateDestroy(args, _file => { + expect(_file('tests/unit/models/foo-test.js')).to.equal( + fixture('model-test/mocha-rfc232.js') + ); + }); + }); + }); }); describe('module unification', function() { @@ -297,5 +317,29 @@ describe('Acceptance: generate and destroy model blueprints', function() { ); }); }); + + describe('with ember-mocha v0.14+', function() { + beforeEach(function() { + modifyPackages([ + { name: 'ember-cli-qunit', delete: true }, + { name: 'ember-mocha', dev: true }, + ]); + generateFakePackageManifest('ember-mocha', '0.14.0'); + }); + + it('model-test for mocha v0.14+', function() { + let args = ['model-test', 'foo']; + + return emberGenerateDestroy( + args, + _file => { + expect(_file('src/data/models/foo/model-test.js')).to.equal( + fixture('model-test/mocha-rfc232.js') + ); + }, + { isModuleUnification: true } + ); + }); + }); }); }); diff --git a/node-tests/blueprints/serializer-test.js b/node-tests/blueprints/serializer-test.js index 058b4c157ca..5f6766342d5 100644 --- a/node-tests/blueprints/serializer-test.js +++ b/node-tests/blueprints/serializer-test.js @@ -133,6 +133,26 @@ describe('Acceptance: generate and destroy serializer blueprints', function() { }); }); }); + + describe('with ember-mocha v0.14+', function() { + beforeEach(function() { + modifyPackages([ + { name: 'ember-cli-qunit', delete: true }, + { name: 'ember-mocha', dev: true }, + ]); + generateFakePackageManifest('ember-mocha', '0.14.0'); + }); + + it('serializer-test for mocha v0.14+', function() { + let args = ['serializer-test', 'foo']; + + return emberGenerateDestroy(args, _file => { + expect(_file('tests/unit/serializers/foo-test.js')).to.equal( + fixture('serializer-test/mocha-rfc232.js') + ); + }); + }); + }); }); describe('module unification', function() { @@ -278,5 +298,29 @@ describe('Acceptance: generate and destroy serializer blueprints', function() { ); }); }); + + describe('with ember-mocha v0.14+', function() { + beforeEach(function() { + modifyPackages([ + { name: 'ember-cli-qunit', delete: true }, + { name: 'ember-mocha', dev: true }, + ]); + generateFakePackageManifest('ember-mocha', '0.14.0'); + }); + + it('serializer-test for mocha v0.14+', function() { + let args = ['serializer-test', 'foo']; + + return emberGenerateDestroy( + args, + _file => { + expect(_file('src/data/models/foo/serializer-test.js')).to.equal( + fixture('serializer-test/mocha-rfc232.js') + ); + }, + { isModuleUnification: true } + ); + }); + }); }); }); diff --git a/node-tests/blueprints/transform-test.js b/node-tests/blueprints/transform-test.js index 31f879d5d40..f6ac63d27fe 100644 --- a/node-tests/blueprints/transform-test.js +++ b/node-tests/blueprints/transform-test.js @@ -80,6 +80,26 @@ describe('Acceptance: generate and destroy transform blueprints', function() { }); }); }); + + describe('with ember-mocha v0.14+', function() { + beforeEach(function() { + modifyPackages([ + { name: 'ember-cli-qunit', delete: true }, + { name: 'ember-mocha', dev: true }, + ]); + generateFakePackageManifest('ember-mocha', '0.14.0'); + }); + + it('transform-test for mocha v0.14+', function() { + let args = ['transform-test', 'foo']; + + return emberGenerateDestroy(args, _file => { + expect(_file('tests/unit/transforms/foo-test.js')).to.equal( + fixture('transform-test/mocha-rfc232.js') + ); + }); + }); + }); }); }); @@ -164,6 +184,30 @@ describe('Acceptance: generate and destroy transform blueprints', function() { ); }); }); + + describe('with ember-mocha v0.14+', function() { + beforeEach(function() { + modifyPackages([ + { name: 'ember-cli-qunit', delete: true }, + { name: 'ember-mocha', dev: true }, + ]); + generateFakePackageManifest('ember-mocha', '0.14.0'); + }); + + it('transform-test for mocha v0.14+', function() { + let args = ['transform-test', 'foo']; + + return emberGenerateDestroy( + args, + _file => { + expect(_file('src/data/transforms/foo-test.js')).to.equal( + fixture('transform-test/mocha-rfc232.js') + ); + }, + { isModuleUnification: true } + ); + }); + }); }); }); }); diff --git a/node-tests/fixtures/model-test/mocha-rfc232.js b/node-tests/fixtures/model-test/mocha-rfc232.js new file mode 100644 index 00000000000..9c94ea35029 --- /dev/null +++ b/node-tests/fixtures/model-test/mocha-rfc232.js @@ -0,0 +1,14 @@ +import { expect } from 'chai'; +import { describe, it } from 'mocha'; +import { setupTest } from 'ember-mocha'; + +describe('Unit | Model | foo', function() { + setupTest(); + + // Replace this with your real tests. + it('exists', function() { + let store = this.owner.lookup('service:store'); + let model = store.createRecord('foo', {}); + expect(model).to.be.ok; + }); +}); diff --git a/node-tests/fixtures/serializer-test/mocha-rfc232.js b/node-tests/fixtures/serializer-test/mocha-rfc232.js new file mode 100644 index 00000000000..02a450df483 --- /dev/null +++ b/node-tests/fixtures/serializer-test/mocha-rfc232.js @@ -0,0 +1,24 @@ +import { expect } from 'chai'; +import { describe, it } from 'mocha'; +import { setupTest } from 'ember-mocha'; + +describe('Unit | Serializer | foo', function() { + setupTest(); + + // Replace this with your real tests. + it('exists', function() { + let store = this.owner.lookup('service:store'); + let serializer = store.serializerFor('foo'); + + expect(serializer).to.be.ok; + }); + + it('serializes records', function() { + let store = this.owner.lookup('service:store'); + let record = store.createRecord('foo', {}); + + let serializedRecord = record.serialize(); + + expect(serializedRecord).to.be.ok; + }); +}); diff --git a/node-tests/fixtures/transform-test/mocha-rfc232.js b/node-tests/fixtures/transform-test/mocha-rfc232.js new file mode 100644 index 00000000000..5ad1979debc --- /dev/null +++ b/node-tests/fixtures/transform-test/mocha-rfc232.js @@ -0,0 +1,13 @@ +import { expect } from 'chai'; +import { describe, it } from 'mocha'; +import { setupTest } from 'ember-mocha'; + +describe('Unit | Transform | foo', function() { + setupTest(); + + // Replace this with your real tests. + it('exists', function() { + let transform = this.owner.lookup('transform:foo'); + expect(transform).to.be.ok; + }); +});