Skip to content

Commit 50914d1

Browse files
jmdobryjmdobry
committed
Test cleanup.
1 parent 7be7a17 commit 50914d1

File tree

8 files changed

+41
-23
lines changed

8 files changed

+41
-23
lines changed

‎mocha.start.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
'use strict';
33

44
var assert = require('chai').assert;
5+
assert.equalObjects = function (a, b, m) {
6+
assert.deepEqual(JSON.parse(JSON.stringify(a)), JSON.parse(JSON.stringify(b)), m || 'Objects should be equal!');
7+
};
58
var mocha = require('mocha');
69
var sinon = require('sinon');
710
var JSData = require('js-data');

‎test/create.spec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
describe('DSSqlAdapter#create', function () {
22
it('should create a user in a sql db', function () {
33
var id;
4-
return adapter.create(User, { name: 'John' }).then(function (user) {
4+
return adapter.create(User, {name: 'John'}).then(function (user) {
55
id = user.id;
66
assert.equal(user.name, 'John');
77
assert.isDefined(user.id);
@@ -10,7 +10,7 @@ describe('DSSqlAdapter#create', function () {
1010
.then(function (user) {
1111
assert.equal(user.name, 'John');
1212
assert.isDefined(user.id);
13-
assert.deepEqual(user, { id: id, name: 'John', age: null, profileId: null });
13+
assert.equalObjects(user, {id: id, name: 'John', age: null, profileId: null});
1414
return adapter.destroy(User, user.id);
1515
})
1616
.then(function (user) {

‎test/destroy.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
describe('DSSqlAdapter#destroy', function () {
22
it('should destroy a user from a Sql db', function () {
33
var id;
4-
return adapter.create(User, { name: 'John' })
4+
return adapter.create(User, {name: 'John'})
55
.then(function (user) {
66
id = user.id;
77
return adapter.destroy(User, user.id);

‎test/destroyAll.spec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
describe('DSSqlAdapter#destroyAll', function () {
22
it('should destroy all items', function () {
33
var id;
4-
return adapter.create(User, { name: 'John' })
4+
return adapter.create(User, {name: 'John'})
55
.then(function (user) {
66
id = user.id;
77
return adapter.findAll(User, {
88
name: 'John'
99
});
1010
}).then(function (users) {
1111
assert.equal(users.length, 1);
12-
assert.deepEqual(users[0], { id: id, name: 'John', age: null, profileId: null });
12+
assert.equalObjects(users[0], {id: id, name: 'John', age: null, profileId: null});
1313
return adapter.destroyAll(User, {
1414
name: 'John'
1515
});

‎test/find.spec.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var Promise = require('bluebird');
22
describe('DSSqlAdapter#find', function () {
33
it('should find a user in a Sql db', function () {
44
var id, id2, _user, _post, _comments;
5-
return adapter.create(User, { name: 'John' })
5+
return adapter.create(User, {name: 'John'})
66
.then(function (user) {
77
_user = user;
88
id = user.id;
@@ -13,7 +13,7 @@ describe('DSSqlAdapter#find', function () {
1313
.then(function (user) {
1414
assert.equal(user.name, 'John');
1515
assert.isDefined(user.id);
16-
assert.deepEqual(user, { id: id, name: 'John', age: null, profileId: null });
16+
assert.equalObjects(user, {id: id, name: 'John', age: null, profileId: null});
1717
return adapter.create(Post, {
1818
content: 'test',
1919
userId: user.id
@@ -43,14 +43,14 @@ describe('DSSqlAdapter#find', function () {
4343
_comments.sort(function (a, b) {
4444
return a.content > b.content;
4545
});
46-
return adapter.find(Post, _post.id, { with: ['user', 'comment'] });
46+
return adapter.find(Post, _post.id, {with: ['user', 'comment']});
4747
})
4848
.then(function (post) {
4949
post.comments.sort(function (a, b) {
5050
return a.content > b.content;
5151
});
52-
assert.equal(JSON.stringify(post.user), JSON.stringify(_user));
53-
assert.equal(JSON.stringify(post.comments), JSON.stringify(_comments));
52+
assert.equalObjects(post.user, _user);
53+
assert.equalObjects(post.comments, _comments);
5454
return adapter.destroyAll(Comment);
5555
})
5656
.then(function () {

‎test/findAll.spec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ describe.only('DSSqlAdapter#findAll', function () {
1515
});
1616
}).then(function (users) {
1717
assert.equal(users.length, 1);
18-
assert.deepEqual(users[0], {id: id, name: 'John', age: null, profileId: null});
18+
assert.equalObjects(users[0], {id: id, name: 'John', age: null, profileId: null});
1919
return adapter.destroy(User, id);
2020
}).then(function (destroyedUser) {
2121
assert.isFalse(!!destroyedUser);
@@ -40,7 +40,7 @@ describe.only('DSSqlAdapter#findAll', function () {
4040
});
4141
}).then(function (users) {
4242
assert.equal(users.length, 1);
43-
assert.deepEqual(users[0], {id: id, name: 'John', age: null, profileId: null});
43+
assert.equalObjects(users[0], {id: id, name: 'John', age: null, profileId: null});
4444
return adapter.destroy(User, id);
4545
}).then(function (destroyedUser) {
4646
assert.isFalse(!!destroyedUser);

‎test/update.spec.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
describe('DSSqlAdapter#update', function () {
22
it('should update a user in a Sql db', function () {
33
var id;
4-
return adapter.create(User, { name: 'John' })
4+
return adapter.create(User, {name: 'John'})
55
.then(function (user) {
66
id = user.id;
77
assert.equal(user.name, 'John');
@@ -11,19 +11,19 @@ describe('DSSqlAdapter#update', function () {
1111
.then(function (foundUser) {
1212
assert.equal(foundUser.name, 'John');
1313
assert.isDefined(foundUser.id);
14-
assert.deepEqual(foundUser, { id: id, name: 'John', age: null, profileId: null });
15-
return adapter.update(User, foundUser.id, { name: 'Johnny' });
14+
assert.equalObjects(foundUser, {id: id, name: 'John', age: null, profileId: null});
15+
return adapter.update(User, foundUser.id, {name: 'Johnny'});
1616
})
1717
.then(function (updatedUser) {
1818
assert.equal(updatedUser.name, 'Johnny');
1919
assert.isDefined(updatedUser.id);
20-
assert.deepEqual(updatedUser, { id: id, name: 'Johnny', age: null, profileId: null });
20+
assert.equalObjects(updatedUser, {id: id, name: 'Johnny', age: null, profileId: null});
2121
return adapter.find(User, updatedUser.id);
2222
})
2323
.then(function (foundUser) {
2424
assert.equal(foundUser.name, 'Johnny');
2525
assert.isDefined(foundUser.id);
26-
assert.deepEqual(foundUser, { id: id, name: 'Johnny', age: null, profileId: null });
26+
assert.equalObjects(foundUser, {id: id, name: 'Johnny', age: null, profileId: null});
2727
return adapter.destroy(User, foundUser.id);
2828
})
2929
.then(function (user) {

‎test/updateAll.spec.js‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
describe('DSSqlAdapter#updateAll', function () {
22
it('should update all items', function () {
33
var id, id2;
4-
return adapter.create(User, { name: 'John', age: 20 })
4+
return adapter.create(User, {name: 'John', age: 20})
55
.then(function (user) {
66
id = user.id;
7-
return adapter.create(User, { name: 'John', age: 30 });
7+
return adapter.create(User, {name: 'John', age: 30});
88
}).then(function (user) {
99
id2 = user.id;
1010
return adapter.findAll(User, {
@@ -14,7 +14,12 @@ describe('DSSqlAdapter#updateAll', function () {
1414
users.sort(function (a, b) {
1515
return a.age - b.age;
1616
});
17-
assert.deepEqual(users, [{ id: id, name: 'John', age: 20, profileId: null }, { id: id2, name: 'John', age: 30, profileId: null }]);
17+
assert.equalObjects(users, [{id: id, name: 'John', age: 20, profileId: null}, {
18+
id: id2,
19+
name: 'John',
20+
age: 30,
21+
profileId: null
22+
}]);
1823
return adapter.updateAll(User, {
1924
name: 'Johnny'
2025
}, {
@@ -24,12 +29,17 @@ describe('DSSqlAdapter#updateAll', function () {
2429
users.sort(function (a, b) {
2530
return a.age - b.age;
2631
});
27-
assert.deepEqual(users, [{ id: id, name: 'Johnny', age: 20, profileId: null }, { id: id2, name: 'Johnny', age: 30, profileId: null }]);
32+
assert.equalObjects(users, [{id: id, name: 'Johnny', age: 20, profileId: null}, {
33+
id: id2,
34+
name: 'Johnny',
35+
age: 30,
36+
profileId: null
37+
}]);
2838
return adapter.findAll(User, {
2939
name: 'John'
3040
});
3141
}).then(function (users) {
32-
assert.deepEqual(users, []);
42+
assert.equalObjects(users, []);
3343
assert.equal(users.length, 0);
3444
return adapter.findAll(User, {
3545
name: 'Johnny'
@@ -38,7 +48,12 @@ describe('DSSqlAdapter#updateAll', function () {
3848
users.sort(function (a, b) {
3949
return a.age - b.age;
4050
});
41-
assert.deepEqual(users, [{ id: id, name: 'Johnny', age: 20, profileId: null }, { id: id2, name: 'Johnny', age: 30, profileId: null }]);
51+
assert.equalObjects(users, [{id: id, name: 'Johnny', age: 20, profileId: null}, {
52+
id: id2,
53+
name: 'Johnny',
54+
age: 30,
55+
profileId: null
56+
}]);
4257
return adapter.destroyAll(User);
4358
}).then(function (destroyedUser) {
4459
assert.isFalse(!!destroyedUser);

0 commit comments

Comments
 (0)