Test Coverage (fetch, updateMany/createMany, addAction(s)) #56
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,8 +18,7 @@ | |
| "axios", | ||
| "rest", | ||
| "adapter", | ||
| "http" | ||
| ], | ||
|
|
||
| "dependencies": { | ||
| "js-data-adapter": "~0.8.1" | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| /* global fetch:true Headers:true */ | ||
|
|
||
| import {utils} from 'js-data' | ||
| import axios from '../node_modules/axios/dist/axios' | ||
|
|
@@ -53,7 +53,7 @@ function buildUrl (url, params) { | |
| } | ||
|
|
||
| val.forEach(function (v) { | ||
| if (toString.call(v) === '[object Date]') { | ||
|
There was a problem hiding this comment.
|
||
| v = v.toISOString() | ||
| } else if (utils.isObject(v)) { | ||
| v = utils.toJson(v) | ||
|
|
@@ -558,20 +558,19 @@ Adapter.extend({ | |
| * @param {Object} config.headers Headers for the request. | ||
| * @param {Object} config.params Querystring for the request. | ||
| * @param {string} config.url Url for the request. | ||
| */ | ||
| fetch (config) { | ||
| const requestConfig = { | ||
|
There was a problem hiding this comment. pruned |
||
| method: config.method, | ||
| // turn the plain headers object into the Fetch Headers object | ||
| headers: new Headers(config.headers || {}) | ||
| } | ||
|
|
||
| if (config.data) { | ||
| requestConfig.body = utils.toJson(config.data) | ||
| } | ||
|
|
||
| return fetch(buildUrl(config.url, config.params), requestConfig) | ||
|
There was a problem hiding this comment. According to the docs argument signature for fetch and Request is equivalent https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch, so it shouldn't need to explicitly create a |
||
| .then((response) => { | ||
| response.config = { | ||
| method: config.method, | ||
|
|
@@ -969,7 +968,7 @@ Adapter.extend({ | |
| sum (mapper, field, query, opts) { | ||
| query || (query = {}) | ||
| opts || (opts = {}) | ||
| if (!utils.isString(field)) { | ||
| throw new Error('field must be a string!') | ||
| } | ||
| opts.params = this.getParams(opts) | ||
|
|
@@ -1064,7 +1063,7 @@ Adapter.extend({ | |
| * | ||
| * // GET /reports/schools/:school_id/teachers | ||
| * addAction('getTeacherReports', { | ||
| * endpoint: 'reports/schools', | ||
| * pathname: 'teachers', | ||
| * method: 'GET' | ||
| * })(store.getMapper('school')) | ||
|
|
@@ -1098,42 +1097,39 @@ export function addAction (name, opts) { | |
| opts.response = opts.response || function (response) { return response } | ||
| opts.responseError = opts.responseError || function (err) { return utils.reject(err) } | ||
| mapper[name] = function (id, _opts) { | ||
| _opts = _opts || {} | ||
| if (utils.isObject(id)) { | ||
| _opts = id | ||
| } | ||
|
There was a problem hiding this comment. I think we still need these 3 lines. To use your test as an example, There was a problem hiding this comment. Ah yeah, I was thinking it would just force the |
||
| utils.fillIn(_opts, opts) | ||
|
There was a problem hiding this comment. Javascript is pretty dynamic-y but it may be worth considering having a limited There was a problem hiding this comment. // at the top of index.js
const ACTION_OPTS = ['foo', 'bar']// in addAction()
utils.fillIn(_opts, utils.pick(opts, ACTION_OPTS)) |
||
| let adapter = this.getAdapter(_opts.adapter || this.defaultAdapter || 'http') | ||
| const config = {} | ||
| config.mapper = this.name | ||
| utils.deepMixIn(config, _opts) | ||
| config.method = config.method || 'GET' | ||
| if (typeof _opts.getEndpoint === 'function') { | ||
| config.url = _opts.getEndpoint(this, _opts) | ||
| } else { | ||
| let args = [ | ||
| _opts.basePath || this.basePath || adapter.basePath, | ||
| adapter.getEndpoint(this, id, _opts) | ||
| ] | ||
| if (utils.isSorN(id)) { | ||
| args.push(id) | ||
| } | ||
| args.push(opts.pathname || name) | ||
| config.url = makePath.apply(null, args) | ||
| } | ||
| return utils.resolve(config) | ||
| .then(_opts.request) | ||
| .then((config) => adapter.HTTP(config)) | ||
| .then((data) => { | ||
| if (data && data.config) { | ||
| data.config.mapper = this.name | ||
| } | ||
| return data | ||
| }) | ||
| .then(_opts.response, _opts.responseError) | ||
| } | ||
| return mapper | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| describe('sum', function () { | ||
| it('should include count=true in query_params', function (done) { | ||
| var Test = this | ||
|
|
||
| setTimeout(function () { | ||
| Test.requests[0].respond(200, { 'Content-Type': 'application/json' }, '{"count": 5}') | ||
| }, 5) | ||
|
|
||
| Test.adapter.count(Test.Post).then(function (result) { | ||
| Test.assert.equal(Test.requests[0].url, 'api/posts?count=true') | ||
| done() | ||
| }) | ||
| }) | ||
| }) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,17 @@ | ||
| describe('createMany', function () { | ||
| it('should createMany', function (done) { | ||
| var Test = this | ||
|
|
||
| setTimeout(function () { | ||
| Test.requests[0].respond(200, { 'Content-Type': 'application/json' }, '') | ||
| }, 5) | ||
|
|
||
| var many = [{ author_id: 2, text: 'bar' }, { author_id: 2, text: 'foo' }] | ||
| Test.Post.createMany(many).then(function (result) { | ||
| Test.assert.equal(Test.requests[0].url, 'api/posts') | ||
| Test.assert.equal(Test.requests[0].method, 'POST') | ||
| Test.assert.equal(Test.requests[0].requestBody, JSON.stringify(many)) | ||
| done() | ||
| }) | ||
| }) | ||
| }) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,36 @@ | ||
| describe('fetch', function () { | ||
| it('should fetch from a URL', function (done) { | ||
| var Test = this | ||
| // Don't test fetch for Node | ||
| try { | ||
| fetch // eslint-disable-line | ||
| } catch (e) { | ||
| return this.skip() | ||
|
There was a problem hiding this comment. Skipping the mocha test because the |
||
| } | ||
| if (Test.TEST_FETCH) { | ||
| Test.xhr = Test.sinon.useFakeXMLHttpRequest() | ||
| Test.requests = [] | ||
| Test.xhr.onCreate = function (xhr) { | ||
| Test.requests.push(xhr) | ||
| } | ||
| } | ||
|
|
||
| setTimeout(function () { | ||
| Test.requests[0].respond(200, { 'Content-Type': 'application/json' }, '{}') | ||
| }, 300) | ||
|
|
||
| Test.adapter.fetch({ | ||
| method: 'get', | ||
| params: { active: true }, | ||
| url: '/api/foos' | ||
| }).then(function (response) { | ||
| var request = Test.requests[0] | ||
| Test.assert.equal(request.method, 'GET') | ||
| Test.assert.equal(request.url, '/api/foos?active=true') | ||
| if (Test.TEST_FETCH) { | ||
| Test.xhr.restore() | ||
| } | ||
| done() | ||
| }) | ||
| }) | ||
| }) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,57 @@ | ||
| describe('static addAction', function () { | ||
| it('should addAction', function (done) { | ||
| var Test = this | ||
| var SchoolMapper = Test.store.defineMapper('school', {}) | ||
|
|
||
| // GET async/reports/schools/:school_id/teachers | ||
| Test.addAction('getTeacherReportsAsync', { | ||
| basePath: 'async/', | ||
| endpoint: 'reports/schools', | ||
| pathname: 'teachers', | ||
| method: 'GET' | ||
| })(SchoolMapper) | ||
|
|
||
| setTimeout(function () { | ||
| Test.requests[0].respond(200, { 'Content-Type': 'text/plain' }, '') | ||
| }, 5) | ||
|
|
||
| SchoolMapper.getTeacherReportsAsync(1234).then(function (response) { | ||
| Test.assert.equal(1, Test.requests.length) | ||
| Test.assert.equal(Test.requests[0].url, 'async/reports/schools/1234/teachers', 'Add action configures basePath, endpoint and pathname') | ||
| Test.assert.equal(Test.requests[0].method, 'GET') | ||
| done() | ||
| }) | ||
| }) | ||
|
|
||
| it('addAction action is callable with params instead of id', function (done) { | ||
| var Test = this | ||
| var adapter = Test.adapter | ||
| var store = new Test.JSData.DataStore() | ||
| store.registerAdapter('http', adapter, { default: true }) | ||
| var SchoolMapper = store.defineMapper('school', {}) | ||
|
|
||
| // GET async/reports/schools/teachers | ||
| Test.addAction('getAllTeacherReportsAsync', { | ||
| basePath: 'async/', | ||
| endpoint: 'reports/schools', | ||
| pathname: 'teachers', | ||
| method: 'GET' | ||
| })(SchoolMapper) | ||
|
|
||
| setTimeout(function () { | ||
| Test.requests[0].respond(200, { 'Content-Type': 'text/plain' }, '') | ||
| }, 5) | ||
|
|
||
| // GET async/reports/schools/teachers?<key>=<value> | ||
| SchoolMapper.getAllTeacherReportsAsync({ | ||
| params: { | ||
| subject: 'esperanto' | ||
| } | ||
| }).then(function (response) { | ||
| Test.assert.equal(1, Test.requests.length) | ||
| Test.assert.equal(Test.requests[0].url, 'async/reports/schools/teachers?subject=esperanto', 'Add action configures basePath, endpoint, pathname, and querystring') | ||
| Test.assert.equal(Test.requests[0].method, 'GET') | ||
| done() | ||
| }) | ||
| }) | ||
|
There was a problem hiding this comment. Here's another test: // GET async/reports/schools/teachers
Test.JSDataHttp.addAction('getAllTeacherReportsAsync', {
basePath: 'async/',
endpoint: 'reports/schools',
pathname: 'teachers',
method: 'GET'
})(SchoolMapper)
setTimeout(function () {
Test.requests[0].respond(200, { 'Content-Type': 'text/plain' }, '')
}, 5)
// GET async/reports/schools/teachers?foo=bar
SchoolMapper.getAllTeacherReportsAsync({
params: {
foo: 'bar'
}
}).then(function (response) {
Test.assert.equal(1, Test.requests.length)
Test.assert.equal(Test.requests[0].url, 'async/reports/schools/teachers?foo=bar', 'Add action configures basePath, endpoint, pathname, and querystring')
Test.assert.equal(Test.requests[0].method, 'GET')
done()
}) |
||
| }) | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
o, that shouldn't have been removed.