Merge pull request #5296 from alexander-alvarez/adapter-test

blueprints/adapter-test: Add RFC232 variants

Author: rwjblue

blueprints/adapter-test/qunit-rfc-232-files/tests/unit/__path__/__test__.js

@@ -0,0 +1,12 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('<%= friendlyTestDescription %>', function(hooks) {
+  setupTest(hooks);
+
+  // Replace this with your real tests.
+  test('it exists', function(assert) {
+    let adapter = this.owner.lookup('adapter:<%= dasherizedModuleName %>');
+    assert.ok(adapter);
+  });
+});

node-tests/blueprints/adapter-test.js

@@ -18,25 +18,28 @@ const fixture = require('../helpers/fixture');
 describe('Acceptance: generate and destroy adapter blueprints', function() {
   setupTestHooks(this);
 
+  beforeEach(function() {
+    return emberNew();
+  });
+
+
   it('adapter', function() {
     let args = ['adapter', 'foo'];
 
-    return emberNew()
-      .then(() => emberGenerateDestroy(args, _file => {
+    return emberGenerateDestroy(args, _file => {
         expect(_file('app/adapters/foo.js'))
           .to.contain('import DS from \'ember-data\';')
           .to.contain('export default DS.JSONAPIAdapter.extend({');
 
         expect(_file('tests/unit/adapters/foo-test.js'))
           .to.equal(fixture('adapter-test/foo-default.js'));
-      }));
+      });
   });
 
   it('adapter extends application adapter if it exists', function() {
     let args = ['adapter', 'foo'];
 
-    return emberNew()
-      .then(() => emberGenerate(['adapter', 'application']))
+    return emberGenerate(['adapter', 'application'])
       .then(() => emberGenerateDestroy(args, _file => {
         expect(_file('app/adapters/foo.js'))
           .to.contain('import ApplicationAdapter from \'./application\';')
@@ -50,61 +53,76 @@ describe('Acceptance: generate and destroy adapter blueprints', function() {
   it('adapter with --base-class', function() {
     let args = ['adapter', 'foo', '--base-class=bar'];
 
-    return emberNew()
-      .then(() => emberGenerateDestroy(args, _file => {
+    return emberGenerateDestroy(args, _file => {
         expect(_file('app/adapters/foo.js'))
           .to.contain('import BarAdapter from \'./bar\';')
           .to.contain('export default BarAdapter.extend({');
 
         expect(_file('tests/unit/adapters/foo-test.js'))
           .to.equal(fixture('adapter-test/foo-default.js'));
-      }));
+      });
   });
 
   xit('adapter throws when --base-class is same as name', function() {
     let args = ['adapter', 'foo', '--base-class=foo'];
 
-    return emberNew()
-      .then(() => expect(emberGenerate(args))
-        .to.be.rejectedWith(SilentError, /Adapters cannot extend from themself/));
+    return expect(emberGenerate(args))
+        .to.be.rejectedWith(SilentError, /Adapters cannot extend from themself/);
   });
 
   it('adapter when is named "application"', function() {
     let args = ['adapter', 'application'];
 
-    return emberNew()
-      .then(() => emberGenerateDestroy(args, _file => {
+    return emberGenerateDestroy(args, _file => {
         expect(_file('app/adapters/application.js'))
           .to.contain('import DS from \'ember-data\';')
           .to.contain('export default DS.JSONAPIAdapter.extend({');
 
         expect(_file('tests/unit/adapters/application-test.js'))
           .to.equal(fixture('adapter-test/application-default.js'));
-      }));
+      });
   });
 
   it('adapter-test', function() {
     let args = ['adapter-test', 'foo'];
 
-    return emberNew()
-      .then(() => emberGenerateDestroy(args, _file => {
+    return emberGenerateDestroy(args, _file => {
         expect(_file('tests/unit/adapters/foo-test.js'))
           .to.equal(fixture('adapter-test/foo-default.js'));
-      }));
+      });
   });
 
-  it('adapter-test for mocha v0.12+', function() {
-    let args = ['adapter-test', 'foo'];
+  describe('adapter-test with [email protected]', function() {
+    beforeEach(function() {
+      generateFakePackageManifest('ember-cli-qunit', '4.2.0');
+    });
 
-    return emberNew()
-      .then(() => modifyPackages([
-        {name: 'ember-cli-qunit', delete: true},
-        {name: 'ember-cli-mocha', dev: true}
-      ]))
-      .then(() => generateFakePackageManifest('ember-cli-mocha', '0.12.0'))
-      .then(() => emberGenerateDestroy(args, _file => {
+    it('adapter-test-test foo', function() {
+      return emberGenerateDestroy(['adapter-test', 'foo'], _file => {
         expect(_file('tests/unit/adapters/foo-test.js'))
-          .to.equal(fixture('adapter-test/foo-mocha-0.12.js'));
-      }));
+        .to.equal(fixture('adapter-test/rfc232.js'));
+      });
+    });
+  });
+
+
+  describe('with ember-cli-mocha v0.12+', function() {
+    beforeEach(function() {
+      modifyPackages([
+        { name: 'ember-cli-qunit', delete: true },
+        { name: 'ember-cli-mocha', dev: true }
+      ]);
+      generateFakePackageManifest('ember-cli-mocha', '0.12.0');
+    });
+
+    it('adapter-test for mocha v0.12+', function() {
+      let args = ['adapter-test', 'foo'];
+
+      return emberGenerateDestroy(args, _file => {
+        expect(_file('tests/unit/adapters/foo-test.js'))
+        .to.equal(fixture('adapter-test/foo-mocha-0.12.js'));
+      });
+    });
   });
+
 });

node-tests/fixtures/adapter-test/rfc232.js

@@ -0,0 +1,12 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Adapter | foo', function(hooks) {
+  setupTest(hooks);
+
+  // Replace this with your real tests.
+  test('it exists', function(assert) {
+    let adapter = this.owner.lookup('adapter:foo');
+    assert.ok(adapter);
+  });
+});