From 4df3252e5bc8fc16e996d35e732831f536ecbeaf Mon Sep 17 00:00:00 2001 From: runnerboy22 Date: Fri, 2 Jul 2021 19:23:25 -0700 Subject: [PATCH 1/3] .get->dot notation --- .../tests/integration/adapter/client-side-delete-test.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/-ember-data/tests/integration/adapter/client-side-delete-test.js b/packages/-ember-data/tests/integration/adapter/client-side-delete-test.js index 24b059b76b..27e8c5c66c 100644 --- a/packages/-ember-data/tests/integration/adapter/client-side-delete-test.js +++ b/packages/-ember-data/tests/integration/adapter/client-side-delete-test.js @@ -69,7 +69,7 @@ module('integration/adapter/store-adapter - client-side delete', function (hooks ], }); - assert.deepEqual(bookstore.get('books').mapBy('id'), ['1', '2'], 'initial hasmany loaded'); + assert.deepEqual(bookstore.books.mapBy('id'), ['1', '2'], 'initial hasmany loaded'); let book2 = store.peekRecord('book', '2'); @@ -80,7 +80,7 @@ module('integration/adapter/store-adapter - client-side delete', function (hooks await settled(); assert.false(store.hasRecordForId('book', '2'), 'book 2 unloaded'); - assert.deepEqual(bookstore.get('books').mapBy('id'), ['1'], 'one book client-side deleted'); + assert.deepEqual(bookstore.books.mapBy('id'), ['1'], 'one book client-side deleted'); store.push({ data: { @@ -98,7 +98,7 @@ module('integration/adapter/store-adapter - client-side delete', function (hooks }); assert.deepEqual( - bookstore.get('books').mapBy('id'), + bookstore.books.mapBy('id'), ['1', '2'], 'the deleted book (with same id) is pushed back into the store' ); From f3a24c42b1f3a94bc02337c9470a4606242a1403 Mon Sep 17 00:00:00 2001 From: runnerboy22 Date: Fri, 2 Jul 2021 19:36:12 -0700 Subject: [PATCH 2/3] models->class-based definitions --- .../adapter/client-side-delete-test.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/-ember-data/tests/integration/adapter/client-side-delete-test.js b/packages/-ember-data/tests/integration/adapter/client-side-delete-test.js index 27e8c5c66c..96bb55b0ca 100644 --- a/packages/-ember-data/tests/integration/adapter/client-side-delete-test.js +++ b/packages/-ember-data/tests/integration/adapter/client-side-delete-test.js @@ -6,7 +6,7 @@ import { resolve } from 'rsvp'; import { setupTest } from 'ember-qunit'; import Adapter from '@ember-data/adapter'; -import Model, { belongsTo, hasMany } from '@ember-data/model'; +import Model, { belongsTo, hasMany, attr } from '@ember-data/model'; import JSONAPISerializer from '@ember-data/serializer/json-api'; module('integration/adapter/store-adapter - client-side delete', function (hooks) { @@ -16,13 +16,15 @@ module('integration/adapter/store-adapter - client-side delete', function (hooks this.owner.register('adapter:application', Adapter.extend()); this.owner.register('serializer:application', JSONAPISerializer.extend()); - const Bookstore = Model.extend({ - books: hasMany('book', { async: false, inverse: 'bookstore' }), - }); + class Bookstore extends Model { + @attr name; + @hasMany('book', { async: false, inverse: 'bookstore' }) books; + } - const Book = Model.extend({ - bookstore: belongsTo('bookstore', { inverse: 'books' }), - }); + class Book extends Model { + @attr name; + @belongsTo('bookstore', { async: true, inverse: 'books' }) bookstore; + } this.owner.register('model:bookstore', Bookstore); this.owner.register('model:book', Book); From 93aa0ee0f5439f1949d9253cf593be3263d7dde9 Mon Sep 17 00:00:00 2001 From: runnerboy22 Date: Sat, 17 Jul 2021 13:53:12 -0700 Subject: [PATCH 3/3] linted imports by sorting --- .../tests/integration/adapter/client-side-delete-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/-ember-data/tests/integration/adapter/client-side-delete-test.js b/packages/-ember-data/tests/integration/adapter/client-side-delete-test.js index 96bb55b0ca..8991296ee9 100644 --- a/packages/-ember-data/tests/integration/adapter/client-side-delete-test.js +++ b/packages/-ember-data/tests/integration/adapter/client-side-delete-test.js @@ -6,7 +6,7 @@ import { resolve } from 'rsvp'; import { setupTest } from 'ember-qunit'; import Adapter from '@ember-data/adapter'; -import Model, { belongsTo, hasMany, attr } from '@ember-data/model'; +import Model, { attr, belongsTo, hasMany } from '@ember-data/model'; import JSONAPISerializer from '@ember-data/serializer/json-api'; module('integration/adapter/store-adapter - client-side delete', function (hooks) {