Merge remote-tracking branch 'origin/develop' into develop

pull/5269/head
Weblate 2017-09-19 09:34:35 +00:00
commit e8ff3ca7ed
1 changed files with 3 additions and 2 deletions

View File

@ -176,8 +176,9 @@ describe('joining a room', function () {
return Promise.delay(1);
}).then(() => {
// We've joined, expect this to false
expect(roomView.state.joining).toBe(false);
// NB. we don't expect the 'joining' flag to reset at any point:
// it will stay set and we observe whether we have Room object for
// the room and whether our member event shows we're joined.
// now send the room down the /sync pipe
httpBackend.when('GET', '/sync').