Merge branch 'develop' into dbkr/new_unread_count_format

2016-01-20 18:53:14 +00:00
parent a24a9d35c4 a0d81fccdb
commit d375804cd6
1 changed files with 2 additions and 2 deletions
@@ -615,11 +615,11 @@ describe("Room", function() {
                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() {
                room.recalculate(userA);
                var name = room.name;
-                expect(name).toEqual("?");
+                expect(name).toEqual("Empty room");
            });

        });