diff options
author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-11-17 16:59:24 +0000 |
---|---|---|
committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-11-17 16:59:24 +0000 |
commit | 31a049eb692d37387a2db972da754f7ec56218c7 (patch) | |
tree | 9e5f47abad904d30c08d2f340b543a631e436894 /syweb/webclient/test/unit/model-service.spec.js | |
parent | Include room membership in room initialSync (diff) | |
parent | SYN-148: Add the alias after creating the room (diff) | |
download | synapse-31a049eb692d37387a2db972da754f7ec56218c7.tar.xz |
Merge branch 'develop' into room-initial-sync
Conflicts: synapse/handlers/message.py
Diffstat (limited to 'syweb/webclient/test/unit/model-service.spec.js')
-rw-r--r-- | syweb/webclient/test/unit/model-service.spec.js | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/syweb/webclient/test/unit/model-service.spec.js b/syweb/webclient/test/unit/model-service.spec.js deleted file mode 100644 index e2fa8ceba3..0000000000 --- a/syweb/webclient/test/unit/model-service.spec.js +++ /dev/null @@ -1,30 +0,0 @@ -describe('ModelService', function() { - - // setup the dependencies - beforeEach(function() { - // dependencies - module('matrixService'); - - // tested service - module('modelService'); - }); - - it('should be able to get a member in a room', inject( - function(modelService) { - var roomId = "!wefiohwefuiow:matrix.org"; - var userId = "@bob:matrix.org"; - - modelService.getRoom(roomId).current_room_state.storeStateEvent({ - type: "m.room.member", - id: "fwefw:matrix.org", - user_id: userId, - state_key: userId, - content: { - membership: "join" - } - }); - - var user = modelService.getMember(roomId, userId); - expect(user.event.state_key).toEqual(userId); - })); -}); |