gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Extend timeouts in joining tests again 

this seems to work? maybe?
This commit is contained in:
Richard van der Hoff 2017-06-15 16:01:26 +01:00
parent 43f56483aa
commit a28af8bcc6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/app-tests/joining.js
View File

@ -119,8 +119,8 @@ describe('joining a room', function () {
httpBackend.when('POST', '/publicRooms').respond(200, {chunk: []}); httpBackend.when('POST', '/publicRooms').respond(200, {chunk: []});
httpBackend.when('GET', '/thirdparty/protocols').respond(200, {}); httpBackend.when('GET', '/thirdparty/protocols').respond(200, {});
return q.all([ return q.all([
httpBackend.flush('/publicRooms'),
httpBackend.flush('/thirdparty/protocols'), httpBackend.flush('/thirdparty/protocols'),
httpBackend.flush('/publicRooms'),
]); ]);
}).then(() => { }).then(() => {
var roomDir = ReactTestUtils.findRenderedComponentWithType( var roomDir = ReactTestUtils.findRenderedComponentWithType(

4
test/mock-request.js
View File

@ -37,7 +37,7 @@ HttpBackend.prototype = {
* @param {string} path The path to flush (optional) default: all. * @param {string} path The path to flush (optional) default: all.
* @param {integer} numToFlush The number of things to flush (optional), default: all. * @param {integer} numToFlush The number of things to flush (optional), default: all.
* @param {integer=} waitTime The time (in ms) to wait for a request to happen. * @param {integer=} waitTime The time (in ms) to wait for a request to happen.
* default: 5 * default: 100
* *
* @return {Promise} resolves when there is nothing left to flush, with the * @return {Promise} resolves when there is nothing left to flush, with the
* number of requests flushed * number of requests flushed
@ -47,7 +47,7 @@ HttpBackend.prototype = {
const self = this; const self = this;
let flushed = 0; let flushed = 0;
if (waitTime === undefined) { if (waitTime === undefined) {
waitTime = 10; waitTime = 100;
} }
function log(msg) { function log(msg) {