Skip to content

Commit 1095157

Browse files
jmdobryjmdobry
committed
Added tests
1 parent 534f6fe commit 1095157

File tree

11 files changed

+422
-108
lines changed

11 files changed

+422
-108
lines changed

‎Gruntfile.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,15 @@ module.exports = function (grunt) {
7878
browsers: ['Firefox', 'PhantomJS'],
7979
options: {
8080
files: [
81+
'bower_components/js-data/dist/js-data.min.js',
8182
'dist/js-data-http.min.js',
8283
'karma.start.js',
8384
'test/**/*.js'
8485
]
8586
}
8687
},
8788
ci: {
88-
browsers: ['Firefox']
89+
browsers: ['Firefox', 'PhantomJS']
8990
}
9091
},
9192
coveralls: {

‎bower.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,8 @@
3131
],
3232
"peerDependencies": {
3333
"js-data": "0.0.1"
34+
},
35+
"devDependencies": {
36+
"js-data": "~0.0.1"
3437
}
3538
}

‎karma.conf.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ module.exports = function (config) {
2020

2121
// list of files / patterns to load in the browser
2222
files: [
23+
'bower_components/js-data/dist/js-data.js',
2324
'dist/js-data-http.js',
2425
'karma.start.js',
2526
'test/**/*.js'

‎karma.start.js‎

Lines changed: 39 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Setup global test variables
2-
var dsHttpAdapter, User;
2+
var dsHttpAdapter, User, datastore, DSUtils, queryTransform, p1, p2, p3, p4, p5;
33

44
// Helper globals
55
var fail = function (msg) {
@@ -33,10 +33,43 @@ var TYPES_EXCEPT_FUNCTION = ['string', 123, 123.123, null, undefined, {}, [], tr
3333

3434
// Setup before each test
3535
beforeEach(function () {
36-
User = {
37-
relationFields: [],
38-
class: 'User',
39-
idAttribute: 'id'
36+
var JSData;
37+
if (!window && typeof module !== 'undefined' && module.exports) {
38+
JSData = require('js-data');
39+
} else {
40+
JSData = window.JSData;
41+
}
42+
43+
queryTransform = function (resourceName, query) {
44+
queryTransform.callCount += 1;
45+
return query;
46+
};
47+
48+
DSUtils = JSData.DSUtils;
49+
datastore = new JSData.DS();
50+
51+
User = datastore.defineResource('user');
52+
dsHttpAdapter = new DSHttpAdapter({
53+
queryTransform: queryTransform
54+
});
55+
queryTransform.callCount = 0;
56+
57+
p1 = { author: 'John', age: 30, id: 5 };
58+
p2 = { author: 'Sally', age: 31, id: 6 };
59+
p3 = { author: 'Mike', age: 32, id: 7 };
60+
p4 = { author: 'Adam', age: 33, id: 8 };
61+
p5 = { author: 'Adam', age: 33, id: 9 };
62+
63+
this.xhr = sinon.useFakeXMLHttpRequest();
64+
// Create an array to store requests
65+
var requests = this.requests = [];
66+
// Keep references to created requests
67+
this.xhr.onCreate = function (xhr) {
68+
requests.push(xhr);
4069
};
41-
dsHttpAdapter = new DSHttpAdapter();
70+
});
71+
72+
afterEach(function () {
73+
// Restore the global timer functions to their native implementations
74+
this.xhr.restore();
4275
});

‎test/create.spec.js‎

Lines changed: 48 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,51 @@
1-
describe('dsHttpAdapter#create', function () {
2-
it('should create a user in http', function (done) {
3-
var id;
4-
dsHttpAdapter.create(User, { name: 'John' }).then(function (user) {
5-
id = user.id;
6-
assert.equal(user.name, 'John');
7-
assert.isString(user.id);
8-
return dsHttpAdapter.find(User, user.id);
9-
})
10-
.then(function (user) {
11-
assert.equal(user.name, 'John');
12-
assert.isString(user.id);
13-
assert.deepEqual(user, { id: id, name: 'John' });
14-
return dsHttpAdapter.destroy(User, user.id);
15-
})
16-
.then(function (destroyedUser) {
17-
assert.isFalse(!!destroyedUser);
1+
describe('DSHttpAdapter.create(resourceConfig, attrs, options)', function () {
2+
3+
it('should make a POST request', function (done) {
4+
var _this = this;
5+
6+
dsHttpAdapter.create({
7+
baseUrl: 'api',
8+
endpoint: 'posts',
9+
getEndpoint: function () {
10+
return 'posts';
11+
}
12+
}, { author: 'John', age: 30 }).then(function (data) {
13+
assert.deepEqual(data, p1, 'post should have been created');
14+
15+
dsHttpAdapter.create({
16+
baseUrl: 'api',
17+
endpoint: 'posts',
18+
getEndpoint: function () {
19+
return 'posts';
20+
}
21+
}, { author: 'John', age: 30 }, { baseUrl: 'api2' }).then(function (data) {
22+
assert.deepEqual(data, p1, 'post should have been created');
23+
24+
assert.equal(queryTransform.callCount, 0, 'queryTransform should not have been called');
25+
1826
done();
19-
})
20-
.catch(done);
27+
}).catch(function (err) {
28+
console.error(err.stack);
29+
done('should not have rejected');
30+
});
31+
32+
setTimeout(function () {
33+
assert.equal(2, _this.requests.length);
34+
assert.equal(_this.requests[1].url, 'api2/posts');
35+
assert.equal(_this.requests[1].requestBody, DSUtils.toJson({ author: 'John', age: 30 }));
36+
_this.requests[1].respond(200, {'Content-Type': 'application/json'}, DSUtils.toJson(p1));
37+
}, 10);
38+
}).catch(function (err) {
39+
console.error(err.stack);
40+
done('should not have rejected');
41+
});
42+
43+
setTimeout(function () {
44+
assert.equal(1, _this.requests.length);
45+
assert.equal(_this.requests[0].url, 'api/posts');
46+
assert.equal(_this.requests[0].method, 'post');
47+
assert.equal(_this.requests[0].requestBody, DSUtils.toJson({ author: 'John', age: 30 }));
48+
_this.requests[0].respond(200, {'Content-Type': 'application/json'}, DSUtils.toJson(p1));
49+
}, 10);
2150
});
2251
});

‎test/destroy.spec.js‎

Lines changed: 46 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,49 @@
1-
describe('dsHttpAdapter#destroy', function () {
2-
it('should destroy a user from http', function (done) {
3-
var id;
4-
dsHttpAdapter.create(User, { name: 'John' })
5-
.then(function (user) {
6-
id = user.id;
7-
return dsHttpAdapter.destroy(User, user.id);
8-
})
9-
.then(function () {
10-
return dsHttpAdapter.find(User, id);
11-
})
12-
.then(function (destroyedUser) {
13-
assert.isFalse(!!destroyedUser);
1+
describe('DSHttpAdapter.destroy(resourceConfig, id, options)', function () {
2+
3+
it('should make a DELETE request', function (done) {
4+
var _this = this;
5+
6+
dsHttpAdapter.destroy({
7+
baseUrl: 'api',
8+
endpoint: 'posts',
9+
getEndpoint: function () {
10+
return 'posts';
11+
}
12+
}, 1).then(function (data) {
13+
assert.deepEqual(data, '1', 'post should have been deleted');
14+
15+
dsHttpAdapter.destroy({
16+
baseUrl: 'api',
17+
endpoint: 'posts',
18+
getEndpoint: function () {
19+
return 'posts';
20+
}
21+
}, 1, { baseUrl: 'api2' }).then(function (data) {
22+
assert.deepEqual(data, '1', 'post should have been deleted');
23+
assert.equal(queryTransform.callCount, 0, 'queryTransform should not have been called');
1424
done();
15-
})
16-
.catch(done);
25+
}).catch(function (err) {
26+
console.error(err.stack);
27+
done('should not have rejected');
28+
});
29+
30+
setTimeout(function () {
31+
assert.equal(2, _this.requests.length);
32+
assert.equal(_this.requests[1].url, 'api2/posts/1');
33+
assert.equal(_this.requests[1].method, 'delete');
34+
_this.requests[1].respond(200, {'Content-Type': 'text/plain'}, '1');
35+
}, 10);
36+
37+
}).catch(function (err) {
38+
console.error(err.stack);
39+
done('should not have rejected');
40+
});
41+
42+
setTimeout(function () {
43+
assert.equal(1, _this.requests.length);
44+
assert.equal(_this.requests[0].url, 'api/posts/1');
45+
assert.equal(_this.requests[0].method, 'delete');
46+
_this.requests[0].respond(200, {'Content-Type': 'text/plain'}, '1');
47+
}, 10);
1748
});
1849
});

‎test/destroyAll.spec.js‎

Lines changed: 52 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,54 @@
1-
describe('dsHttpAdapter#destroyAll', function () {
2-
it('should throw a "Not yet implemented!" error', function () {
3-
assert.throws(function () {
4-
dsHttpAdapter.destroyAll();
5-
}, Error, 'Not yet implemented!');
1+
describe('DSHttpAdapter.destroyAll(resourceConfig, params, options)', function () {
2+
3+
it('should make a DELETE request', function (done) {
4+
var _this = this;
5+
6+
dsHttpAdapter.destroyAll({
7+
baseUrl: 'api',
8+
endpoint: 'posts',
9+
getEndpoint: function () {
10+
return 'posts';
11+
}
12+
}, {}).then(function (data) {
13+
assert.equal('', data, 'posts should have been found');
14+
15+
dsHttpAdapter.destroyAll({
16+
baseUrl: 'api',
17+
endpoint: 'posts',
18+
getEndpoint: function () {
19+
return 'posts';
20+
}
21+
}, {
22+
where: {
23+
author: {
24+
'==': 'John'
25+
}
26+
}
27+
}, { baseUrl: 'api2' }).then(function (data) {
28+
assert.equal('', data, 'posts should have been destroyed');
29+
assert.equal(queryTransform.callCount, 2, 'queryTransform should have been called');
30+
done();
31+
}).catch(function (err) {
32+
console.error(err.stack);
33+
done('should not have rejected');
34+
});
35+
36+
setTimeout(function () {
37+
assert.equal(2, _this.requests.length);
38+
assert.equal(_this.requests[1].url, 'api2/posts?where=%7B%22author%22:%7B%22%3D%3D%22:%22John%22%7D%7D');
39+
assert.equal(_this.requests[1].method, 'delete');
40+
_this.requests[1].respond(204);
41+
}, 10);
42+
}).catch(function (err) {
43+
console.error(err.stack);
44+
done('should not have rejected');
45+
});
46+
47+
setTimeout(function () {
48+
assert.equal(1, _this.requests.length);
49+
assert.equal(_this.requests[0].url, 'api/posts');
50+
assert.equal(_this.requests[0].method, 'delete');
51+
_this.requests[0].respond(204);
52+
}, 10);
653
});
754
});

‎test/find.spec.js‎

Lines changed: 80 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,83 @@
1-
describe('dsHttpAdapter#find', function () {
2-
it('should find a user in http', function (done) {
3-
var id;
4-
dsHttpAdapter.create(User, { name: 'John' })
5-
.then(function (user) {
6-
id = user.id;
7-
assert.equal(user.name, 'John');
8-
assert.isString(user.id);
9-
return dsHttpAdapter.find(User, user.id);
10-
})
11-
.then(function (user) {
12-
assert.equal(user.name, 'John');
13-
assert.isString(user.id);
14-
assert.deepEqual(user, { id: id, name: 'John' });
15-
return dsHttpAdapter.destroy(User, id);
16-
})
17-
.then(function (destroyedUser) {
18-
assert.isFalse(!!destroyedUser);
1+
describe('DSHttpAdapter.find(resourceConfig, id, options)', function () {
2+
3+
it('should make a GET request', function (done) {
4+
var _this = this;
5+
6+
dsHttpAdapter.find({
7+
baseUrl: 'api',
8+
endpoint: 'posts',
9+
getEndpoint: function () {
10+
return 'posts';
11+
}
12+
}, 1).then(function (data) {
13+
assert.deepEqual(data, p1, 'post should have been found');
14+
15+
dsHttpAdapter.find({
16+
baseUrl: 'api',
17+
endpoint: 'posts',
18+
getEndpoint: function () {
19+
return 'posts';
20+
}
21+
}, 1, { baseUrl: 'api2' }).then(function (data) {
22+
assert.deepEqual(data, p1, 'post should have been found');
23+
assert.equal(queryTransform.callCount, 0, 'queryTransform should not have been called');
1924
done();
20-
})
21-
.catch(done);
25+
}).catch(function (err) {
26+
console.error(err.stack);
27+
done('should not have rejected');
28+
});
29+
30+
setTimeout(function () {
31+
assert.equal(2, _this.requests.length);
32+
assert.equal(_this.requests[1].url, 'api2/posts/1');
33+
assert.equal(_this.requests[1].method, 'get');
34+
_this.requests[1].respond(200, { 'Content-Type': 'application/json' }, JSON.stringify(p1));
35+
}, 10);
36+
}).catch(function (err) {
37+
console.error(err.stack);
38+
done('should not have rejected');
39+
});
40+
41+
setTimeout(function () {
42+
assert.equal(1, _this.requests.length);
43+
assert.equal(_this.requests[0].url, 'api/posts/1');
44+
assert.equal(_this.requests[0].method, 'get');
45+
_this.requests[0].respond(200, { 'Content-Type': 'application/json' }, JSON.stringify(p1));
46+
}, 10);
47+
});
48+
49+
it('should use default configs', function (done) {
50+
var _this = this;
51+
52+
dsHttpAdapter.defaults.httpConfig.params = { test: 'test' };
53+
dsHttpAdapter.defaults.httpConfig.headers = { Authorization: 'test' };
54+
55+
dsHttpAdapter.find({
56+
baseUrl: 'api',
57+
endpoint: 'posts',
58+
getEndpoint: function () {
59+
return 'posts';
60+
}
61+
}, 1).then(function (data) {
62+
assert.deepEqual(data, p1, 'post should have been found');
63+
64+
delete dsHttpAdapter.defaults.httpConfig.params;
65+
delete dsHttpAdapter.defaults.httpConfig.headers;
66+
done();
67+
}).catch(function (err) {
68+
console.error(err.stack);
69+
done('should not have rejected');
70+
});
71+
72+
setTimeout(function () {
73+
assert.equal(1, _this.requests.length);
74+
assert.equal(_this.requests[0].url, 'api/posts/1?test=test');
75+
assert.equal(_this.requests[0].method, 'get');
76+
assert.deepEqual({
77+
Authorization: 'test',
78+
Accept: 'application/json, text/plain, */*'
79+
}, _this.requests[0].requestHeaders);
80+
_this.requests[0].respond(200, { 'Content-Type': 'application/json' }, JSON.stringify(p1));
81+
}, 10);
2282
});
2383
});

0 commit comments

Comments
 (0)