Fix broken model blueprint & add blueprint tests (#98)

Author: aars

.npmignore

@@ -2,6 +2,7 @@
 /config/ember-try.js
 /dist
 /tests
+/node-tests
 /tmp
 **/.gitkeep
 .bowerrc

blueprints/jsonapi-resource/index.js

@@ -57,19 +57,16 @@ module.exports = {
     var modelOptions = merge({}, options, {
       entity: {
         name: entityName ? inflection.singularize(entityName) : ''
-      },
-      originBlueprintName: 'jsonapi-model'
+      }
     });
 
     var otherOptions = merge({}, options);
 
     return Promise.all([
       this._processBlueprint(type, 'jsonapi-model', modelOptions),
-      this._processBlueprint(type, 'addon-import', modelOptions),
       this._processBlueprint(type, 'jsonapi-adapter', otherOptions),
       this._processBlueprint(type, 'jsonapi-serializer', otherOptions),
       this._processBlueprint(type, 'jsonapi-service', otherOptions),
-      this._processBlueprint(type, 'jsonapi-adapter', otherOptions),
       this._processBlueprint(type, 'jsonapi-initializer', otherOptions)
     ]);
   }

node-tests/blueprints/jsonapi-resource-test.js

@@ -0,0 +1,63 @@
+'use strict';
+
+var EOL                  = require('os').EOL;
+var blueprintHelpers     = require('ember-cli-blueprint-test-helpers/helpers');
+var setupTestHooks       = blueprintHelpers.setupTestHooks;
+var emberNew             = blueprintHelpers.emberNew;
+var emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
+var emberGenerate        = blueprintHelpers.emberGenerate;
+
+var expect = require('ember-cli-blueprint-test-helpers/chai').expect;
+var sleep = require('sleep');
+
+describe('Acceptance: ember generate and destroy jsonapi-resource', function() {
+  setupTestHooks(this);
+
+  it('generates jsonapi-resource files (model, serializer, adapter, service, tests)', function() {
+    var args = ['jsonapi-resource', 'foo'];
+
+    return emberNew()
+      .then(() => emberGenerateDestroy(args, (file) => {
+        // model & unit test
+        expect(file('app/models/foo.js'))
+          .to.contain("import Ember from 'ember';"+EOL)
+          .to.contain("import Resource from 'ember-jsonapi-resources/models/resource';"+EOL)
+          .to.contain("import { attr, hasOne, hasMany } from 'ember-jsonapi-resources/models/resource';"+EOL);
+        expect(file('tests/unit/models/foo-test.js'))
+          .to.contain("import Ember from 'ember';"+EOL)
+          .to.contain("import Model from '../../../models/foo';"+EOL)
+          .to.contain("import { moduleFor, test } from 'ember-qunit';"+EOL);
+
+        // serializer and tests
+        expect(file('app/serializers/foo.js'))
+          .to.contain("import ApplicationSerializer from './application';"+EOL)
+          .to.contain("export default ApplicationSerializer.extend({"+EOL)
+          // we're not testing the body here
+          .to.contain("});"+EOL);
+        expect(file('tests/unit/serializers/foo-test.js'))
+          .to.contain("import Ember from 'ember';"+EOL)
+          .to.contain("import Resource from '../../../models/foo';"+EOL)
+          .to.contain("import { moduleFor, test } from 'ember-qunit';"+EOL);
+
+        // adapter and tests
+        expect(file('app/adapters/foo.js'))
+          .to.contain("import ApplicationAdapter from './application';"+EOL)
+          .to.contain("import config from '../config/environment';"+EOL)
+          .to.contain("export default ApplicationAdapter.extend({"+EOL)
+          // we're not testing the body here, except for type
+          .to.contain("type: 'foo',"+EOL)
+          .to.contain("});"+EOL);
+        expect(file('tests/unit/adapters/foo-test.js'))
+          .to.contain("import { moduleFor, test } from 'ember-qunit';"+EOL);
+
+        // service and tests
+        expect(file('app/services/foos.js'))
+          .to.contain("import Adapter from '../adapters/foo';"+EOL)
+          .to.contain("import ServiceCache from '../mixins/service-cache';"+EOL)
+          .to.contain("Adapter.reopenClass({ isServiceFactory: true });"+EOL)
+          .to.contain("export default Adapter.extend(ServiceCache);"+EOL);
+        expect(file('tests/unit/services/foos-test.js'))
+          .to.contain("import { moduleFor, test } from 'ember-qunit';"+EOL);
+    }));
+  });
+});

package.json

@@ -9,7 +9,8 @@
   "scripts": {
     "build": "ember build",
     "start": "ember server",
-    "test": "ember try:each"
+    "test": "ember try:each",
+    "nodetest": "mocha node-tests --recursive"
   },
   "repository": "[email protected]:pixelhandler/ember-jsonapi-resources.git",
   "engines": {
@@ -26,6 +27,7 @@
     "ember-buffered-proxy": "^0.5.1",
     "ember-cli": "2.8.0",
     "ember-cli-app-version": "^1.0.0",
+    "ember-cli-blueprint-test-helpers": "^0.13.0",
     "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-dependency-checker": "^1.2.0",
     "ember-cli-get-dependency-depth": "^1.0.0",
@@ -49,6 +51,7 @@
     "glob": "^4.5.3",
     "http-proxy": "^1.12.0",
     "loader.js": "^4.0.1",
+    "mocha": "^2.5.3",
     "morgan": "^1.6.1",
     "silent-error": "^1.0.0",
     "yuidocjs": "^0.7.0"