Skip to content

Commit d067678

Browse files
stefanpennerstefanpenner
authored
Stefs cleanup (#4837)
* cleanup tests/unit/model/merge-test * cleanup test/unit/model/relationships * cleanup test/unit/model/rollback-attributes * cleanup test/unit/record-arrays/filtered-record-array * cleanup test/unit/record-arrays/record-array * cleanup tests/unit/model/lifecycle-callbacks * cleanup tests/unit/model/errors * cleanup tests/unit/model/relationships/record-array * cleanup tests/unit/model/relationships/has-many * cleanup tests/unit/model/relationships/belongs-to * cleanup tests/unit/model/lifecycle-callbacks * cleanup tests/unit/adapters/rest-adapter/* * cleanup test/unit/adapters/json-api-adapter/ajax * cleanup test/unit/adapters/build-url-mixin/path-for-type
1 parent 84cf862 commit d067678

16 files changed

Lines changed: 850 additions & 897 deletions

‎tests/unit/adapters/build-url-mixin/path-for-type-test.js‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,45 @@
11
import setupStore from 'dummy/tests/helpers/store';
22
import DS from 'ember-data';
3+
import Ember from 'ember';
34

45
import {module, test} from 'qunit';
56

6-
var env, adapter;
7+
let env, adapter;
8+
let { run } = Ember;
79

810
module("unit/adapters/build-url-mixin/path-for-type - DS.BuildURLMixin#pathForType", {
911
beforeEach() {
1012

1113
// test for overriden pathForType methods which return null path values
12-
var customPathForType = {
14+
let customPathForType = {
1315
pathForType(type) {
1416
if (type === 'rootModel') { return ''; }
1517
return this._super(type);
1618
}
1719
};
1820

19-
var Adapter = DS.Adapter.extend(DS.BuildURLMixin, customPathForType);
21+
let Adapter = DS.Adapter.extend(DS.BuildURLMixin, customPathForType);
2022

2123
env = setupStore({
2224
adapter: Adapter
2325
});
2426

2527
adapter = env.adapter;
28+
},
29+
30+
afterEach() {
31+
run(env.container, 'destroy');
2632
}
2733
});
2834

2935
test('pathForType - works with camelized types', function(assert) {
30-
assert.equal(adapter.pathForType('superUser'), "superUsers");
36+
assert.equal(adapter.pathForType('superUser'), 'superUsers');
3137
});
3238

3339
test('pathForType - works with dasherized types', function(assert) {
34-
assert.equal(adapter.pathForType('super-user'), "superUsers");
40+
assert.equal(adapter.pathForType('super-user'), 'superUsers');
3541
});
3642

3743
test('pathForType - works with underscored types', function(assert) {
38-
assert.equal(adapter.pathForType('super_user'), "superUsers");
44+
assert.equal(adapter.pathForType('super_user'), 'superUsers');
3945
});

‎tests/unit/adapters/json-api-adapter/ajax-test.js‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import {module, test} from 'qunit';
55

66
import DS from 'ember-data';
77

8-
var Person, Place, store, adapter, env;
9-
var run = Ember.run;
8+
let Person, Place, store, adapter, env;
9+
const { run } = Ember;
1010

1111
module("unit/adapters/json-api-adapter/ajax - building requests", {
1212
beforeEach() {
@@ -18,19 +18,19 @@ module("unit/adapters/json-api-adapter/ajax - building requests", {
1818
},
1919

2020
afterEach() {
21-
run(function() {
21+
run(() => {
2222
store.destroy();
2323
env.container.destroy();
2424
});
2525
}
2626
});
2727

28-
test("ajaxOptions() adds Accept when no other headers exist", function(assert) {
29-
var url = 'example.com';
30-
var type = 'GET';
31-
var ajaxOptions = adapter.ajaxOptions(url, type, {});
32-
var receivedHeaders = [];
33-
var fakeXHR = {
28+
test('ajaxOptions() adds Accept when no other headers exist', function(assert) {
29+
let url = 'example.com';
30+
let type = 'GET';
31+
let ajaxOptions = adapter.ajaxOptions(url, type, {});
32+
let receivedHeaders = [];
33+
let fakeXHR = {
3434
setRequestHeader(key, value) {
3535
receivedHeaders.push([key, value]);
3636
}
@@ -39,13 +39,13 @@ test("ajaxOptions() adds Accept when no other headers exist", function(assert) {
3939
assert.deepEqual(receivedHeaders, [['Accept', 'application/vnd.api+json']], 'headers assigned');
4040
});
4141

42-
test("ajaxOptions() adds Accept header to existing headers", function(assert) {
42+
test('ajaxOptions() adds Accept header to existing headers', function(assert) {
4343
adapter.headers = { 'Other-key': 'Other Value' };
44-
var url = 'example.com';
45-
var type = 'GET';
46-
var ajaxOptions = adapter.ajaxOptions(url, type, {});
47-
var receivedHeaders = [];
48-
var fakeXHR = {
44+
let url = 'example.com';
45+
let type = 'GET';
46+
let ajaxOptions = adapter.ajaxOptions(url, type, {});
47+
let receivedHeaders = [];
48+
let fakeXHR = {
4949
setRequestHeader(key, value) {
5050
receivedHeaders.push([key, value]);
5151
}
@@ -54,15 +54,15 @@ test("ajaxOptions() adds Accept header to existing headers", function(assert) {
5454
assert.deepEqual(receivedHeaders, [['Accept', 'application/vnd.api+json'], ['Other-key', 'Other Value']], 'headers assigned');
5555
});
5656

57-
test("ajaxOptions() adds Accept header to existing computed properties headers", function(assert) {
57+
test('ajaxOptions() adds Accept header to existing computed properties headers', function(assert) {
5858
adapter.headers = Ember.computed(function() {
5959
return { 'Other-key': 'Other Value' };
6060
});
61-
var url = 'example.com';
62-
var type = 'GET';
63-
var ajaxOptions = adapter.ajaxOptions(url, type, {});
64-
var receivedHeaders = [];
65-
var fakeXHR = {
61+
let url = 'example.com';
62+
let type = 'GET';
63+
let ajaxOptions = adapter.ajaxOptions(url, type, {});
64+
let receivedHeaders = [];
65+
let fakeXHR = {
6666
setRequestHeader(key, value) {
6767
receivedHeaders.push([key, value]);
6868
}

‎tests/unit/adapters/rest-adapter/ajax-test.js‎

Lines changed: 47 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import DS from 'ember-data';
77
import isEnabled from 'ember-data/-private/features';
88

99
var Person, Place, store, adapter, env;
10-
var run = Ember.run;
10+
const { run } = Ember;
1111

12-
module("unit/adapters/rest-adapter/ajax - building requests", {
12+
module('unit/adapters/rest-adapter/ajax - building requests', {
1313
beforeEach() {
1414
Person = { modelName: 'person' };
1515
Place = { modelName: 'place' };
@@ -19,45 +19,48 @@ module("unit/adapters/rest-adapter/ajax - building requests", {
1919
},
2020

2121
afterEach() {
22-
run(function() {
22+
run(() => {
2323
store.destroy();
2424
env.container.destroy();
2525
});
2626
}
2727
});
2828

29-
test("When an id is searched, the correct url should be generated", function(assert) {
29+
test('When an id is searched, the correct url should be generated', function(assert) {
3030
assert.expect(2);
31-
var count = 0;
31+
32+
let count = 0;
3233

3334
if (isEnabled('ds-improved-ajax')) {
3435
adapter._makeRequest = function(request) {
35-
if (count === 0) { assert.equal(request.url, '/people/1', "should create the correct url"); }
36-
if (count === 1) { assert.equal(request.url, '/places/1', "should create the correct url"); }
36+
if (count === 0) { assert.equal(request.url, '/people/1', 'should create the correct url'); }
37+
if (count === 1) { assert.equal(request.url, '/places/1', 'should create the correct url'); }
3738
count++;
3839
return Ember.RSVP.resolve();
3940
};
4041
} else {
4142
adapter.ajax = function(url, method) {
42-
if (count === 0) { assert.equal(url, '/people/1', "should create the correct url"); }
43-
if (count === 1) { assert.equal(url, '/places/1', "should create the correct url"); }
43+
if (count === 0) { assert.equal(url, '/people/1', 'should create the correct url'); }
44+
if (count === 1) { assert.equal(url, '/places/1', 'should create the correct url'); }
4445
count++;
4546
return Ember.RSVP.resolve();
4647
};
4748
}
4849

49-
run(function() {
50-
adapter.findRecord(store, Person, 1, {});
51-
adapter.findRecord(store, Place, 1, {});
50+
return run(() => {
51+
return Ember.RSVP.Promise.all([
52+
adapter.findRecord(store, Person, 1, {}),
53+
adapter.findRecord(store, Place, 1, {})
54+
])
5255
});
5356
});
5457

55-
test("id's should be sanatized", function(assert) {
58+
test(`id's should be sanatized`, function(assert) {
5659
assert.expect(1);
5760

5861
if (isEnabled('ds-improved-ajax')) {
5962
adapter._makeRequest = function(request) {
60-
assert.equal(request.url, '/people/..%2Fplace%2F1', "should create the correct url");
63+
assert.equal(request.url, '/people/..%2Fplace%2F1', `should create the correct url`);
6164
return Ember.RSVP.resolve();
6265
};
6366
} else {
@@ -66,30 +69,36 @@ test("id's should be sanatized", function(assert) {
6669
return Ember.RSVP.resolve();
6770
};
6871
}
69-
run(function() {
70-
adapter.findRecord(store, Person, '../place/1', {});
71-
});
72+
73+
return run(() => adapter.findRecord(store, Person, '../place/1', {}));
7274
});
7375

74-
test("ajaxOptions() headers are set", function(assert) {
75-
adapter.headers = { 'Content-Type': 'application/json', 'Other-key': 'Other Value' };
76-
var url = 'example.com';
77-
var type = 'GET';
78-
var ajaxOptions = adapter.ajaxOptions(url, type, {});
79-
var receivedHeaders = [];
80-
var fakeXHR = {
76+
test('ajaxOptions() headers are set', function(assert) {
77+
adapter.headers = {
78+
'Content-Type': 'application/json',
79+
'Other-key': 'Other Value'
80+
};
81+
82+
let url = 'example.com';
83+
let type = 'GET';
84+
let ajaxOptions = adapter.ajaxOptions(url, type, {});
85+
let receivedHeaders = [];
86+
let fakeXHR = {
8187
setRequestHeader(key, value) {
8288
receivedHeaders.push([key, value]);
8389
}
8490
};
8591
ajaxOptions.beforeSend(fakeXHR);
86-
assert.deepEqual(receivedHeaders, [['Content-Type', 'application/json'], ['Other-key', 'Other Value']], 'headers assigned');
92+
assert.deepEqual(receivedHeaders, [
93+
['Content-Type', 'application/json'],
94+
['Other-key', 'Other Value']
95+
], 'headers assigned');
8796
});
8897

89-
test("ajaxOptions() do not serializes data when GET", function(assert) {
90-
var url = 'example.com';
91-
var type = 'GET';
92-
var ajaxOptions = adapter.ajaxOptions(url, type, { data: { key: 'value' } });
98+
test('ajaxOptions() do not serializes data when GET', function(assert) {
99+
let url = 'example.com';
100+
let type = 'GET';
101+
let ajaxOptions = adapter.ajaxOptions(url, type, { data: { key: 'value' } });
93102

94103
assert.deepEqual(ajaxOptions, {
95104
context: adapter,
@@ -102,13 +111,13 @@ test("ajaxOptions() do not serializes data when GET", function(assert) {
102111
});
103112
});
104113

105-
test("ajaxOptions() serializes data when not GET", function(assert) {
106-
var url = 'example.com';
107-
var type = 'POST';
108-
var ajaxOptions = adapter.ajaxOptions(url, type, { data: { key: 'value' } });
114+
test('ajaxOptions() serializes data when not GET', function(assert) {
115+
let url = 'example.com';
116+
let type = 'POST';
117+
let ajaxOptions = adapter.ajaxOptions(url, type, { data: { key: 'value' } });
109118

110119
assert.deepEqual(ajaxOptions, {
111-
contentType: "application/json; charset=utf-8",
120+
contentType: 'application/json; charset=utf-8',
112121
context: adapter,
113122
data: '{"key":"value"}',
114123
dataType: 'json',
@@ -117,10 +126,10 @@ test("ajaxOptions() serializes data when not GET", function(assert) {
117126
});
118127
});
119128

120-
test("ajaxOptions() empty data", function(assert) {
121-
var url = 'example.com';
122-
var type = 'POST';
123-
var ajaxOptions = adapter.ajaxOptions(url, type, {});
129+
test('ajaxOptions() empty data', function(assert) {
130+
let url = 'example.com';
131+
let type = 'POST';
132+
let ajaxOptions = adapter.ajaxOptions(url, type, {});
124133

125134
assert.deepEqual(ajaxOptions, {
126135
context: adapter,

‎tests/unit/adapters/rest-adapter/build-query-test.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { module, test } from 'qunit';
22
import DS from 'ember-data';
33

4-
module("unit/adapters/rest-adapter/build-query - building queries");
4+
module('unit/adapters/rest-adapter/build-query - building queries');
55

6-
test("buildQuery() returns an empty query when snapshot has no query params", function(assert) {
6+
test('buildQuery() returns an empty query when snapshot has no query params', function(assert) {
77
const adapter = DS.RESTAdapter.create();
88
const snapshotStub = {};
99

@@ -12,14 +12,14 @@ test("buildQuery() returns an empty query when snapshot has no query params", fu
1212
assert.deepEqual(query, {}, 'query is empty');
1313
});
1414

15-
test("buildQuery - doesn't fail without a snapshot", function(assert) {
15+
test(`buildQuery - doesn't fail without a snapshot`, function(assert) {
1616
const adapter = DS.RESTAdapter.create();
1717
const query = adapter.buildQuery();
1818

1919
assert.deepEqual(query, {}, 'returns an empty query');
2020
});
2121

22-
test("buildQuery() returns query with `include` from snapshot", function(assert) {
22+
test('buildQuery() returns query with `include` from snapshot', function(assert) {
2323
const adapter = DS.RESTAdapter.create();
2424
const snapshotStub = { include: 'comments' };
2525

‎tests/unit/adapters/rest-adapter/detailed-message-test.js‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@ import DS from 'ember-data';
66

77
let adapter, env;
88

9-
module("unit/adapters/rest_adapter/detailed_message_test - DS.RESTAdapter#generatedDetailedMessage", {
10-
9+
module('unit/adapters/rest_adapter/detailed_message_test - DS.RESTAdapter#generatedDetailedMessage', {
1110
beforeEach() {
1211
env = setupStore({ adapter: DS.RESTAdapter });
1312
adapter = env.adapter;
1413
}
15-
1614
});
1715

18-
test("generating a wonderfully friendly error message should work", (assert) => {
16+
test('generating a wonderfully friendly error message should work', function(assert) {
1917
assert.expect(1);
2018

2119
let friendlyMessage = adapter.generatedDetailedMessage(
@@ -28,24 +26,27 @@ test("generating a wonderfully friendly error message should work", (assert) =>
2826
}
2927
);
3028

31-
assert.equal(friendlyMessage, ["Ember Data Request GET /teapots/testing returned a 418",
32-
"Payload (text/plain)",
33-
"I'm a little teapot, short and stout"].join("\n"));
29+
assert.equal(friendlyMessage, [
30+
'Ember Data Request GET /teapots/testing returned a 418',
31+
'Payload (text/plain)',
32+
`I'm a little teapot, short and stout`
33+
].join('\n'));
3434
});
3535

36-
test("generating a friendly error message with a missing content-type header should work", (assert) => {
37-
36+
test('generating a friendly error message with a missing content-type header should work', function(assert) {
3837
let friendlyMessage = adapter.generatedDetailedMessage(
3938
418,
4039
{},
41-
"I'm a little teapot, short and stout",
40+
`I'm a little teapot, short and stout`,
4241
{
43-
url: "/teapots/testing",
44-
method: "GET"
42+
url: '/teapots/testing',
43+
method: 'GET'
4544
}
4645
);
4746

48-
assert.equal(friendlyMessage, ["Ember Data Request GET /teapots/testing returned a 418",
49-
"Payload (Empty Content-Type)",
50-
"I'm a little teapot, short and stout"].join("\n"));
47+
assert.equal(friendlyMessage, [
48+
'Ember Data Request GET /teapots/testing returned a 418',
49+
'Payload (Empty Content-Type)',
50+
`I'm a little teapot, short and stout`
51+
].join('\n'));
5152
});

0 commit comments

Comments
 (0)