Merge remote-tracking branch 'origin/develop' into develop

2018-08-15 11:56:19 +00:00 · 2018-08-15 11:56:19 +00:00 · 861a360ab2
parent 3091738f22 e534090da7
commit 861a360ab2
1 changed files with 1 additions and 0 deletions
--- a/test/test-utils.js
+++ b/test/test-utils.js
@ -255,6 +255,7 @@ export function mkStubRoom(roomId = null) {
        getUnfilteredTimelineSet: () => null,
        getAccountData: () => null,
        hasMembershipState: () => null,
+        getVersion: () => '1',
        currentState: {
            getStateEvents: sinon.stub(),
            mayClientSendStateEvent: sinon.stub().returns(true),