From d3377e3dea8a54d05387ccf26d8f2ffa286b4985 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Wed, 24 Jun 2015 13:35:19 +0100
Subject: [PATCH] Add RoomMember UTs. Fix disambiguation bug. Add CHANGELOG.

---
 CHANGELOG.md                  |   7 ++
 lib/models/room-member.js     |   2 +-
 spec/unit/room-member.spec.js | 137 ++++++++++++++++++++++++++++++++++
 3 files changed, 145 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6156eec33..160faba61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in 0.1.2
+================
+
+Bug fixes:
+ * Fixed an issue which prevented RoomMember.name being disambiguated if there
+   was exactly 1 other person with the same display name.
+
 Changes in 0.1.1
 ================
 
diff --git a/lib/models/room-member.js b/lib/models/room-member.js
index 1ef5d485c..56fe3680d 100644
--- a/lib/models/room-member.js
+++ b/lib/models/room-member.js
@@ -142,7 +142,7 @@ function calculateDisplayName(member, event, roomState) {
                 e.getSender() !== selfUserId;
         }
     );
-    if (stateEvents.length > 1) {
+    if (stateEvents.length > 0) {
         // need to disambiguate
         return displayName + " (" + selfUserId + ")";
     }
diff --git a/spec/unit/room-member.spec.js b/spec/unit/room-member.spec.js
index 30c094754..a935e4795 100644
--- a/spec/unit/room-member.spec.js
+++ b/spec/unit/room-member.spec.js
@@ -39,6 +39,35 @@ describe("RoomMember", function() {
             expect(memberB.powerLevel).toEqual(200);
             expect(memberB.powerLevelNorm).toEqual(100);
         });
+
+        it("should emit 'RoomMember.powerLevel' if the power level changes.",
+        function() {
+            var event = utils.mkEvent({
+                type: "m.room.power_levels",
+                room: roomId,
+                user: userA,
+                content: {
+                    users_default: 20,
+                    users: {
+                        "@bertha:bar": 200,
+                        "@invalid:user": 10  // shouldn't barf on this.
+                    }
+                },
+                event: true
+            });
+            var emitCount = 0;
+
+            member.on("RoomMember.powerLevel", function(emitEvent, emitMember) {
+                emitCount += 1;
+                expect(emitMember).toEqual(member);
+                expect(emitEvent).toEqual(event);
+            });
+
+            member.setPowerLevelEvent(event);
+            expect(emitCount).toEqual(1);
+            member.setPowerLevelEvent(event); // no-op
+            expect(emitCount).toEqual(1);
+        });
     });
 
     describe("setTypingEvent", function() {
@@ -68,6 +97,114 @@ describe("RoomMember", function() {
             expect(memberB.typing).toEqual(false);
             expect(memberC.typing).toEqual(true);
         });
+
+        it("should emit 'RoomMember.typing' if the typing state changes",
+        function() {
+            var event = utils.mkEvent({
+                type: "m.typing",
+                room: roomId,
+                content: {
+                    user_ids: [
+                        userA, userC
+                    ]
+                },
+                event: true
+            });
+            var emitCount = 0;
+            member.on("RoomMember.typing", function(ev, mem) {
+                expect(mem).toEqual(member);
+                expect(ev).toEqual(event);
+                emitCount += 1;
+            });
+            member.typing = false;
+            member.setTypingEvent(event);
+            expect(emitCount).toEqual(1);
+            member.setTypingEvent(event); // no-op
+            expect(emitCount).toEqual(1);
+        });
+    });
+
+    describe("setMembershipEvent", function() {
+        var joinEvent = utils.mkMembership({
+            event: true,
+            mship: "join",
+            user: userA,
+            room: roomId,
+            name: "Alice"
+        });
+
+        var inviteEvent = utils.mkMembership({
+            event: true,
+            mship: "invite",
+            user: userB,
+            skey: userA,
+            room: roomId
+        });
+
+        it("should set 'membership' and assign the event to 'events.member'.",
+        function() {
+            member.setMembershipEvent(inviteEvent);
+            expect(member.membership).toEqual("invite");
+            expect(member.events.member).toEqual(inviteEvent);
+            member.setMembershipEvent(joinEvent);
+            expect(member.membership).toEqual("join");
+            expect(member.events.member).toEqual(joinEvent);
+        });
+
+        it("should set 'name' based on user_id, displayname and room state",
+        function() {
+            var roomState = {
+                getStateEvents: function(type) {
+                    if (type !== "m.room.member") { return []; }
+                    return [
+                        utils.mkMembership({
+                            event: true, mship: "join", room: roomId,
+                            user: userB
+                        }),
+                        utils.mkMembership({
+                            event: true, mship: "join", room: roomId,
+                            user: userC, name: "Alice"
+                        }),
+                        joinEvent
+                    ];
+                }
+            };
+            expect(member.name).toEqual(userA); // default = user_id
+            member.setMembershipEvent(joinEvent);
+            expect(member.name).toEqual("Alice"); // prefer displayname
+            member.setMembershipEvent(joinEvent, roomState);
+            expect(member.name).not.toEqual("Alice"); // it should disambig.
+            // user_id should be there somewhere
+            expect(member.name.indexOf(userA)).not.toEqual(-1);
+        });
+
+        it("should emit 'RoomMember.membership' if the membership changes", function() {
+            var emitCount = 0;
+            member.on("RoomMember.membership", function(ev, mem) {
+                emitCount += 1;
+                expect(mem).toEqual(member);
+                expect(ev).toEqual(inviteEvent);
+            });
+            member.setMembershipEvent(inviteEvent);
+            expect(emitCount).toEqual(1);
+            member.setMembershipEvent(inviteEvent); // no-op
+            expect(emitCount).toEqual(1);
+        });
+
+        it("should emit 'RoomMember.name' if the name changes", function() {
+            var emitCount = 0;
+            member.on("RoomMember.name", function(ev, mem) {
+                emitCount += 1;
+                expect(mem).toEqual(member);
+                expect(ev).toEqual(joinEvent);
+            });
+            member.setMembershipEvent(joinEvent);
+            expect(emitCount).toEqual(1);
+            member.setMembershipEvent(joinEvent); // no-op
+            expect(emitCount).toEqual(1);
+        });
+
+
     });
 
 });