Auto fix

Signed-off-by: Aaron Raimist <aaron@raim.ist>

test/CallHandler-test.ts

@@ -16,13 +16,14 @@ limitations under the License.
 
 import './skinned-sdk';
 
+import { CallEvent, CallState } from 'matrix-js-sdk/src/webrtc/call';
+import EventEmitter from 'events';
+
 import CallHandler, { PlaceCallType, CallHandlerEvent } from '../src/CallHandler';
 import { stubClient, mkStubRoom } from './test-utils';
 import { MatrixClientPeg } from '../src/MatrixClientPeg';
 import dis from '../src/dispatcher/dispatcher';
-import { CallEvent, CallState } from 'matrix-js-sdk/src/webrtc/call';
 import DMRoomMap from '../src/utils/DMRoomMap';
-import EventEmitter from 'events';
 import SdkConfig from '../src/SdkConfig';
 import { ActionPayload } from '../src/dispatcher/payloads';
 import { Action } from '../src/dispatcher/actions';

test/DecryptionFailureTracker-test.js

@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { DecryptionFailure, DecryptionFailureTracker } from '../src/DecryptionFailureTracker';
-
 import { MatrixEvent } from 'matrix-js-sdk';
 
+import { DecryptionFailure, DecryptionFailureTracker } from '../src/DecryptionFailureTracker';
+
 class MockDecryptionError extends Error {
     constructor(code) {
         super();

test/PosthogAnalytics-test.ts

@@ -22,7 +22,6 @@ import {
     IRoomEvent,
     PosthogAnalytics,
 } from '../src/PosthogAnalytics';
-
 import SdkConfig from '../src/SdkConfig';
 
 class FakePosthog {

test/TextForEvent-test.ts

@@ -1,10 +1,11 @@
 import './skinned-sdk';
 
-import { textForEvent } from "../src/TextForEvent";
 import { MatrixEvent } from "matrix-js-sdk";
+import renderer from 'react-test-renderer';
+
+import { textForEvent } from "../src/TextForEvent";
 import SettingsStore from "../src/settings/SettingsStore";
 import { SettingLevel } from "../src/settings/SettingLevel";
-import renderer from 'react-test-renderer';
 
 function mockPinnedEvent(
     pinnedMessageIds?: string[],

test/UserActivity-test.js

@@ -16,6 +16,7 @@ limitations under the License.
 
 import FakeTimers from '@sinonjs/fake-timers';
 import EventEmitter from 'events';
+
 import UserActivity from '../src/UserActivity';
 
 class FakeDomEventEmitter extends EventEmitter {

test/components/structures/CallEventGrouper-test.ts

@@ -15,13 +15,14 @@ limitations under the License.
 */
 
 import "../../skinned-sdk";
-import { stubClient } from '../../test-utils';
-import { MatrixClientPeg } from '../../../src/MatrixClientPeg';
 import { MatrixClient } from 'matrix-js-sdk';
 import { EventType } from "matrix-js-sdk/src/@types/event";
-import CallEventGrouper, { CustomCallState } from "../../../src/components/structures/CallEventGrouper";
 import { CallState } from "matrix-js-sdk/src/webrtc/call";
 
+import { stubClient } from '../../test-utils';
+import { MatrixClientPeg } from '../../../src/MatrixClientPeg';
+import CallEventGrouper, { CustomCallState } from "../../../src/components/structures/CallEventGrouper";
+
 const MY_USER_ID = "@me:here";
 const THEIR_USER_ID = "@they:here";
 

test/components/structures/GroupView-test.js

@@ -17,13 +17,13 @@ limitations under the License.
 import React from 'react';
 import ReactDOM from 'react-dom';
 import ReactTestUtils from 'react-dom/test-utils';
-
 import MockHttpBackend from 'matrix-mock-request';
-import { MatrixClientPeg } from '../../../src/MatrixClientPeg';
-import sdk from '../../skinned-sdk';
 import Matrix from 'matrix-js-sdk';
 
+import { MatrixClientPeg } from '../../../src/MatrixClientPeg';
+import sdk from '../../skinned-sdk';
 import * as TestUtils from '../../test-utils';
+
 const { waitForUpdate } = TestUtils;
 
 const GroupView = sdk.getComponent('structures.GroupView');

test/components/structures/MessagePanel-test.js

@@ -15,29 +15,27 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import SettingsStore from "../../../src/settings/SettingsStore";
-
 import React from 'react';
 import ReactDOM from "react-dom";
-const TestUtils = require('react-dom/test-utils');
-const expect = require('expect');
 import { EventEmitter } from "events";
-
-import sdk from '../../skinned-sdk';
-
-const MessagePanel = sdk.getComponent('structures.MessagePanel');
-import { MatrixClientPeg } from '../../../src/MatrixClientPeg';
 import Matrix from 'matrix-js-sdk';
-
-const TestUtilsMatrix = require('../../test-utils');
 import FakeTimers from '@sinonjs/fake-timers';
-
 import { mount } from "enzyme";
 
+import { MatrixClientPeg } from '../../../src/MatrixClientPeg';
+import sdk from '../../skinned-sdk';
+import SettingsStore from "../../../src/settings/SettingsStore";
 import MatrixClientContext from "../../../src/contexts/MatrixClientContext";
 import RoomContext from "../../../src/contexts/RoomContext";
 import DMRoomMap from "../../../src/utils/DMRoomMap";
 
+const TestUtils = require('react-dom/test-utils');
+const expect = require('expect');
+
+const MessagePanel = sdk.getComponent('structures.MessagePanel');
+
+const TestUtilsMatrix = require('../../test-utils');
+
 let client;
 const room = new Matrix.Room("!roomId:server_name");
 

test/components/structures/auth/Login-test.js

@@ -17,6 +17,7 @@ limitations under the License.
 import React from 'react';
 import ReactDOM from 'react-dom';
 import ReactTestUtils from 'react-dom/test-utils';
+
 import sdk from '../../../skinned-sdk';
 import SdkConfig from '../../../../src/SdkConfig';
 import { mkServerConfig } from "../../../test-utils";

test/components/structures/auth/Registration-test.js

@@ -17,6 +17,7 @@ limitations under the License.
 import React from 'react';
 import ReactDOM from 'react-dom';
 import ReactTestUtils from 'react-dom/test-utils';
+
 import sdk from '../../../skinned-sdk';
 import SdkConfig from '../../../../src/SdkConfig';
 import { mkServerConfig } from "../../../test-utils";

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

@@ -16,6 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import TestRenderer from 'react-test-renderer';
+
 import sdk from '../../../skinned-sdk';
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 import { stubClient } from '../../../test-utils';

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

@@ -22,7 +22,6 @@ import { sleep } from "matrix-js-sdk/src/utils";
 
 import sdk from '../../../skinned-sdk';
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
-
 import * as TestUtilsMatrix from '../../../test-utils';
 
 const InteractiveAuthDialog = sdk.getComponent(

test/components/views/elements/MemberEventListSummary-test.js

@@ -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';
 

test/components/views/groups/GroupMemberList-test.js

@@ -17,13 +17,13 @@ limitations under the License.
 import React from "react";
 import ReactDOM from "react-dom";
 import ReactTestUtils from "react-dom/test-utils";
-
 import MockHttpBackend from "matrix-mock-request";
-import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
-import sdk from "../../../skinned-sdk";
 import Matrix from "matrix-js-sdk";
 
+import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
+import sdk from "../../../skinned-sdk";
 import * as TestUtils from "../../../test-utils";
+
 const { waitForUpdate } = TestUtils;
 
 const GroupMemberList = sdk.getComponent("views.groups.GroupMemberList");

test/components/views/messages/MKeyVerificationConclusion-test.js

@@ -2,10 +2,10 @@ import '../../../skinned-sdk'; // Must be first for skinning to work
 import React from 'react';
 import TestRenderer from 'react-test-renderer';
 import { EventEmitter } from 'events';
-import * as TestUtils from '../../../test-utils';
-
-import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 import { MatrixEvent } from 'matrix-js-sdk';
+
+import * as TestUtils from '../../../test-utils';
+import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 import MKeyVerificationConclusion from '../../../../src/components/views/messages/MKeyVerificationConclusion';
 
 const trustworthy = () => ({ isCrossSigningVerified: () => true });

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

@@ -19,12 +19,12 @@ 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 { 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 { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
+import * as TestUtils from '../../../test-utils';
 import { compare } from "../../../../src/utils/strings";
 import MemberList from "../../../../src/components/views/rooms/MemberList";
 import MemberTile from '../../../../src/components/views/rooms/MemberTile';

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

@@ -3,14 +3,12 @@ import ReactDOM from 'react-dom';
 
 import "../../../skinned-sdk";
 
+import { Room, PendingEventOrdering, MatrixEvent, MatrixClient } from 'matrix-js-sdk';
+
 import * as TestUtils from '../../../test-utils';
-
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
-
 import DMRoomMap from '../../../../src/utils/DMRoomMap';
 import RoomHeader from '../../../../src/components/views/rooms/RoomHeader';
-
-import { Room, PendingEventOrdering, MatrixEvent, MatrixClient } from 'matrix-js-sdk';
 import { SearchScope } from '../../../../src/components/views/rooms/SearchBar';
 import { E2EStatus } from '../../../../src/utils/ShieldUtils';
 import { PlaceCallType } from '../../../../src/CallHandler';

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

@@ -1,16 +1,13 @@
 import React from 'react';
 import ReactTestUtils from 'react-dom/test-utils';
 import ReactDOM from 'react-dom';
+import { MatrixClient, Room, RoomMember } from 'matrix-js-sdk';
 
 import * as TestUtils from '../../../test-utils';
-
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 import sdk from '../../../skinned-sdk';
-
 import dis from '../../../../src/dispatcher/dispatcher';
 import DMRoomMap from '../../../../src/utils/DMRoomMap';
-
-import { MatrixClient, Room, RoomMember } from 'matrix-js-sdk';
 import { DefaultTagID } from "../../../../src/stores/room-list/models";
 import RoomListStore, { RoomListStoreClass } from "../../../../src/stores/room-list/RoomListStore";
 import RoomListLayoutStore from "../../../../src/stores/room-list/RoomListLayoutStore";

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

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

test/components/views/settings/CryptographyPanel-test.tsx

@@ -1,11 +1,11 @@
 import '../../../skinned-sdk';
-import * as TestUtils from '../../../test-utils';
 
-import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 import React, { ReactElement } from 'react';
 import ReactDOM from 'react-dom';
-
 import { MatrixClient } from 'matrix-js-sdk';
+
+import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
+import * as TestUtils from '../../../test-utils';
 import CryptographyPanel from '../../../../src/components/views/settings/CryptographyPanel';
 
 describe('CryptographyPanel', () => {

test/createRoom-test.js

@@ -1,7 +1,8 @@
 import './skinned-sdk'; // Must be first for skinning to work
-import { waitForMember, canEncryptToAllUsers } from '../src/createRoom';
 import { EventEmitter } from 'events';
 
+import { waitForMember, canEncryptToAllUsers } from '../src/createRoom';
+
 /* Shorter timeout, we've got tests to run */
 const timeout = 30;
 

test/end-to-end-tests/src/rest/creator.js

@@ -17,6 +17,7 @@ limitations under the License.
 
 const { exec } = require('child_process');
 const request = require('request-promise-native');
+
 const RestSession = require('./session');
 const RestMultiSession = require('./multi');
 

test/end-to-end-tests/src/rest/session.js

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 const request = require('request-promise-native');
+
 const Logger = require('../logger');
 const RestRoom = require('./room');
 const { approveConsent } = require('./consent');

test/end-to-end-tests/src/scenarios/e2e-encryption.js

@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+const assert = require('assert');
+
 const sendMessage = require('../usecases/send-message');
 const acceptInvite = require('../usecases/accept-invite');
 const { receiveMessage } = require('../usecases/timeline');
@@ -22,7 +24,6 @@ const { createDm } = require('../usecases/create-room');
 const { checkRoomSettings } = require('../usecases/room-settings');
 const { startSasVerification, acceptSasVerification } = require('../usecases/verify');
 const { setupSecureBackup } = require('../usecases/security');
-const assert = require('assert');
 const { measureStart, measureStop } = require('../util');
 
 module.exports = async function e2eEncryptionScenarios(alice, bob) {

test/end-to-end-tests/src/scenarios/lazy-loading.js

@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+const assert = require('assert');
+
 const { delay } = require('../util');
 const join = require('../usecases/join');
 const sendMessage = require('../usecases/send-message');
@@ -25,7 +27,6 @@ const {
 const { createRoom } = require('../usecases/create-room');
 const { getMembersInMemberlist } = require('../usecases/memberlist');
 const { changeRoomSettings } = require('../usecases/room-settings');
-const assert = require('assert');
 
 module.exports = async function lazyLoadingScenarios(alice, bob, charlies) {
     console.log(" creating a room for lazy loading member scenarios:");

test/end-to-end-tests/src/session.js

@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 const puppeteer = require('puppeteer');
+
 const Logger = require('./logger');
 const LogBuffer = require('./logbuffer');
 const { delay } = require('./util');

test/end-to-end-tests/src/usecases/memberlist.js

@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 const assert = require('assert');
+
 const { openRoomSummaryCard } = require("./rightpanel");
 
 async function openMemberInfo(session, name) {

test/end-to-end-tests/src/usecases/room-settings.js

@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 const assert = require('assert');
+
 const { openRoomSummaryCard } = require("./rightpanel");
 const { acceptDialog } = require('./dialog');
 

test/end-to-end-tests/src/usecases/verify.js

@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 const assert = require('assert');
+
 const { openMemberInfo } = require("./memberlist");
 
 async function startVerification(session, name) {

test/end-to-end-tests/start.js

@@ -14,12 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+const fs = require("fs");
+const program = require('commander');
+
 const ElementSession = require('./src/session');
 const scenario = require('./src/scenario');
 const RestSessionCreator = require('./src/rest/creator');
-const fs = require("fs");
 
-const program = require('commander');
 program
     .option('--no-logs', "don't output logs, document html on error", false)
     .option('--app-url [url]', "url to test", "http://localhost:5000")

test/i18n-test/languageHandler-test.js

@@ -1,6 +1,7 @@
+import * as languageHandler from '../../src/languageHandler';
+
 const React = require('react');
 const expect = require('expect');
-import * as languageHandler from '../../src/languageHandler';
 
 const testUtils = require('../test-utils');
 

test/setupTests.js

@@ -1,8 +1,9 @@
-import * as languageHandler from "../src/languageHandler";
 import { TextEncoder, TextDecoder } from 'util';
 import Adapter from "@wojtekmaj/enzyme-adapter-react-17";
 import { configure } from "enzyme";
 
+import * as languageHandler from "../src/languageHandler";
+
 languageHandler.setLanguage('en');
 languageHandler.setMissingEntryGenerator(key => key.split("|", 2)[1]);
 

test/stores/RoomViewStore-test.js

@@ -1,7 +1,5 @@
 import RoomViewStore from '../../src/stores/RoomViewStore';
-
 import { MatrixClientPeg as peg } from '../../src/MatrixClientPeg';
-
 import * as testUtils from '../test-utils';
 
 const dispatch = testUtils.getDispatchForStore(RoomViewStore);

test/test-utils.js

@@ -1,11 +1,12 @@
 import React from 'react';
+import ShallowRenderer from 'react-test-renderer/shallow';
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+
 import { MatrixClientPeg as peg } from '../src/MatrixClientPeg';
 import dis from '../src/dispatcher/dispatcher';
 import { makeType } from "../src/utils/TypeUtils";
 import { ValidatedServerConfig } from "../src/utils/AutoDiscoveryUtils";
-import ShallowRenderer from 'react-test-renderer/shallow';
 import MatrixClientContext from "../src/contexts/MatrixClientContext";
-import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 
 export function getRenderer() {
     // Old: ReactTestUtils.createRenderer();

test/utils/export-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import { IContent, MatrixClient, MatrixEvent, Room } from "matrix-js-sdk";
+
 import { MatrixClientPeg } from "../../src/MatrixClientPeg";
 import { IExportOptions, ExportType, ExportFormat } from "../../src/utils/exportUtils/exportUtils";
 import '../skinned-sdk';
@@ -22,6 +23,7 @@ import PlainTextExporter from "../../src/utils/exportUtils/PlainTextExport";
 import HTMLExporter from "../../src/utils/exportUtils/HtmlExport";
 import * as TestUtilsMatrix from '../test-utils';
 import { stubClient } from '../test-utils';
+
 import { renderToString } from "react-dom/server";
 
 let client: MatrixClient;

test/utils/test-utils.ts

@@ -17,11 +17,11 @@ limitations under the License.
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { EventType } from "matrix-js-sdk/src/@types/event";
+import { EventEmitter } from "events";
 
 import { AsyncStoreWithClient } from "../../src/stores/AsyncStoreWithClient";
 import { mkEvent, mkStubRoom } from "../test-utils";
 import { EnhancedMap } from "../../src/utils/maps";
-import { EventEmitter } from "events";
 
 // These methods make some use of some private methods on the AsyncStoreWithClient to simplify getting into a consistent
 // ready state without needing to wire up a dispatcher and pretend to be a js-sdk client.