Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile

test/components/views/dialogs/InteractiveAuthDialog-test.js

@@ -18,12 +18,12 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import ReactTestUtils from 'react-dom/test-utils';
 import MatrixReactTestUtils from 'matrix-react-test-utils';
+import { sleep } from "matrix-js-sdk/src/utils";
 
 import sdk from '../../../skinned-sdk';
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 
 import * as TestUtilsMatrix from '../../../test-utils';
-import { sleep } from "../../../../src/utils/promise";
 
 const InteractiveAuthDialog = sdk.getComponent(
     'views.dialogs.InteractiveAuthDialog',

test/components/views/rooms/MemberList-test.tsx

@@ -14,18 +14,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import "../../../skinned-sdk";
+
 import React from 'react';
 import ReactTestUtils from 'react-dom/test-utils';
 import ReactDOM from 'react-dom';
 
 import * as TestUtils from '../../../test-utils';
-import sdk from '../../../skinned-sdk';
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 import { Room } from 'matrix-js-sdk/src/models/room';
 import { RoomMember } from 'matrix-js-sdk/src/models/room-member';
 import { User } from "matrix-js-sdk/src/models/user";
 import { compare } from "../../../../src/utils/strings";
 import MemberList from "../../../../src/components/views/rooms/MemberList";
+import MemberTile from '../../../../src/components/views/rooms/MemberTile';
 
 function generateRoomId() {
     return '!' + Math.random().toString().slice(2, 10) + ':domain';
@@ -206,7 +208,6 @@ describe('MemberList', () => {
     }
 
     function itDoesOrderMembersCorrectly(enablePresence) {
-        const MemberTile = sdk.getComponent("rooms.MemberTile");
         describe('does order members correctly', () => {
             // Note: even if presence is disabled, we still expect that the presence
             // tests will pass. All expectOrderedByPresenceAndPowerLevel does is ensure

test/components/views/rooms/SendMessageComposer-test.js

@@ -19,6 +19,8 @@ import Adapter from "@wojtekmaj/enzyme-adapter-react-17";
 import { configure, mount } from "enzyme";
 import React from "react";
 import { act } from "react-dom/test-utils";
+import { sleep } from "matrix-js-sdk/src/utils";
+
 import SendMessageComposer, {
     createMessageContent,
     isQuickReaction,
@@ -29,7 +31,6 @@ import { createPartCreator, createRenderer } from "../../../editor/mock";
 import { createTestClient, mkEvent, mkStubRoom } from "../../../test-utils";
 import BasicMessageComposer from "../../../../src/components/views/rooms/BasicMessageComposer";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
-import { sleep } from "../../../../src/utils/promise";
 import SpecPermalinkConstructor from "../../../../src/utils/permalinks/SpecPermalinkConstructor";
 import defaultDispatcher from "../../../../src/dispatcher/dispatcher";
 

test/end-to-end-tests/element/install.sh

@@ -12,5 +12,5 @@ unzip -q element.zip
 rm element.zip
 mv element-web-${ELEMENT_BRANCH} element-web
 cd element-web
-yarn install
+yarn install --pure-lockfile
 yarn run build

test/end-to-end-tests/install.sh

@@ -4,4 +4,4 @@ set -e
 ./synapse/install.sh
 # local testing doesn't need a Element fetched from master,
 # so not installing that by default
-yarn install
+yarn install --pure-lockfile