matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-26 17:03:12 +03:00
Code Activity

Add integration tests; fix bugs.

Browse Source
This commit is contained in:
Kegan Dougal
2015-10-26 16:12:06 +00:00
parent 4cbab72369
commit be6d64fbfd
3 changed files with 125 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/client.js
View File

@@ -2091,7 +2091,7 @@ function _pollForEvents(client) {
});
Object.keys(roomIdsWithNewInvites).forEach(function(inviteRoomId) {
_resolveInvites(self.store.getRoom(inviteRoomId));
_resolveInvites(self, self.store.getRoom(inviteRoomId));
});
}
if (data) {
@@ -2198,7 +2198,7 @@ function reEmit(reEmitEntity, emittableEntity, eventNames) {
}
function _resolveInvites(client, room) {
if (!room || !client.resolveInvitesToProfiles) {
if (!room || !client._config.resolveInvitesToProfiles) {
return;
}
// For each invited room member we want to give them a displayname/avatar url

128
spec/integ/matrix-client-syncing.spec.js
View File

@@ -10,6 +10,11 @@ describe("MatrixClient syncing", function() {
var selfUserId = "@alice:localhost";
var selfAccessToken = "aseukfgwef";
var otherUserId = "@bob:localhost";
var userA = "@alice:bar";
var userB = "@bob:bar";
var userC = "@claire:bar";
var roomOne = "!foo:localhost";
var roomTwo = "!bar:localhost";
beforeEach(function() {
utils.beforeEach(this);
@@ -65,10 +70,124 @@ describe("MatrixClient syncing", function() {
});
});
describe("resolving invites to profile info", function() {
var initialSync = {
end: "s_5_3",
presence: [],
rooms: [{
membership: "join",
room_id: roomOne,
messages: {
start: "f_1_1",
end: "f_2_2",
chunk: [
utils.mkMessage({
room: roomOne, user: otherUserId, msg: "hello"
})
]
},
state: [
utils.mkMembership({
room: roomOne, mship: "join", user: otherUserId
}),
utils.mkMembership({
room: roomOne, mship: "join", user: selfUserId
}),
utils.mkEvent({
type: "m.room.create", room: roomOne, user: selfUserId,
content: {
creator: selfUserId
}
})
]
}]
};
var eventData = {
start: "s_5_3",
end: "e_6_7",
chunk: []
};
beforeEach(function() {
eventData.chunk = [];
});
it("should resolve incoming invites from /events", function(done) {
eventData.chunk = [
utils.mkMembership({
room: roomOne, mship: "invite", user: userC
})
];
httpBackend.when("GET", "/initialSync").respond(200, initialSync);
httpBackend.when("GET", "/events").respond(200, eventData);
httpBackend.when("GET", "/profile/" + encodeURIComponent(userC)).respond(200, {
avatar_url: "mxc://flibble/wibble",
displayname: "The Boss"
});
client.startClient({
resolveInvitesToProfiles: true
});
httpBackend.flush().done(function() {
var member = client.getRoom(roomOne).getMember(userC);
expect(member.name).toEqual("The Boss");
expect(
member.getAvatarUrl("home.server.url", null, null, null, false)
).toBeDefined();
done();
});
});
it("should use cached values from m.presence wherever possible", function(done) {
eventData.chunk = [
utils.mkPresence({
user: userC, presence: "online", name: "The Ghost"
}),
utils.mkMembership({
room: roomOne, mship: "invite", user: userC
})
];
httpBackend.when("GET", "/initialSync").respond(200, initialSync);
httpBackend.when("GET", "/events").respond(200, eventData);
client.startClient({
resolveInvitesToProfiles: true
});
httpBackend.flush().done(function() {
var member = client.getRoom(roomOne).getMember(userC);
expect(member.name).toEqual("The Ghost");
done();
});
});
it("should no-op if resolveInvitesToProfiles is not set", function(done) {
eventData.chunk = [
utils.mkMembership({
room: roomOne, mship: "invite", user: userC
})
];
httpBackend.when("GET", "/initialSync").respond(200, initialSync);
httpBackend.when("GET", "/events").respond(200, eventData);
client.startClient();
httpBackend.flush().done(function() {
var member = client.getRoom(roomOne).getMember(userC);
expect(member.name).toEqual(userC);
expect(
member.getAvatarUrl("home.server.url", null, null, null, false)
).toBeNull();
done();
});
});
});
describe("users", function() {
var userA = "@alice:bar";
var userB = "@bob:bar";
var userC = "@claire:bar";
var initialSync = {
end: "s_5_3",
presence: [
@@ -113,8 +232,6 @@ describe("MatrixClient syncing", function() {
});
describe("room state", function() {
var roomOne = "!foo:localhost";
var roomTwo = "!bar:localhost";
var msgText = "some text here";
var otherDisplayName = "Bob Smith";
var initialSync = {
@@ -272,7 +389,6 @@ describe("MatrixClient syncing", function() {
});
describe("receipts", function() {
var roomOne = "!foo:localhost";
var initialSync = {
end: "s_5_3",
presence: [],

1
spec/mock-request.js
View File

@@ -13,6 +13,7 @@ function HttpBackend() {
this.requestFn = function(opts, callback) {
var realReq = new Request(opts.method, opts.uri, opts.body, opts.qs);
realReq.callback = callback;
console.log("HTTP backend received request: %s %s", opts.method, opts.uri);
self.requests.push(realReq);
};
}