imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into Bubble-bericht

Browse source
This commit is contained in:
Ayush PS 2021-05-07 18:32:38 +05:30
parent f367d617c5
commit c843387043
264 changed files with 7383 additions and 3268 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,7 +29,10 @@ function waitForRoomListStoreUpdate() {
describe('RoomList', () => {
function createRoom(opts) {
const room = new Room(generateRoomId(), null, client.getUserId());
const room = new Room(generateRoomId(), MatrixClientPeg.get(), client.getUserId(), {
// The room list now uses getPendingEvents(), so we need a detached ordering.
pendingEventOrdering: "detached",
});
if (opts) {
Object.assign(room, opts);
}
@ -67,8 +70,9 @@ describe('RoomList', () => {
root = ReactDOM.render(
<DragDropContext>
<WrappedRoomList searchFilter="" onResize={() => {}} />
</DragDropContext>
, parentDiv);
</DragDropContext>,
parentDiv,
);
ReactTestUtils.findRenderedComponentWithType(root, RoomList);
movingRoom = createRoom({name: 'Moving room'});