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

Merge remote-tracking branch 'aaronraimist/sort-imports' into develop

Browse source
This commit is contained in:
Travis Ralston 2021-12-09 16:03:59 -07:00
commit e4b96cff1f
553 changed files with 1097 additions and 915 deletions
Download patch file Download diff file Expand all files Collapse all files

1
test/components/views/elements/MemberEventListSummary-test.js
View file

@ -1,6 +1,7 @@
import React from 'react';
import ReactTestUtils from 'react-dom/test-utils';
import ShallowRenderer from "react-test-renderer/shallow";
import sdk from '../../../skinned-sdk';
import * as testUtils from '../../../test-utils';

3
test/components/views/elements/PollCreateDialog-test.tsx
View file

@ -18,9 +18,10 @@ limitations under the License.
import '../../../skinned-sdk';
import React from "react";
import { mount, ReactWrapper } from "enzyme";
import { Room } from "matrix-js-sdk/src/models/room";
import * as TestUtils from "../../../test-utils";
import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
import { Room } from "matrix-js-sdk/src/models/room";
import _PollCreateDialog from "../../../../src/components/views/elements/PollCreateDialog";
const PollCreateDialog = TestUtils.wrapInMatrixClientContext(_PollCreateDialog);