Merge pull request #345 from orbitjs/fix-test-support

dgeb · web-flow · commit 770dc3c4a751 · 2021-07-05T16:38:41.000-04:00
Improve typings for testing
diff --git a/package.json b/package.json
@@ -55,6 +55,7 @@
     "@glimmer/component": "^1.0.3",
     "@types/ember": "^3.16.0",
     "@types/ember-qunit": "^3.4.13",
+    "@types/ember-resolver": "^5.0.10",
     "@types/ember__test": "^3.16.1",
     "@types/ember__test-helpers": "^1.7.3",
     "@types/qunit": "^2.11.1",
diff --git a/tests/dummy/app/app.ts b/tests/dummy/app/app.ts
diff --git a/tests/integration/cache-test.ts b/tests/integration/cache-test.ts
@@ -2,15 +2,21 @@ import { Planet, Moon, Star } from 'dummy/tests/support/dummy-models';
 import { Cache, Store } from 'ember-orbit';
 import { createStore } from 'dummy/tests/support/store';
 import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
 import { waitForSource } from 'ember-orbit/test-support';
 
 module('Integration - Cache', function (hooks) {
+  setupTest(hooks);
+
   let store: Store;
   let cache: Cache;
 
   hooks.beforeEach(function () {
-    const models = { planet: Planet, moon: Moon, star: Star };
-    store = createStore({ models }).fork();
+    store = createStore(this.owner, {
+      planet: Planet,
+      moon: Moon,
+      star: Star
+    }).fork();
     cache = store.cache;
   });
 
diff --git a/tests/integration/config-test.ts b/tests/integration/config-test.ts
@@ -1,15 +1,16 @@
 import { Store } from 'ember-orbit';
 import { Planet, Moon, Star } from 'dummy/tests/support/dummy-models';
-import { createOwner, createStore } from 'dummy/tests/support/store';
+import { createStore } from 'dummy/tests/support/store';
 import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
 
 module('Integration - Config', function (hooks) {
-  let owner: any;
+  setupTest(hooks);
+
   let store: Store;
 
   hooks.beforeEach(function () {
-    owner = createOwner();
-    owner.register(
+    this.owner.register(
       'config:environment',
       {
         orbit: {
@@ -38,41 +39,41 @@ module('Integration - Config', function (hooks) {
       { instantiate: false }
     );
     const models = { planet: Planet, moon: Moon, star: Star };
-    store = createStore({ models, owner });
+    store = createStore(this.owner, models);
   });
 
   test('registrations respect config', async function (assert) {
-    const schema = owner.lookup('service:data-schema');
-    const keyMap = owner.lookup('service:orbit-key-map');
-    const normalizer = owner.lookup('service:orbit-normalizer');
-    const validatorFor = owner.lookup('service:orbit-validator');
+    const schema = this.owner.lookup('service:data-schema');
+    const keyMap = this.owner.lookup('service:orbit-key-map');
+    const normalizer = this.owner.lookup('service:orbit-normalizer');
+    const validatorFor = this.owner.lookup('service:orbit-validator');
 
     assert.equal(
-      owner.lookup('service:orbit-store'),
+      this.owner.lookup('service:orbit-store'),
       store,
       'store service registration is named from configuration'
     );
     assert.ok(
-      owner.resolveRegistration('orbit-model:planet'),
+      this.owner.resolveRegistration('orbit-model:planet'),
       'model factory registration is named from configuration'
     );
     assert.strictEqual(
-      owner.lookup('orbit-source:store'),
+      this.owner.lookup('orbit-source:store'),
       store.source,
       'source registation is named from configuration'
     );
     assert.strictEqual(
-      owner.lookup('orbit-source:store').schema,
+      this.owner.lookup('orbit-source:store').schema,
       schema,
       'schema is injected into sources'
     );
     assert.strictEqual(
-      owner.lookup('orbit-source:store').keyMap,
+      this.owner.lookup('orbit-source:store').keyMap,
       keyMap,
       'keyMap is injected into sources'
     );
     assert.strictEqual(
-      owner.lookup('orbit-source:store').validatorFor,
+      this.owner.lookup('orbit-source:store').validatorFor,
       validatorFor,
       'validatorFor is injected into sources'
     );
@@ -87,17 +88,17 @@ module('Integration - Config', function (hooks) {
       'keyMap is injected into normalizer'
     );
     assert.strictEqual(
-      owner.lookup('orbit-source:store').queryBuilder.$normalizer,
+      this.owner.lookup('orbit-source:store').queryBuilder.$normalizer,
       normalizer,
       'normalizer is injected into sources and assigned to query builders'
     );
     assert.strictEqual(
-      owner.lookup('orbit-source:store').transformBuilder.$normalizer,
+      this.owner.lookup('orbit-source:store').transformBuilder.$normalizer,
       normalizer,
       'normalizer is injected into sources and assigned to transform builders'
     );
     assert.ok(
-      owner.lookup('service:data-schema'),
+      this.owner.lookup('service:data-schema'),
       'unconfigured lookup type falls back to default configuration'
     );
   });
diff --git a/tests/integration/model-fields-test.ts b/tests/integration/model-fields-test.ts
@@ -10,19 +10,21 @@ import { createStore } from 'dummy/tests/support/store';
 import { module, test } from 'qunit';
 
 import { normalizeModelFields } from 'ember-orbit/-private/utils/model-fields';
+import { setupTest } from 'ember-qunit';
 
 module('Integration - normalizeModelFields', function (hooks) {
+  setupTest(hooks);
+
   let store: Store;
-  const models = {
-    planet: Planet,
-    moon: Moon,
-    star: Star,
-    binaryStar: BinaryStar,
-    planetarySystem: PlanetarySystem
-  };
 
   hooks.beforeEach(function () {
-    store = createStore({ models });
+    store = createStore(this.owner, {
+      planet: Planet,
+      moon: Moon,
+      star: Star,
+      binaryStar: BinaryStar,
+      planetarySystem: PlanetarySystem
+    });
   });
 
   test('#normalizeModelFields', async function (assert) {
diff --git a/tests/integration/model-test.ts b/tests/integration/model-test.ts
@@ -14,8 +14,11 @@ import { module, test } from 'qunit';
 import { getOwner } from '@ember/application';
 import { waitForSource } from 'ember-orbit/test-support';
 import { InitializedRecord } from '@orbit/records';
+import { setupTest } from 'ember-qunit';
 
 module('Integration - Model', function (hooks) {
+  setupTest(hooks);
+
   let store: Store;
 
   hooks.beforeEach(function () {
@@ -27,7 +30,7 @@ module('Integration - Model', function (hooks) {
       binaryStar: BinaryStar,
       planetarySystem: PlanetarySystem
     };
-    store = createStore({ models }).fork();
+    store = createStore(this.owner, models).fork();
   });
 
   test('models are assigned the same owner as the store', async function (assert) {
diff --git a/tests/integration/rendering-test.ts b/tests/integration/rendering-test.ts
@@ -15,7 +15,7 @@ module('Rendering', function (hooks) {
 
   hooks.beforeEach(function () {
     const models = { planet: Planet, moon: Moon };
-    store = createStore({ models }).fork();
+    store = createStore(this.owner, models).fork();
     cache = store.cache;
   });
 
diff --git a/tests/integration/store-test.ts b/tests/integration/store-test.ts
@@ -10,20 +10,22 @@ import {
 import { createStore } from 'dummy/tests/support/store';
 import { buildTransform } from '@orbit/data';
 import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
 
 module('Integration - Store', function (hooks) {
+  setupTest(hooks);
+
   let store: Store;
-  const models = {
-    planet: Planet,
-    moon: Moon,
-    star: Star,
-    ocean: Ocean,
-    binaryStar: BinaryStar,
-    planetarySystem: PlanetarySystem
-  };
 
   hooks.beforeEach(function () {
-    store = createStore({ models });
+    store = createStore(this.owner, {
+      planet: Planet,
+      moon: Moon,
+      star: Star,
+      ocean: Ocean,
+      binaryStar: BinaryStar,
+      planetarySystem: PlanetarySystem
+    });
   });
 
   test('exposes properties from source', function (assert) {
diff --git a/tests/integration/wait-for-source-helper-test.ts b/tests/integration/wait-for-source-helper-test.ts
@@ -1,4 +1,5 @@
 import { Store } from 'ember-orbit';
+import { MemorySource } from '@orbit/memory';
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { Planet } from 'dummy/tests/support/dummy-models';
@@ -11,26 +12,26 @@ module('waitForSource helper', function (hooks) {
   setupTest(hooks);
 
   hooks.beforeEach(function () {
-    store = createStore({ models: { planet: Planet } });
+    store = createStore(this.owner, { planet: Planet });
   });
 
   test('it resolves once all the pending requests to the given source have synced', async function (assert) {
-    const backup = createStore({ models: { planet: Planet } });
+    const backup = new MemorySource({ schema: store.schema });
 
     store.on('update', (transform) => {
-      backup.update(transform);
+      backup.sync(transform);
     });
 
     await store.addRecord({ type: 'planet', name: 'Earth' });
 
     await waitForSource(backup);
 
-    assert.ok(backup.source.requestQueue.empty);
-    assert.ok(backup.source.syncQueue.empty);
+    assert.ok(backup.requestQueue.empty);
+    assert.ok(backup.syncQueue.empty);
   });
 
   test('it looks up data sources by name if a string is provided', async function (assert) {
-    const backup = createStore({ models: { planet: Planet } });
+    const backup = new MemorySource({ schema: store.schema });
 
     this.owner.register('data-source:backup', backup, { instantiate: false });
 
@@ -42,7 +43,7 @@ module('waitForSource helper', function (hooks) {
 
     await waitForSource('backup');
 
-    assert.ok(backup.source.requestQueue.empty);
-    assert.ok(backup.source.syncQueue.empty);
+    assert.ok(backup.requestQueue.empty);
+    assert.ok(backup.syncQueue.empty);
   });
 });
diff --git a/tests/support/owner.js b/tests/support/owner.js
diff --git a/tests/support/store.ts b/tests/support/store.ts
@@ -1,35 +1,23 @@
-import Ember from 'ember';
+import { Dict } from '@orbit/utils';
+import { Model, ModelSettings } from 'ember-orbit';
 import { initialize as initializeConfig } from 'ember-orbit/initializers/ember-orbit-config';
 import { initialize as initializeServices } from 'ember-orbit/initializers/ember-orbit-services';
-import Owner from './owner';
 
-export function createOwner() {
-  const registry = new Ember.Registry();
-  const owner = Owner.create({ __registry__: registry });
-  const container = registry.container({ owner });
-
-  owner.__container__ = container;
-
-  return owner;
-}
-
-export function createStore(options) {
-  options = options || {};
-
-  const owner = options.owner || createOwner();
+export function createStore(
+  owner: any,
+  models: Dict<new (settings: ModelSettings) => Model>
+) {
   initializeConfig(owner);
   initializeServices(owner);
   let orbitConfig = owner.lookup('ember-orbit:config');
 
-  const { models } = options;
   if (models) {
-    let types = [];
-    Object.keys(models).forEach((type) => {
+    let types: string[] = [];
+    Object.keys(models).forEach((type: string) => {
       owner.register(`${orbitConfig.types.model}:${type}`, models[type]);
       types.push(type);
     });
 
-    // console.log(types);
     owner.register('ember-orbit-model-names:main', types, {
       instantiate: false
     });
diff --git a/yarn.lock b/yarn.lock
@@ -1405,6 +1405,13 @@
     "@types/ember-test-helpers" "*"
     "@types/qunit" "*"
 
+"@types/ember-resolver@^5.0.10":
+  version "5.0.10"
+  resolved "https://registry.yarnpkg.com/@types/ember-resolver/-/ember-resolver-5.0.10.tgz#bb265571a9cea9c4e6b095c8318df4e7f7837d5f"
+  integrity sha512-NTN4blgVUXi0wE6XTsuUjks15cI6em4sdTcgDlE8FvL8gkrxQFLSByyKDTBofHCncM6LwZcHz/eVVm13rwfC2w==
+  dependencies:
+    "@types/ember" "*"
+
 "@types/ember-test-helpers@*":
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/@types/ember-test-helpers/-/ember-test-helpers-1.0.9.tgz#4279c5f3b390f25fbfb3f9f210785d36a336b8a7"
