PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

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

Browse source
This commit is contained in:
Weblate 2018-08-23 12:53:31 +00:00
commit 7f4227a76e
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
test/components/views/rooms/RoomList-test.js
View file

@ -94,6 +94,7 @@ describe('RoomList', () => {
createRoom({tags: {'m.lowpriority': {}}, name: 'Some unimportant room'}), createRoom({tags: {'m.lowpriority': {}}, name: 'Some unimportant room'}),
createRoom({tags: {'custom.tag': {}}, name: 'Some room customly tagged'}), createRoom({tags: {'custom.tag': {}}, name: 'Some room customly tagged'}),
]; ];
client.getVisibleRooms = client.getRooms;
const roomMap = {}; const roomMap = {};
client.getRooms().forEach((r) => { client.getRooms().forEach((r) => {

1
test/test-utils.js
View file

@ -74,6 +74,7 @@ export function createTestClient() {
getPushActionsForEvent: sinon.stub(), getPushActionsForEvent: sinon.stub(),
getRoom: sinon.stub().returns(mkStubRoom()), getRoom: sinon.stub().returns(mkStubRoom()),
getRooms: sinon.stub().returns([]), getRooms: sinon.stub().returns([]),
getVisibleRooms: sinon.stub().returns([]),
getGroups: sinon.stub().returns([]), getGroups: sinon.stub().returns([]),
loginFlows: sinon.stub(), loginFlows: sinon.stub(),
on: sinon.stub(), on: sinon.stub(),