Merge branch 'develop' into err

This commit is contained in:
Ayush PS
2021-05-07 18:37:23 +05:30
parent d1f23fb994
commit b90a1de178
264 changed files with 7383 additions and 3268 deletions

View File

@@ -178,7 +178,7 @@ describe('editor/deserialize', function() {
const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
expect(parts.length).toBe(3);
expect(parts[0]).toStrictEqual({type: "plain", text: "Try "});
expect(parts[1]).toStrictEqual({type: "room-pill", text: "#room:hs.tld"});
expect(parts[1]).toStrictEqual({type: "room-pill", text: "#room:hs.tld", resourceId: "#room:hs.tld"});
expect(parts[2]).toStrictEqual({type: "plain", text: "?"});
});
it('@room pill', function() {