Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4579 from vector-im/rav/wait_longer_for_client

Browse Source 
Deflake the joining test
This commit is contained in:
David Baker 2017-07-14 16:43:13 +01:00 committed by GitHub
commit 1690f875ca
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -120,7 +120,7 @@
"karma-junit-reporter": "^0.4.1",
"karma-mocha": "^0.2.2",
"karma-webpack": "^1.7.0",
"matrix-mock-request": "^1.1.0",
"matrix-mock-request": "^1.2.0",
"matrix-react-test-utils": "^0.2.0",
"minimist": "^1.2.0",
"mkdirp": "^0.5.1",

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

@ -103,7 +103,9 @@ describe('joining a room', function () {
httpBackend.when('GET', '/sync')
.respond(200, {});
return httpBackend.flushAllExpected().then(() => {
return httpBackend.flushAllExpected({
timeout: 1000,
}).then(() => {
// wait for the directory requests
httpBackend.when('POST', '/publicRooms').respond(200, {chunk: []});
httpBackend.when('GET', '/thirdparty/protocols').respond(200, {});