cleanup: node-tests cleanup

blueprints/model-test/mocha-files/tests/unit/__path__/__test__.js

@@ -5,7 +5,7 @@ import { setupModelTest } from 'ember-mocha';
 describe('<%= friendlyDescription %>', function() {
   setupModelTest('<%= dasherizedModuleName %>', {
     // Specify the other units that are required for this test.
-    <%= typeof needs !== 'undefined' ? needs : '' %>
+  <%= typeof needs !== 'undefined' ? needs : '' %>
   });
 
   // Replace this with your real tests.

node-tests/blueprints/adapter-test.js

@@ -1,22 +1,25 @@
-var blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers');
-var setupTestHooks = blueprintHelpers.setupTestHooks;
-var emberNew = blueprintHelpers.emberNew;
-var emberGenerate = blueprintHelpers.emberGenerate;
-var emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
-var modifyPackages = blueprintHelpers.modifyPackages;
+'use strict';
 
-var chai = require('ember-cli-blueprint-test-helpers/chai');
-var expect = chai.expect;
+const blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers');
+const setupTestHooks = blueprintHelpers.setupTestHooks;
+const emberNew = blueprintHelpers.emberNew;
+const emberGenerate = blueprintHelpers.emberGenerate;
+const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
+const modifyPackages = blueprintHelpers.modifyPackages;
 
-var SilentError = require('silent-error');
+const chai = require('ember-cli-blueprint-test-helpers/chai');
+const expect = chai.expect;
 
-var generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
+const SilentError = require('silent-error');
+
+const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
+const fixture = require('../helpers/fixture');
 
 describe('Acceptance: generate and destroy adapter blueprints', function() {
   setupTestHooks(this);
 
   it('adapter', function() {
-    var args = ['adapter', 'foo'];
+    let args = ['adapter', 'foo'];
 
     return emberNew()
       .then(() => emberGenerateDestroy(args, _file => {
@@ -25,12 +28,12 @@ describe('Acceptance: generate and destroy adapter blueprints', function() {
           .to.contain('export default DS.JSONAPIAdapter.extend({');
 
         expect(_file('tests/unit/adapters/foo-test.js'))
-          .to.contain('moduleFor(\'adapter:foo\'');
+          .to.equal(fixture('adapter-test/foo-default.js'));
       }));
   });
 
   it('adapter extends application adapter if it exists', function() {
-    var args = ['adapter', 'foo'];
+    let args = ['adapter', 'foo'];
 
     return emberNew()
       .then(() => emberGenerate(['adapter', 'application']))
@@ -40,12 +43,12 @@ describe('Acceptance: generate and destroy adapter blueprints', function() {
           .to.contain('export default ApplicationAdapter.extend({');
 
         expect(_file('tests/unit/adapters/foo-test.js'))
-          .to.contain('moduleFor(\'adapter:foo\'');
+          .to.equal(fixture('adapter-test/foo-default.js'));
       }));
   });
 
   it('adapter with --base-class', function() {
-    var args = ['adapter', 'foo', '--base-class=bar'];
+    let args = ['adapter', 'foo', '--base-class=bar'];
 
     return emberNew()
       .then(() => emberGenerateDestroy(args, _file => {
@@ -54,20 +57,20 @@ describe('Acceptance: generate and destroy adapter blueprints', function() {
           .to.contain('export default BarAdapter.extend({');
 
         expect(_file('tests/unit/adapters/foo-test.js'))
-          .to.contain('moduleFor(\'adapter:foo\'');
+          .to.equal(fixture('adapter-test/foo-default.js'));
       }));
   });
 
   xit('adapter throws when --base-class is same as name', function() {
-    var args = ['adapter', 'foo', '--base-class=foo'];
+    let args = ['adapter', 'foo', '--base-class=foo'];
 
     return emberNew()
       .then(() => expect(emberGenerate(args))
         .to.be.rejectedWith(SilentError, /Adapters cannot extend from themself/));
   });
 
   it('adapter when is named "application"', function() {
-    var args = ['adapter', 'application'];
+    let args = ['adapter', 'application'];
 
     return emberNew()
       .then(() => emberGenerateDestroy(args, _file => {
@@ -76,22 +79,22 @@ describe('Acceptance: generate and destroy adapter blueprints', function() {
           .to.contain('export default DS.JSONAPIAdapter.extend({');
 
         expect(_file('tests/unit/adapters/application-test.js'))
-          .to.contain('moduleFor(\'adapter:application\'');
+          .to.equal(fixture('adapter-test/application-default.js'));
       }));
   });
 
   it('adapter-test', function() {
-    var args = ['adapter-test', 'foo'];
+    let args = ['adapter-test', 'foo'];
 
     return emberNew()
       .then(() => emberGenerateDestroy(args, _file => {
         expect(_file('tests/unit/adapters/foo-test.js'))
-          .to.contain('moduleFor(\'adapter:foo\'');
+          .to.equal(fixture('adapter-test/foo-default.js'));
       }));
   });
 
   it('adapter-test for mocha v0.12+', function() {
-    var args = ['adapter-test', 'foo'];
+    let args = ['adapter-test', 'foo'];
 
     return emberNew()
       .then(() => modifyPackages([
@@ -101,11 +104,7 @@ describe('Acceptance: generate and destroy adapter blueprints', function() {
       .then(() => generateFakePackageManifest('ember-cli-mocha', '0.12.0'))
       .then(() => emberGenerateDestroy(args, _file => {
         expect(_file('tests/unit/adapters/foo-test.js'))
-          .to.contain('import { describe, it } from \'mocha\';')
-          .to.contain('import { setupTest } from \'ember-mocha\';')
-          .to.contain('describe(\'Unit | Adapter | foo\', function() {')
-          .to.contain('setupTest(\'adapter:foo\',')
-          .to.contain('expect(adapter).to.be.ok;');
+          .to.equal(fixture('adapter-test/foo-mocha-0.12.js'));
       }));
   });
 });

node-tests/blueprints/model-test.js

@@ -1,33 +1,37 @@
-var blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers');
-var setupTestHooks = blueprintHelpers.setupTestHooks;
-var emberNew = blueprintHelpers.emberNew;
-var emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
-var modifyPackages = blueprintHelpers.modifyPackages;
+'use strict';
 
-var chai = require('ember-cli-blueprint-test-helpers/chai');
-var expect = chai.expect;
+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');
 
-var generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
 
 describe('Acceptance: generate and destroy model blueprints', function() {
   setupTestHooks(this);
 
   it('model', function() {
-    var args = ['model', 'foo'];
+    let args = ['model', 'foo'];
 
     return emberNew()
       .then(() => emberGenerateDestroy(args, _file => {
         expect(_file('app/models/foo.js'))
           .to.contain('import DS from \'ember-data\';')
-          .to.contain('export default DS.Model.extend(')
+          .to.contain('export default DS.Model.extend(');
 
         expect(_file('tests/unit/models/foo-test.js'))
-          .to.contain('moduleForModel(\'foo\'');
+          .to.equal(fixture('model-test/foo-default.js'));
       }));
   });
 
   it('model with attrs', function() {
-    var args = [
+    let args = [
       'model',
       'foo',
       'misc',
@@ -52,59 +56,57 @@ describe('Acceptance: generate and destroy model blueprints', function() {
           .to.contain('someObject: DS.attr(\'object\')')
           .to.contain('age: DS.attr(\'number\')')
           .to.contain('name: DS.attr(\'string\')')
-          .to.contain('customAttr: DS.attr(\'custom-transform\')')
+          .to.contain('customAttr: DS.attr(\'custom-transform\')');
 
         expect(_file('tests/unit/models/foo-test.js'))
-          .to.contain('moduleForModel(\'foo\'');
+          .to.equal(fixture('model-test/foo-default.js'));
       }));
   });
 
   it('model with belongsTo', function() {
-    var args = ['model', 'comment', 'post:belongs-to', 'author:belongs-to:user'];
+    let args = ['model', 'comment', 'post:belongs-to', 'author:belongs-to:user'];
 
     return emberNew()
       .then(() => emberGenerateDestroy(args, _file => {
         expect(_file('app/models/comment.js'))
           .to.contain('import DS from \'ember-data\';')
           .to.contain('export default DS.Model.extend(')
           .to.contain('post: DS.belongsTo(\'post\')')
-          .to.contain('author: DS.belongsTo(\'user\')')
+          .to.contain('author: DS.belongsTo(\'user\')');
 
         expect(_file('tests/unit/models/comment-test.js'))
-          .to.contain('moduleForModel(\'comment\'')
-          .to.contain('needs: [\'model:post\', \'model:user\']');
+          .to.equal(fixture('model-test/comment-default.js'));
       }));
   });
 
   it('model with hasMany', function() {
-    var args = ['model', 'post', 'comments:has-many', 'otherComments:has-many:comment'];
+    let args = ['model', 'post', 'comments:has-many', 'otherComments:has-many:comment'];
 
     return emberNew()
       .then(() => emberGenerateDestroy(args, _file => {
         expect(_file('app/models/post.js'))
           .to.contain('import DS from \'ember-data\';')
           .to.contain('export default DS.Model.extend(')
           .to.contain('comments: DS.hasMany(\'comment\')')
-          .to.contain('otherComments: DS.hasMany(\'comment\')')
+          .to.contain('otherComments: DS.hasMany(\'comment\')');
 
         expect(_file('tests/unit/models/post-test.js'))
-          .to.contain('moduleForModel(\'post\'')
-          .to.contain('needs: [\'model:comment\']');
+          .to.equal(fixture('model-test/post-default.js'));
       }));
   });
 
   it('model-test', function() {
-    var args = ['model-test', 'foo'];
+    let args = ['model-test', 'foo'];
 
     return emberNew()
       .then(() => emberGenerateDestroy(args, _file => {
         expect(_file('tests/unit/models/foo-test.js'))
-          .to.contain('moduleForModel(\'foo\'');
+          .to.equal(fixture('model-test/foo-default.js'));
       }));
   });
 
   it('model-test for mocha v0.12+', function() {
-    var args = ['model-test', 'foo'];
+    let args = ['model-test', 'foo'];
 
     return emberNew()
       .then(() => modifyPackages([
@@ -114,11 +116,7 @@ describe('Acceptance: generate and destroy model blueprints', function() {
       .then(() => generateFakePackageManifest('ember-cli-mocha', '0.12.0'))
       .then(() => emberGenerateDestroy(args, _file => {
         expect(_file('tests/unit/models/foo-test.js'))
-          .to.contain('import { describe, it } from \'mocha\';')
-          .to.contain('import { setupModelTest } from \'ember-mocha\';')
-          .to.contain('describe(\'Unit | Model | foo\', function() {')
-          .to.contain('setupModelTest(\'foo\',')
-          .to.contain('expect(model).to.be.ok;');
+          .to.equal(fixture('model-test/foo-mocha-0.12.js'));
       }));
   });
 });