imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/roving

Browse source
This commit is contained in:
Michael Telatynski 2020-01-20 20:48:11 +00:00
commit 397e116efb
68 changed files with 1948 additions and 626 deletions
Download patch file Download diff file Expand all files Collapse all files

5
test/UserActivity-test.js
View file

@ -15,7 +15,6 @@ limitations under the License.
*/
import lolex from 'lolex';
import jest from 'jest-mock';
import EventEmitter from 'events';
import UserActivity from '../src/UserActivity';
@ -36,8 +35,8 @@ describe('UserActivity', function() {
let clock;
beforeEach(function() {
fakeWindow = new FakeDomEventEmitter(),
fakeDocument = new FakeDomEventEmitter(),
fakeWindow = new FakeDomEventEmitter();
fakeDocument = new FakeDomEventEmitter();
userActivity = new UserActivity(fakeWindow, fakeDocument);
userActivity.start();
clock = lolex.install();

1
test/components/views/messages/TextualBody-test.js
View file

@ -15,7 +15,6 @@ limitations under the License.
*/
import React from "react";
import expect from 'expect';
import Adapter from "enzyme-adapter-react-16";
import { configure, mount } from "enzyme";

6
test/components/views/rooms/MemberList-test.js
View file

@ -1,7 +1,6 @@
import React from 'react';
import ReactTestUtils from 'react-dom/test-utils';
import ReactDOM from 'react-dom';
import lolex from 'lolex';
import * as TestUtils from '../../../test-utils';
@ -27,7 +26,6 @@ describe('MemberList', () => {
let parentDiv = null;
let client = null;
let root = null;
let clock = null;
let memberListRoom;
let memberList = null;
@ -40,8 +38,6 @@ describe('MemberList', () => {
client = MatrixClientPeg.get();
client.hasLazyLoadMembersEnabled = () => false;
clock = lolex.install();
parentDiv = document.createElement('div');
document.body.appendChild(parentDiv);
@ -114,8 +110,6 @@ describe('MemberList', () => {
parentDiv = null;
}
clock.uninstall();
done();
});

1
test/components/views/rooms/RoomSettings-test.js
View file

@ -1,7 +1,6 @@
// TODO: Rewrite room settings tests for dialog support
import React from 'react';
import ReactDOM from 'react-dom';
import jest from 'jest-mock';
import * as testUtils from '../../../test-utils';
import sdk from '../../../skinned-sdk';
import {MatrixClientPeg} from '../../../../src/MatrixClientPeg';