OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3649 from vector-im/rav/fix_test_fail 

Fix a flaky test
pull/3646/head
Richard van der Hoff 2017-04-18 14:53:28 +01:00 committed by GitHub
parent 15accf33f5 593e101521
commit 9fd379c97c
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,14 +72,13 @@ describe('joining a room', function () {
var ROOM_ALIAS = '#alias:localhost'; var ROOM_ALIAS = '#alias:localhost';
var ROOM_ID = '!id:localhost'; var ROOM_ID = '!id:localhost';
httpBackend.when('PUT', '/presence/'+encodeURIComponent(USER_ID)+'/status')
.respond(200, {});
httpBackend.when('GET', '/pushrules').respond(200, {}); httpBackend.when('GET', '/pushrules').respond(200, {});
httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' }); httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' });
httpBackend.when('GET', '/sync').respond(200, {}); httpBackend.when('GET', '/sync').respond(200, {});
httpBackend.when('POST', '/publicRooms').respond(200, {chunk: []});
httpBackend.when('GET', '/thirdparty/protocols').respond(200, {}); // note that we deliberately do *not* set an expectation for a
httpBackend.when('GET', '/directory/room/'+encodeURIComponent(ROOM_ALIAS)).respond(200, { room_id: ROOM_ID }); // presence update - setting one makes the first httpBackend.flush
// return before the first /sync arrives.
// start with a logged-in client // start with a logged-in client
localStorage.setItem("mx_hs_url", HS_URL ); localStorage.setItem("mx_hs_url", HS_URL );
@ -94,9 +93,18 @@ describe('joining a room', function () {
matrixChat._setPage(PageTypes.RoomDirectory); matrixChat._setPage(PageTypes.RoomDirectory);
var roomView; var roomView;
// wait for /sync to happen // wait for /sync to happen
return q.delay(1).then(() => { return q.delay(1).then(() => {
return httpBackend.flush(); return httpBackend.flush();
}).then(() => {
// wait for the directory requests
httpBackend.when('POST', '/publicRooms').respond(200, {chunk: []});
httpBackend.when('GET', '/thirdparty/protocols').respond(200, {});
return q.all([
httpBackend.flush('/publicRooms'),
httpBackend.flush('/thirdparty/protocols'),
]);
}).then(() => { }).then(() => {
var roomDir = ReactTestUtils.findRenderedComponentWithType( var roomDir = ReactTestUtils.findRenderedComponentWithType(
matrixChat, RoomDirectory); matrixChat, RoomDirectory);
@ -110,6 +118,7 @@ describe('joining a room', function () {
// that should create a roomview which will start a peek; wait // that should create a roomview which will start a peek; wait
// for the peek. // for the peek.
httpBackend.when('GET', '/directory/room/'+encodeURIComponent(ROOM_ALIAS)).respond(200, { room_id: ROOM_ID });
httpBackend.when('GET', '/rooms/'+encodeURIComponent(ROOM_ID)+"/initialSync") httpBackend.when('GET', '/rooms/'+encodeURIComponent(ROOM_ID)+"/initialSync")
.respond(401, {errcode: 'M_GUEST_ACCESS_FORBIDDEN'}); .respond(401, {errcode: 'M_GUEST_ACCESS_FORBIDDEN'});
return httpBackend.flush(); return httpBackend.flush();