kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

simplifies assignment of default options

Browse source
This commit is contained in:
Filipa Lacerda 2017-03-22 12:37:38 +00:00
parent 269adbf9db
commit 45b2c63fdf
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/lib/utils/poll.js
View file

@ -32,9 +32,8 @@ import httpStatusCodes from './http_status';
*/
export default class Poll {
constructor(options = {}) {
this.options = Object.assign({}, {
data: {},
}, options);
this.options = options;
this.options.data = options.data || {};
this.intervalHeader = 'POLL-INTERVAL';
}

2
spec/javascripts/lib/utils/poll_spec.js
View file

@ -109,12 +109,14 @@ describe('Poll', () => {
new Poll({
resource: service,
method: 'fetch',
data: { page: 1 },
successCallback: callbacks.success,
errorCallback: callbacks.error,
}).makeRequest();
setTimeout(() => {
expect(service.fetch.calls.count()).toEqual(2);
expect(service.fetch).toHaveBeenCalledWith({ page: 1 });
expect(callbacks.success).toHaveBeenCalled();
expect(callbacks.error).not.toHaveBeenCalled();
done();