matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-08-06 10:22:45 +03:00
Code Activity

Clean up some unit test logs (#7857)

Browse Source 
* kill some unit test logs in arrays-test

Signed-off-by: Kerry Archibald <kerrya@element.io>

* remove mock logs that are asserted against anyway

* remove more logs

Signed-off-by: Kerry Archibald <kerrya@element.io>

* fix safeCOunterpartTranslate warnings in tests

Signed-off-by: Kerry Archibald <kerrya@element.io>

* more safeCounterpartTranslate warnings

Signed-off-by: Kerry Archibald <kerrya@element.io>

* lint

Signed-off-by: Kerry Archibald <kerrya@element.io>

* remove more logs

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add helper

Signed-off-by: Kerry Archibald <kerrya@element.io>

* naming

Signed-off-by: Kerry Archibald <kerrya@element.io>
This commit is contained in:
Kerry
2022-02-21 17:57:44 +01:00
committed by GitHub
parent e2827b4082
commit 8b9263c808
13 changed files with 108 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/components/structures/MessagePanel-test.js
View File

@@ -28,6 +28,7 @@ import SettingsStore from "../../../src/settings/SettingsStore";
import MatrixClientContext from "../../../src/contexts/MatrixClientContext";
import RoomContext from "../../../src/contexts/RoomContext";
import DMRoomMap from "../../../src/utils/DMRoomMap";
import { upsertRoomStateEvents } from '../../utils/test-utils';
const TestUtils = require('react-dom/test-utils');
const expect = require('expect');
@@ -199,6 +200,7 @@ describe('MessagePanel', function() {
mkEvent({
event: true,
type: "m.room.create",
sender: '@test:example.org',
room: roomId,
user: alice,
content: {
@@ -435,6 +437,7 @@ describe('MessagePanel', function() {
it('should collapse creation events', function() {
const events = mkCreationEvents();
upsertRoomStateEvents(room, events);
const res = mount(
<WrappedMessagePanel className="cls" events={events} />,
);
@@ -460,6 +463,7 @@ describe('MessagePanel', function() {
it('should hide read-marker at the end of creation event summary', function() {
const events = mkCreationEvents();
upsertRoomStateEvents(room, events);
const res = mount(
<WrappedMessagePanel
className="cls"

2
test/components/structures/RightPanel-test.tsx
View File

@@ -124,7 +124,7 @@ describe("RightPanel", () => {
});
});
console.log("Switch to room 2");
// Switch to room 2
dis.dispatch({
action: Action.ViewRoom,
room_id: "r2",

24
test/components/structures/auth/Login-test.tsx
View File

@@ -41,6 +41,10 @@ describe('Login', function() {
};
beforeEach(function() {
jest.spyOn(SdkConfig, "get").mockReturnValue({
disable_custom_urls: true,
brand: 'test-brand',
});
mockClient.login.mockClear().mockResolvedValue({});
mockClient.loginFlows.mockClear().mockResolvedValue({ flows: [{ type: "m.login.password" }] });
createClient.mockReturnValue(mockClient);
@@ -64,6 +68,10 @@ describe('Login', function() {
}
it('should show form with change server link', async () => {
jest.spyOn(SdkConfig, "get").mockReturnValue({
disable_custom_urls: false,
brand: 'test',
});
const root = render();
await flushPromises();
@@ -79,10 +87,6 @@ describe('Login', function() {
});
it('should show form without change server link when custom URLs disabled', async () => {
jest.spyOn(SdkConfig, "get").mockReturnValue({
disable_custom_urls: true,
});
const root = render();
await flushPromises();
@@ -97,10 +101,6 @@ describe('Login', function() {
});
it("should show SSO button if that flow is available", async () => {
jest.spyOn(SdkConfig, "get").mockReturnValue({
disable_custom_urls: true,
});
mockClient.loginFlows.mockReturnValue({ flows: [{ type: "m.login.sso" }] });
const root = render();
@@ -111,10 +111,6 @@ describe('Login', function() {
});
it("should show both SSO button and username+password if both are available", async () => {
jest.spyOn(SdkConfig, "get").mockReturnValue({
disable_custom_urls: true,
});
mockClient.loginFlows.mockReturnValue({ flows: [{ type: "m.login.password" }, { type: "m.login.sso" }] });
const root = render();
@@ -128,10 +124,6 @@ describe('Login', function() {
});
it("should show multiple SSO buttons if multiple identity_providers are available", async () => {
jest.spyOn(SdkConfig, "get").mockReturnValue({
disable_custom_urls: true,
});
mockClient.loginFlows.mockReturnValue({
flows: [{
"type": "m.login.sso",

14
test/components/structures/auth/Registration-test.js
View File

@@ -20,7 +20,7 @@ import ReactTestUtils from 'react-dom/test-utils';
import { createClient } from 'matrix-js-sdk/src/matrix';
import sdk from '../../../skinned-sdk';
import SdkConfig from '../../../../src/SdkConfig';
import SdkConfig, { DEFAULTS } from '../../../../src/SdkConfig';
import { createTestClient, mkServerConfig } from "../../../test-utils";
jest.mock('matrix-js-sdk/src/matrix');
@@ -34,6 +34,10 @@ describe('Registration', function() {
let parentDiv;
beforeEach(function() {
jest.spyOn(SdkConfig, "get").mockReturnValue({
...DEFAULTS,
disable_custom_urls: true,
});
parentDiv = document.createElement('div');
document.body.appendChild(parentDiv);
createClient.mockImplementation(() => createTestClient());
@@ -61,10 +65,6 @@ describe('Registration', function() {
});
it('should show form when custom URLs disabled', async function() {
jest.spyOn(SdkConfig, "get").mockReturnValue({
disable_custom_urls: true,
});
const root = render();
// Set non-empty flows & matrixClient to get past the loading spinner
@@ -84,10 +84,6 @@ describe('Registration', function() {
});
it("should show SSO options if those are available", async () => {
jest.spyOn(SdkConfig, "get").mockReturnValue({
disable_custom_urls: true,
});
const root = render();
// Set non-empty flows & matrixClient to get past the loading spinner