From 6df9d08dc19f687e184b052750ce87080a186525 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Wed, 20 Jan 2016 15:59:34 +0000
Subject: [PATCH 1/3] Fix tests

---
 spec/unit/room.spec.js | 38 ++++++++++++++------------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/spec/unit/room.spec.js b/spec/unit/room.spec.js
index b4b8471ff..00e3a4bc4 100644
--- a/spec/unit/room.spec.js
+++ b/spec/unit/room.spec.js
@@ -328,50 +328,40 @@ describe("Room", function() {
 
         it("should return true for a matching userId and membership",
         function() {
-            room.currentState.getMembers.andCallFake(function() {
-                return [
-                    { userId: "@alice:bar", membership: "join" },
-                    { userId: "@bob:bar", membership: "invite" }
-                ];
-            });
+            room.currentState.members = {
+                "@alice:bar": { userId: "@alice:bar", membership: "join" },
+                "@bob:bar": { userId: "@bob:bar", membership: "invite" }
+            };
             expect(room.hasMembershipState("@bob:bar", "invite")).toBe(true);
         });
 
         it("should return false if match membership but no match userId",
         function() {
-            room.currentState.getMembers.andCallFake(function() {
-                return [
-                    { userId: "@alice:bar", membership: "join" }
-                ];
-            });
+            room.currentState.members = {
+                "@alice:bar": { userId: "@alice:bar", membership: "join" }
+            };
             expect(room.hasMembershipState("@bob:bar", "join")).toBe(false);
         });
 
         it("should return false if match userId but no match membership",
         function() {
-            room.currentState.getMembers.andCallFake(function() {
-                return [
-                    { userId: "@alice:bar", membership: "join" }
-                ];
-            });
+            room.currentState.members = {
+                "@alice:bar": { userId: "@alice:bar", membership: "join" }
+            };
             expect(room.hasMembershipState("@alice:bar", "ban")).toBe(false);
         });
 
         it("should return false if no match membership or userId",
         function() {
-            room.currentState.getMembers.andCallFake(function() {
-                return [
-                    { userId: "@alice:bar", membership: "join" }
-                ];
-            });
+            room.currentState.members = {
+                "@alice:bar": { userId: "@alice:bar", membership: "join" }
+            };
             expect(room.hasMembershipState("@bob:bar", "invite")).toBe(false);
         });
 
         it("should return false if no members exist",
         function() {
-            room.currentState.getMembers.andCallFake(function() {
-                return [];
-            });
+            room.currentState.members = {};
             expect(room.hasMembershipState("@foo:bar", "join")).toBe(false);
         });
     });

From 8b7497374f215c2605ea9dfc583182b2e1524bba Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 20 Jan 2016 17:19:01 +0000
Subject: [PATCH 2/3] name self-chats by displayname if possible rather than
 mxid, and name empty-chats as 'Empty room' rather than the fugly '?'

---
 lib/models/room.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/models/room.js b/lib/models/room.js
index 5b002613e..4c82f20a2 100644
--- a/lib/models/room.js
+++ b/lib/models/room.js
@@ -722,12 +722,12 @@ function calculateRoomName(room, userId, ignoreRoomNameEvent) {
                 }
             }
             else {
-                return userId; // XXX: why userId and not displayname or something?
+                return memberList[0].name || userId;
             }
         }
         else {
             // there really isn't anyone in this room...
-            return "?";
+            return "Empty room";
         }
     }
     else if (members.length === 1) {

From 3a73b54e4acc36082e54aab1741ac91c7d0a01ec Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 20 Jan 2016 17:22:16 +0000
Subject: [PATCH 3/3] .name defaults to mxid

---
 lib/models/room.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/models/room.js b/lib/models/room.js
index 4c82f20a2..29072da6f 100644
--- a/lib/models/room.js
+++ b/lib/models/room.js
@@ -722,7 +722,7 @@ function calculateRoomName(room, userId, ignoreRoomNameEvent) {
                 }
             }
             else {
-                return memberList[0].name || userId;
+                return memberList[0].name;
             }
         }
         else {