[Test]: fix for DataWrapper refactor in emberjs (#7435)

* Fix deprecations for accessing run.* (e.g. `run.next(...)`) * update to ember-cli-babel 7.26.3 And various other fixes for enabling ember-canary to pass Co-authored-by: Robert Jackson <[email protected]>
emberjs · Mar 26, 2021 · 5ff7760 · 5ff7760
1 parent fe844e4
commit 5ff7760
Show file tree

Hide file tree

Showing 35 changed files with 2,536 additions and 3,042 deletions.
diff --git a/package.json b/package.json
@@ -71,15 +71,13 @@
     "debug": "^4.1.1",
     "ember-cli": "~3.24.0",
     "ember-cli-app-version": "^3.2.0",
-    "ember-cli-babel": "^7.18.0",
+    "ember-cli-babel": "^7.26.3",
     "ember-cli-blueprint-test-helpers": "^0.19.1",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^5.1.2",
     "ember-cli-inject-live-reload": "^2.0.2",
-    "ember-cli-internal-test-helpers": "^0.9.1",
     "ember-cli-path-utils": "^1.0.0",
     "ember-cli-pretender": "^3.2.0",
-    "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-string-utils": "^1.1.0",
     "ember-cli-template-lint": "^2.0.2",

diff --git a/packages/-ember-data/ember-cli-build.js b/packages/-ember-data/ember-cli-build.js
@@ -17,7 +17,7 @@ module.exports = function(defaults) {
     'ember-cli-babel': {
       throwUnlessParallelizable: true,
     },
-    'ember-cli-uglify': {
+    'ember-cli-terser': {
       exclude: ['assets/dummy.js', 'assets/tests.js', 'assets/test-support.js', 'dist/docs/*', 'docs/*'],
     },
   });

diff --git a/packages/-ember-data/index.js b/packages/-ember-data/index.js
@@ -9,6 +9,8 @@ module.exports = Object.assign({}, addonBaseConfig, {
   shouldRollupPrivate: true,
   externalDependenciesForPrivateModule() {
     return [
+      'ember',
+      '@ember/application/namespace',
       '@ember-data/record-data/-private',
       'ember-data/version',
       '@ember-data/store/-private',

diff --git a/packages/-ember-data/package.json b/packages/-ember-data/package.json
@@ -34,7 +34,7 @@
     "@ember/string": "^1.0.0",
     "@glimmer/env": "^0.1.7",
     "broccoli-merge-trees": "^4.2.0",
-    "ember-cli-babel": "^7.18.0",
+    "ember-cli-babel": "^7.26.3",
     "ember-cli-typescript": "^4.0.0",
     "ember-inflector": "^4.0.1"
   },
@@ -61,9 +61,7 @@
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^5.1.2",
     "ember-cli-inject-live-reload": "^2.0.2",
-    "ember-cli-internal-test-helpers": "^0.9.1",
     "ember-cli-pretender": "^3.2.0",
-    "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "~4.0.1",
     "ember-cli-test-loader": "^3.0.0",

diff --git a/packages/-ember-data/tests/integration/debug-adapter-test.js b/packages/-ember-data/tests/integration/debug-adapter-test.js
@@ -4,6 +4,7 @@ import { settled } from '@ember/test-helpers';
 
 import { module, test } from 'qunit';
 
+import { gte } from 'ember-compatibility-helpers';
 import { setupTest } from 'ember-qunit';
 
 import Adapter from '@ember-data/adapter';
@@ -65,7 +66,7 @@ module('integration/debug-adapter - DS.DebugAdapter', function(hooks) {
   test('Watching Records', async function(assert) {
     let { owner } = this;
     let debugAdapter = owner.lookup('data-adapter:main');
-    let addedRecords, updatedRecords, removedIndex, removedCount;
+    let addedRecords, updatedRecords, removedRecords;
 
     this.owner.register(
       'adapter:application',
@@ -86,15 +87,17 @@ module('integration/debug-adapter - DS.DebugAdapter', function(hooks) {
       },
     });
 
-    var recordsAdded = function(wrappedRecords) {
+    let recordsAdded = function(wrappedRecords) {
       addedRecords = wrappedRecords;
     };
-    var recordsUpdated = function(wrappedRecords) {
+    let recordsUpdated = function(wrappedRecords) {
       updatedRecords = wrappedRecords;
     };
-    var recordsRemoved = function(index, count) {
-      removedIndex = index;
-      removedCount = count;
+    let recordsRemoved = function(...args) {
+      // in 3.26 there is only 1 argument - the record removed
+      // below 3.26, it is 2 arguments - the index and count removed
+      // https://github.com/emberjs/ember.js/pull/19379
+      removedRecords = args;
     };
 
     debugAdapter.watchRecords('post', recordsAdded, recordsUpdated, recordsRemoved);
@@ -114,6 +117,9 @@ module('integration/debug-adapter - DS.DebugAdapter', function(hooks) {
 
     post.set('title', 'Modified Post');
 
+    // await updated callback
+    await settled();
+
     assert.equal(get(updatedRecords, 'length'), 1, 'We updated 1 post');
     record = updatedRecords[0];
     assert.deepEqual(
@@ -131,7 +137,6 @@ module('integration/debug-adapter - DS.DebugAdapter', function(hooks) {
 
     // reset
     addedRecords = updatedRecords = [];
-    removedCount = removedIndex = null;
 
     post = store.createRecord('post', { id: '2', title: 'New Post' });
 
@@ -159,14 +164,18 @@ module('integration/debug-adapter - DS.DebugAdapter', function(hooks) {
 
     // reset
     addedRecords = updatedRecords = [];
-    removedCount = removedIndex = null;
 
     post.unloadRecord();
 
     await settled();
 
-    assert.equal(removedIndex, 1, 'We are notified of the start index of a removal when we remove posts');
-    assert.equal(removedCount, 1, 'We are notified of the total posts removed');
+    if (gte('3.26.0')) {
+      assert.equal(removedRecords.length, 1, 'We are notified of the total posts removed');
+      assert.equal(removedRecords[0][0].object, post, 'The removed post is correct');
+    } else {
+      assert.equal(removedRecords[0], 1, 'We are notified of the start index of a removal when we remove posts');
+      assert.equal(removedRecords[1], 1, 'We are notified of the total posts removed');
+    }
   });
 
   test('Column names', function(assert) {

diff --git a/packages/-ember-data/tests/integration/store/store-creation-recursion-test.js b/packages/-ember-data/tests/integration/store/store-creation-recursion-test.js
@@ -11,7 +11,7 @@ module('integration/store/creation-recursion', function(hooks) {
     let storeFactory = this.owner.factoryFor('service:store');
 
     this.owner.unregister('service:store');
-    this.owner.register('service:store', storeFactory);
+    this.owner.register('service:store', storeFactory.class);
 
     let test = this;
     test.dateTransformCreated = false;

diff --git a/packages/-ember-data/tests/unit/model/merge-test.js b/packages/-ember-data/tests/unit/model/merge-test.js
@@ -1,4 +1,4 @@
-import { run } from '@ember/runloop';
+import { next, run } from '@ember/runloop';
 
 import { module, test } from 'qunit';
 import { Promise as EmberPromise, reject, resolve } from 'rsvp';
@@ -103,7 +103,7 @@ module('unit/model/merge - Merging', function(hooks) {
       updateRecord(store, type, snapshot) {
         // Make sure saving isn't resolved synchronously
         return new EmberPromise(resolve => {
-          run.next(null, resolve, {
+          next(null, resolve, {
             data: {
               id: 1,
               type: 'person',

diff --git a/packages/-ember-data/tests/unit/store/adapter-interop-test.js b/packages/-ember-data/tests/unit/store/adapter-interop-test.js
@@ -1,6 +1,6 @@
 import { A } from '@ember/array';
 import { get, set } from '@ember/object';
-import { run } from '@ember/runloop';
+import { later, run } from '@ember/runloop';
 
 import { module, test } from 'qunit';
 import { all, Promise as EmberPromise, resolve } from 'rsvp';
@@ -693,15 +693,15 @@ module('unit/store/adapter-interop - Store working with a Adapter', function(hoo
         let record = { id, type: type.modelName };
 
         return new EmberPromise(resolve => {
-          run.later(() => resolve({ data: record }), 5);
+          later(() => resolve({ data: record }), 5);
         });
       },
 
       findMany(store, type, ids, snapshots) {
         let records = ids.map(id => ({ id, type: type.modelName }));
 
         return new EmberPromise(resolve => {
-          run.later(() => {
+          later(() => {
             resolve({ data: records });
           }, 15);
         });
@@ -791,7 +791,7 @@ module('unit/store/adapter-interop - Store working with a Adapter', function(hoo
           if (id === 'igor') {
             resolve({ data: record });
           } else {
-            run.later(function() {
+            later(function() {
               davidResolved = true;
               resolve({ data: record });
             }, 5);
@@ -844,7 +844,7 @@ module('unit/store/adapter-interop - Store working with a Adapter', function(hoo
           if (id === 'igor') {
             reject({ data: record });
           } else {
-            run.later(() => {
+            later(() => {
               davidResolved = true;
               resolve({ data: record });
             }, 5);

diff --git a/packages/adapter/addon/rest.ts b/packages/adapter/addon/rest.ts
@@ -6,7 +6,7 @@ import { getOwner } from '@ember/application';
 import { deprecate, warn } from '@ember/debug';
 import { computed } from '@ember/object';
 import { assign } from '@ember/polyfills';
-import { run } from '@ember/runloop';
+import { join } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 
 import { has } from 'require';
@@ -1068,12 +1068,12 @@ class RESTAdapter extends Adapter.extend(BuildURLMixin) {
       return new RSVPPromise(function(resolve, reject) {
         hash.success = function(payload, textStatus, jqXHR) {
           let response = ajaxSuccessHandler(adapter, payload, jqXHR, requestData);
-          run.join(null, resolve, response);
+          join(null, resolve, response);
         };
 
         hash.error = function(jqXHR, textStatus, errorThrown) {
           let error = ajaxErrorHandler(adapter, jqXHR, errorThrown, requestData);
-          run.join(null, reject, error);
+          join(null, reject, error);
         };
 
         adapter._ajax(hash);

diff --git a/packages/adapter/package.json b/packages/adapter/package.json
@@ -24,7 +24,7 @@
     "@ember-data/store": "3.27.0-alpha.0",
     "@ember/edition-utils": "^1.2.0",
     "@ember/string": "^1.0.0",
-    "ember-cli-babel": "^7.18.0",
+    "ember-cli-babel": "^7.26.3",
     "ember-cli-test-info": "^1.0.0",
     "ember-cli-typescript": "^4.0.0"
   },

diff --git a/packages/canary-features/package.json b/packages/canary-features/package.json
@@ -14,7 +14,7 @@
   },
   "scripts": {},
   "dependencies": {
-    "ember-cli-babel": "^7.18.0",
+    "ember-cli-babel": "^7.26.3",
     "ember-cli-typescript": "^4.0.0"
   },
   "devDependencies": {

diff --git a/packages/debug/package.json b/packages/debug/package.json
@@ -22,7 +22,7 @@
     "@ember-data/private-build-infra": "3.27.0-alpha.0",
     "@ember/edition-utils": "^1.2.0",
     "@ember/string": "^1.0.0",
-    "ember-cli-babel": "^7.18.0",
+    "ember-cli-babel": "^7.26.3",
     "ember-cli-test-info": "^1.0.0",
     "ember-cli-typescript": "^4.0.0"
   },

diff --git a/packages/model/package.json b/packages/model/package.json
@@ -26,7 +26,7 @@
     "@ember-data/store": "3.27.0-alpha.0",
     "@ember/edition-utils": "^1.2.0",
     "@ember/string": "^1.0.0",
-    "ember-cli-babel": "^7.18.0",
+    "ember-cli-babel": "^7.26.3",
     "ember-cli-string-utils": "^1.1.0",
     "ember-cli-test-info": "^1.0.0",
     "ember-cli-typescript": "^4.0.0",

diff --git a/packages/private-build-infra/package.json b/packages/private-build-infra/package.json
@@ -27,7 +27,7 @@
     "broccoli-rollup": "^4.1.1",
     "calculate-cache-key-for-tree": "^2.0.0",
     "chalk": "^4.0.0",
-    "ember-cli-babel": "^7.18.0",
+    "ember-cli-babel": "^7.26.3",
     "ember-cli-path-utils": "^1.0.0",
     "ember-cli-string-utils": "^1.1.0",
     "ember-cli-typescript": "^3.1.3",

diff --git a/packages/record-data/addon/-private/record-data.ts b/packages/record-data/addon/-private/record-data.ts
@@ -3,7 +3,7 @@
 */
 import { assert, inspect, warn } from '@ember/debug';
 import { assign } from '@ember/polyfills';
-import { run } from '@ember/runloop';
+import { _backburner as emberBackburner } from '@ember/runloop';
 import { isEqual } from '@ember/utils';
 import { DEBUG } from '@glimmer/env';
 
@@ -437,7 +437,7 @@ export default class RecordDataDefault implements RelationshipRecordData {
     this._destroyRelationships();
     this.reset();
     if (!this._scheduledDestroy) {
-      this._scheduledDestroy = run.backburner.schedule('destroy', this, '_cleanupOrphanedRecordDatas');
+      this._scheduledDestroy = emberBackburner.schedule('destroy', this, '_cleanupOrphanedRecordDatas');
     }
   }
 

diff --git a/packages/record-data/package.json b/packages/record-data/package.json
@@ -24,7 +24,7 @@
     "@ember-data/store": "3.27.0-alpha.0",
     "@ember/edition-utils": "^1.2.0",
     "@ember/ordered-set": "^4.0.0",
-    "ember-cli-babel": "^7.18.0",
+    "ember-cli-babel": "^7.26.3",
     "ember-cli-test-info": "^1.0.0",
     "ember-cli-typescript": "^4.0.0"
   },

diff --git a/packages/record-data/types/@ember/runloop/index.d.ts b/packages/record-data/types/@ember/runloop/index.d.ts
@@ -2,3 +2,4 @@
 // which we use to avoid autorun triggering for Ember <= 3.4
 // we can drop this and use run directly ~11/1/2019
 export const run: any;
+export const _backburner: any;
diff --git a/packages/serializer/package.json b/packages/serializer/package.json
@@ -23,7 +23,7 @@
   "dependencies": {
     "@ember-data/private-build-infra": "3.27.0-alpha.0",
     "@ember-data/store": "3.27.0-alpha.0",
-    "ember-cli-babel": "^7.18.0",
+    "ember-cli-babel": "^7.26.3",
     "ember-cli-test-info": "^1.0.0",
     "ember-cli-typescript": "^4.0.0"
   },

diff --git a/packages/store/addon/-private/system/backburner.js b/packages/store/addon/-private/system/backburner.js
@@ -6,6 +6,7 @@ import { registerWaiter } from '@ember/test';
 import { DEBUG } from '@glimmer/env';
 import Ember from 'ember';
 
+// TODO: expose Ember._Backburner as `import { _Backburner } from '@ember/runloop'` in ember-rfc176-data + emberjs/ember.js
 const backburner = new Ember._Backburner(['normalizeRelationships', 'syncRelationships', 'finished']);
 
 if (DEBUG) {

diff --git a/packages/store/addon/-private/system/core-store.ts b/packages/store/addon/-private/system/core-store.ts
@@ -7,7 +7,7 @@ import { A } from '@ember/array';
 import { assert, deprecate, inspect, warn } from '@ember/debug';
 import { computed, defineProperty, get, set } from '@ember/object';
 import { assign } from '@ember/polyfills';
-import { run as emberRunLoop } from '@ember/runloop';
+import { _backburner as emberBackburner } from '@ember/runloop';
 import Service from '@ember/service';
 import { registerWaiter, unregisterWaiter } from '@ember/test';
 import { isNone, isPresent, typeOf } from '@ember/utils';
@@ -95,7 +95,6 @@ type Relationship = import('@ember-data/record-data/-private').Relationship;
 type RecordDataClass = typeof import('@ember-data/record-data/-private').RecordData;
 
 let _RecordData: RecordDataClass | undefined;
-const emberRun = emberRunLoop.backburner;
 
 const { ENV } = Ember;
 type AsyncTrackingToken = Readonly<{ label: string; trace: Error | string }>;
@@ -603,7 +602,7 @@ abstract class CoreStore extends Service {
     //   of record-arrays via ember's run loop, not our own.
     //
     //   to remove this, we would need to move to a new `async` API.
-    return emberRun.join(() => {
+    return emberBackburner.join(() => {
       return this._backburner.join(() => {
         let normalizedModelName = normalizeModelName(modelName);
         let properties = assign({}, inputProperties);
@@ -1261,7 +1260,7 @@ abstract class CoreStore extends Service {
 
       internalModel.loadingData(promise);
       if (this._pendingFetch.size === 0) {
-        emberRun.schedule('actions', this, this.flushAllPendingFetches);
+        emberBackburner.schedule('actions', this, this.flushAllPendingFetches);
       }
 
       let fetches = this._pendingFetch;
@@ -2518,7 +2517,7 @@ abstract class CoreStore extends Service {
       resolver: resolver,
     });
 
-    emberRun.scheduleOnce('actions', this, this.flushPendingSave);
+    emberBackburner.scheduleOnce('actions', this, this.flushPendingSave);
   }
 
   /**
@@ -3618,7 +3617,7 @@ abstract class CoreStore extends Service {
       return;
     }
 
-    emberRun.schedule('actions', this, this._flushUpdatedInternalModels);
+    emberBackburner.schedule('actions', this, this._flushUpdatedInternalModels);
   }
 
   _flushUpdatedInternalModels() {