Skip to content

Commit

Permalink
Merge pull request #4019 from pangratz/use-json-api-in-blueprints
Browse files Browse the repository at this point in the history
Use JSON-API adapter and serializer in blueprints
  • Loading branch information
igorT committed Dec 21, 2015
2 parents 95b201c + 99832ad commit 24147f1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion blueprints/adapter/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module.exports = {

locals: function(options) {
var adapterName = options.entity.name;
var baseClass = 'DS.RESTAdapter';
var baseClass = 'DS.JSONAPIAdapter';
var importStatement = 'import DS from \'ember-data\';';
var isAddon = options.inRepoAddon || options.project.isEmberCLIAddon();
var relativePath = pathUtil.getRelativePath(options.entity.name);
Expand Down
2 changes: 1 addition & 1 deletion blueprints/serializer/files/__root__/__path__/__name__.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import DS from 'ember-data';

export default DS.RESTSerializer.extend({
export default DS.JSONAPISerializer.extend({
});
2 changes: 1 addition & 1 deletion node-tests/blueprints/serializer-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ describe('Acceptance: generate and destroy serializer blueprints', function() {
file: 'app/serializers/foo.js',
contains: [
'import DS from \'ember-data\';',
'export default DS.RESTSerializer.extend('
'export default DS.JSONAPISerializer.extend('
]
},
{
Expand Down

0 comments on commit 24147f1

Please sign in to comment.