matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-09-03 08:42:03 +03:00
Code Activity

Fix tests by returning the original promise to avoid the extra trip around the event loop.

Browse Source
This commit is contained in:
David Baker
2016-03-15 14:15:15 +00:00
parent 85f2754300
commit 9f91995f4e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/http-api.js
View File

@@ -271,14 +271,18 @@ module.exports.MatrixHttpApi.prototype = {
if (!queryParams) { queryParams = {}; } if (!queryParams) { queryParams = {}; }
queryParams.access_token = this.opts.accessToken; queryParams.access_token = this.opts.accessToken;
var self = this; var self = this;
return this.request( var request_promise = this.request(
callback, method, path, queryParams, data, localTimeoutMs callback, method, path, queryParams, data, localTimeoutMs
).catch(function(err) { );
request_promise.catch(function(err) {
if (err.errcode == 'M_UNKNOWN_TOKEN') { if (err.errcode == 'M_UNKNOWN_TOKEN') {
self.event_emitter.emit("Session.logged_out"); self.event_emitter.emit("Session.logged_out");
} }
throw err; throw err;
}); });
// return the original promise, otherwise tests break due to it having to
// go around the event loop one more time to process the result of the request
return request_promise;
}, },
/** /**