1
0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-01 04:43:29 +03:00

Merge branch 'develop' into dbkr/new_unread_count_format

This commit is contained in:
David Baker
2016-01-20 18:53:14 +00:00

View File

@@ -615,11 +615,11 @@ describe("Room", function() {
expect(name).toEqual(userA); expect(name).toEqual(userA);
}); });
it("should return '?' if there is no name, alias or members in the room.", it("should return 'Empty room' if there is no name, alias or members in the room.",
function() { function() {
room.recalculate(userA); room.recalculate(userA);
var name = room.name; var name = room.name;
expect(name).toEqual("?"); expect(name).toEqual("Empty room");
}); });
}); });