Skip to content

Commit 3119c09

Browse files
author
pliljegr
committed
CHORE: Modernize integration/ tests and remove run loop calls
1 parent d75ca0e commit 3119c09

9 files changed

+1153
-1072
lines changed

packages/-ember-data/tests/integration/adapter/find-all-test.js

+1
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ module('integration/adapter/find-all - Finding All Records of a Type', function(
153153
);
154154

155155
store.createRecord('person', { name: 'Carsten Nielsen' });
156+
await settled();
156157

157158
await settled();
158159

packages/-ember-data/tests/integration/application-test.js

+3-9
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import Namespace from '@ember/application/namespace';
22
import Service, { inject as service } from '@ember/service';
33
import Controller from '@ember/controller';
44
import Application from '@ember/application';
5-
import { run } from '@ember/runloop';
65
import Store from 'ember-data/store';
76
import { module, test } from 'qunit';
87
import { setupTest } from 'ember-qunit';
@@ -110,12 +109,6 @@ module('integration/application - Attaching initializer', function(hooks) {
110109
this.owner = null;
111110
});
112111

113-
hooks.afterEach(function() {
114-
if (this.application !== null) {
115-
run(this.application, 'destroy');
116-
}
117-
});
118-
119112
test('ember-data initializer is run', async function(assert) {
120113
let ran = false;
121114

@@ -129,7 +122,7 @@ module('integration/application - Attaching initializer', function(hooks) {
129122

130123
this.application = this.TestApplication.create({ autoboot: false });
131124

132-
await run(() => this.application.boot());
125+
await this.application.boot();
133126

134127
assert.ok(ran, 'ember-data initializer was found');
135128
});
@@ -149,7 +142,8 @@ module('integration/application - Attaching initializer', function(hooks) {
149142

150143
this.application = this.TestApplication.create({ autoboot: false });
151144

152-
await run(() => this.application.boot().then(() => (this.owner = this.application.buildInstance())));
145+
await this.application.boot();
146+
this.owner = this.application.buildInstance();
153147

154148
let store = this.owner.lookup('service:store');
155149
assert.ok(

packages/-ember-data/tests/integration/debug-adapter-test.js

+11-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { setupTest } from 'ember-qunit';
22
import { A } from '@ember/array';
33
import { get } from '@ember/object';
4-
import { run } from '@ember/runloop';
54
import Model from '@ember-data/model';
65
import Adapter from '@ember-data/adapter';
6+
import { DebugAdapter } from 'ember-data/-private';
77
import { module, test } from 'qunit';
88
import { settled } from '@ember/test-helpers';
99
import { attr } from '@ember-data/model';
@@ -16,24 +16,25 @@ class Post extends Model {
1616
module('integration/debug-adapter - DS.DebugAdapter', function(hooks) {
1717
setupTest(hooks);
1818

19-
let store, debugAdapter;
19+
let store;
2020

2121
hooks.beforeEach(function() {
2222
let { owner } = this;
2323

2424
owner.register('model:post', Post);
2525
store = owner.lookup('service:store');
26-
debugAdapter = owner.lookup('data-adapter:main');
27-
28-
debugAdapter.reopen({
26+
let _adapter = DebugAdapter.extend({
2927
getModelTypes() {
3028
return A([{ klass: Post, name: 'post' }]);
3129
},
3230
});
31+
owner.register('data-adapter:main', _adapter);
3332
});
3433

3534
test('Watching Model Types', async function(assert) {
3635
assert.expect(5);
36+
let { owner } = this;
37+
let debugAdapter = owner.lookup('data-adapter:main');
3738

3839
function added(types) {
3940
assert.equal(types.length, 1, 'added one type');
@@ -60,6 +61,8 @@ module('integration/debug-adapter - DS.DebugAdapter', function(hooks) {
6061
});
6162

6263
test('Watching Records', async function(assert) {
64+
let { owner } = this;
65+
let debugAdapter = owner.lookup('data-adapter:main');
6366
let addedRecords, updatedRecords, removedIndex, removedCount;
6467

6568
this.owner.register(
@@ -156,7 +159,7 @@ module('integration/debug-adapter - DS.DebugAdapter', function(hooks) {
156159
addedRecords = updatedRecords = [];
157160
removedCount = removedIndex = null;
158161

159-
run(() => post.unloadRecord());
162+
post.unloadRecord();
160163

161164
await settled();
162165

@@ -165,6 +168,8 @@ module('integration/debug-adapter - DS.DebugAdapter', function(hooks) {
165168
});
166169

167170
test('Column names', function(assert) {
171+
let { owner } = this;
172+
let debugAdapter = owner.lookup('data-adapter:main');
168173
class Person extends Model {
169174
@attr()
170175
title;

0 commit comments

Comments
 (0)