Skip to content

Commit 3d72607

Browse files
jmdobryjmdobry
committed
Test cleanup.
1 parent ea0c5af commit 3d72607

7 files changed

+28
-26
lines changed

Diff for: ‎mocha.start.js

+3
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 JSData = require('js-data');
710
JSData.DSUtils.Promise = require('bluebird');

Diff for: ‎test/create.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
describe('DSMongoDBAdapter#create', function () {
22
it('should create a user in MongoDB', 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('DSMongoDBAdapter#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' });
13+
assert.equalObjects(user, {_id: id, name: 'John'});
1414
return adapter.destroy(User, user._id);
1515
})
1616
.then(function (user) {

Diff for: ‎test/destroy.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
describe('DSMongoDBAdapter#destroy', function () {
22
it('should destroy a user from MongoDB', 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);

Diff for: ‎test/find.spec.js

+7-8
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ describe('DSMongoDBAdapter#find', function () {
1212
id = user._id;
1313
return adapter.find(User, id.toString());
1414
}).then(function (user) {
15-
assert.deepEqual(user, {_id: id, name: 'John'});
15+
assert.equalObjects(user, {_id: id, name: 'John'});
1616
return adapter.destroy(User, id);
1717
}).then(function (destroyedUser) {
1818
assert.isFalse(!!destroyedUser);
@@ -32,15 +32,15 @@ describe('DSMongoDBAdapter#find', function () {
3232
assert.equal(typeof id, 'string');
3333
return adapter.find(User, id);
3434
}).then(function (user) {
35-
assert.deepEqual(user, {_id: id, name: 'John'});
35+
assert.equalObjects(user, {_id: id, name: 'John'});
3636
return adapter.destroy(User, id);
3737
}).then(function (destroyedUser) {
3838
assert.isFalse(!!destroyedUser);
3939
});
4040
});
4141
it('should find a user with relations', function () {
4242
var id, id2, _user, _post, _comments;
43-
return adapter.create(User, { name: 'John' })
43+
return adapter.create(User, {name: 'John'})
4444
.then(function (user) {
4545
_user = user;
4646
id = user._id;
@@ -51,7 +51,7 @@ describe('DSMongoDBAdapter#find', function () {
5151
.then(function (user) {
5252
assert.equal(user.name, 'John');
5353
assert.isDefined(user._id);
54-
assert.equal(JSON.stringify(user), JSON.stringify({ _id: id, name: 'John' }));
54+
assert.equalObjects(user, {_id: id, name: 'John'});
5555
return adapter.create(Post, {
5656
content: 'test',
5757
userId: user._id
@@ -81,15 +81,14 @@ describe('DSMongoDBAdapter#find', function () {
8181
_comments.sort(function (a, b) {
8282
return a.content > b.content;
8383
});
84-
return adapter.find(Post, _post._id, { with: ['user', 'comment'] });
84+
return adapter.find(Post, _post._id, {'with': ['user', 'comment']});
8585
})
8686
.then(function (post) {
8787
post.comments.sort(function (a, b) {
8888
return a.content > b.content;
8989
});
90-
assert.equal(post.user._id, _user._id);
91-
assert.equal(post.user.name, _user.name);
92-
assert.deepEqual(JSON.parse(JSON.stringify(post.comments)), JSON.parse(JSON.stringify(_comments)));
90+
assert.equalObjects(post.user, _user);
91+
assert.equalObjects(post.comments, _comments);
9392
return adapter.destroyAll(Comment);
9493
})
9594
.then(function () {

Diff for: ‎test/findAll.spec.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ describe('DSMongoDBAdapter#findAll', function () {
77
age: 30
88
}).then(function (users) {
99
assert.equal(users.length, 0);
10-
return adapter.create(User, { name: 'John' });
10+
return adapter.create(User, {name: 'John'});
1111
}).then(function (user) {
1212
id = user._id;
1313
return adapter.findAll(User, {
1414
name: 'John'
1515
});
1616
}).then(function (users) {
1717
assert.equal(users.length, 1);
18-
assert.deepEqual(users[0], { _id: id, name: 'John' });
18+
assert.equalObjects(users[0], {_id: id, name: 'John'});
1919
return adapter.destroy(User, id);
2020
}).then(function (destroyedUser) {
2121
assert.isFalse(!!destroyedUser);
@@ -32,15 +32,15 @@ describe('DSMongoDBAdapter#findAll', function () {
3232
}
3333
}).then(function (users) {
3434
assert.equal(users.length, 0);
35-
return adapter.create(User, { name: 'John' });
35+
return adapter.create(User, {name: 'John'});
3636
}).then(function (user) {
3737
id = user._id;
3838
return adapter.findAll(User, {
3939
name: 'John'
4040
});
4141
}).then(function (users) {
4242
assert.equal(users.length, 1);
43-
assert.deepEqual(users[0], { _id: id, name: 'John' });
43+
assert.equalObjects(users[0], {_id: id, name: 'John'});
4444
return adapter.destroy(User, id);
4545
}).then(function (destroyedUser) {
4646
assert.isFalse(!!destroyedUser);

Diff for: ‎test/update.spec.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
describe('DSMongoDBAdapter#update', function () {
22
it('should update a user in MongoDB', 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('DSMongoDBAdapter#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' });
15-
return adapter.update(User, foundUser._id, { name: 'Johnny' });
14+
assert.equalObjects(foundUser, {_id: id, name: 'John'});
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' });
20+
assert.equalObjects(updatedUser, {_id: id, name: 'Johnny'});
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' });
26+
assert.equalObjects(foundUser, {_id: id, name: 'Johnny'});
2727
return adapter.destroy(User, foundUser._id);
2828
})
2929
.then(function (user) {

Diff for: ‎test/updateAll.spec.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
describe('DSMongoDBAdapter#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,7 @@ describe('DSMongoDBAdapter#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 }, { _id: id2, name: 'John', age: 30 }]);
17+
assert.equalObjects(users, [{_id: id, name: 'John', age: 20}, {_id: id2, name: 'John', age: 30}]);
1818
return adapter.updateAll(User, {
1919
name: 'Johnny'
2020
}, {
@@ -24,12 +24,12 @@ describe('DSMongoDBAdapter#updateAll', function () {
2424
users.sort(function (a, b) {
2525
return a.age - b.age;
2626
});
27-
assert.deepEqual(users, [{ _id: id, name: 'Johnny', age: 20 }, { _id: id2, name: 'Johnny', age: 30 }]);
27+
assert.equalObjects(users, [{_id: id, name: 'Johnny', age: 20}, {_id: id2, name: 'Johnny', age: 30}]);
2828
return adapter.findAll(User, {
2929
name: 'John'
3030
});
3131
}).then(function (users) {
32-
assert.deepEqual(users, []);
32+
assert.equalObjects(users, []);
3333
assert.equal(users.length, 0);
3434
return adapter.findAll(User, {
3535
name: 'Johnny'
@@ -38,7 +38,7 @@ describe('DSMongoDBAdapter#updateAll', function () {
3838
users.sort(function (a, b) {
3939
return a.age - b.age;
4040
});
41-
assert.deepEqual(users, [{ _id: id, name: 'Johnny', age: 20 }, { _id: id2, name: 'Johnny', age: 30 }]);
41+
assert.equalObjects(users, [{_id: id, name: 'Johnny', age: 20}, {_id: id2, name: 'Johnny', age: 30}]);
4242
return adapter.destroyAll(User);
4343
}).then(function (destroyedUser) {
4444
assert.isFalse(!!destroyedUser);

0 commit comments

Comments
 (0)