Merge branch 'develop' into germain-gg/notifications-labs
This commit is contained in:
RMidhunSuresh
commit
2f69013f6d
73 changed files with 3445 additions and 3395 deletions
|
|
@ -137,13 +137,15 @@ describe("<EditMessageComposer/>", () => {
|
|||
...editedEvent.getContent(),
|
||||
"body": " * original message + edit",
|
||||
"m.new_content": {
|
||||
body: "original message + edit",
|
||||
msgtype: "m.text",
|
||||
"body": "original message + edit",
|
||||
"msgtype": "m.text",
|
||||
"m.mentions": {},
|
||||
},
|
||||
"m.relates_to": {
|
||||
event_id: editedEvent.getId(),
|
||||
rel_type: "m.replace",
|
||||
},
|
||||
"m.mentions": {},
|
||||
};
|
||||
expect(mockClient.sendMessage).toHaveBeenCalledWith(editedEvent.getRoomId()!, null, expectedBody);
|
||||
});
|
||||
|
|
@ -168,13 +170,15 @@ describe("<EditMessageComposer/>", () => {
|
|||
"body": " * hello world",
|
||||
"msgtype": "m.text",
|
||||
"m.new_content": {
|
||||
body: "hello world",
|
||||
msgtype: "m.text",
|
||||
"body": "hello world",
|
||||
"msgtype": "m.text",
|
||||
"m.mentions": {},
|
||||
},
|
||||
"m.relates_to": {
|
||||
event_id: editedEvent.getId(),
|
||||
rel_type: "m.replace",
|
||||
},
|
||||
"m.mentions": {},
|
||||
});
|
||||
});
|
||||
|
||||
|
|
@ -191,15 +195,17 @@ describe("<EditMessageComposer/>", () => {
|
|||
"format": "org.matrix.custom.html",
|
||||
"formatted_body": " * hello <em>world</em>",
|
||||
"m.new_content": {
|
||||
body: "hello *world*",
|
||||
msgtype: "m.text",
|
||||
format: "org.matrix.custom.html",
|
||||
formatted_body: "hello <em>world</em>",
|
||||
"body": "hello *world*",
|
||||
"msgtype": "m.text",
|
||||
"format": "org.matrix.custom.html",
|
||||
"formatted_body": "hello <em>world</em>",
|
||||
"m.mentions": {},
|
||||
},
|
||||
"m.relates_to": {
|
||||
event_id: editedEvent.getId(),
|
||||
rel_type: "m.replace",
|
||||
},
|
||||
"m.mentions": {},
|
||||
});
|
||||
});
|
||||
|
||||
|
|
@ -216,15 +222,17 @@ describe("<EditMessageComposer/>", () => {
|
|||
"format": "org.matrix.custom.html",
|
||||
"formatted_body": " * blinks <strong>quickly</strong>",
|
||||
"m.new_content": {
|
||||
body: "blinks __quickly__",
|
||||
msgtype: "m.emote",
|
||||
format: "org.matrix.custom.html",
|
||||
formatted_body: "blinks <strong>quickly</strong>",
|
||||
"body": "blinks __quickly__",
|
||||
"msgtype": "m.emote",
|
||||
"format": "org.matrix.custom.html",
|
||||
"formatted_body": "blinks <strong>quickly</strong>",
|
||||
"m.mentions": {},
|
||||
},
|
||||
"m.relates_to": {
|
||||
event_id: editedEvent.getId(),
|
||||
rel_type: "m.replace",
|
||||
},
|
||||
"m.mentions": {},
|
||||
});
|
||||
});
|
||||
|
||||
|
|
@ -240,13 +248,15 @@ describe("<EditMessageComposer/>", () => {
|
|||
"body": " * ✨sparkles✨",
|
||||
"msgtype": "m.emote",
|
||||
"m.new_content": {
|
||||
body: "✨sparkles✨",
|
||||
msgtype: "m.emote",
|
||||
"body": "✨sparkles✨",
|
||||
"msgtype": "m.emote",
|
||||
"m.mentions": {},
|
||||
},
|
||||
"m.relates_to": {
|
||||
event_id: editedEvent.getId(),
|
||||
rel_type: "m.replace",
|
||||
},
|
||||
"m.mentions": {},
|
||||
});
|
||||
});
|
||||
|
||||
|
|
@ -264,166 +274,246 @@ describe("<EditMessageComposer/>", () => {
|
|||
"body": " * //dev/null is my favourite place",
|
||||
"msgtype": "m.text",
|
||||
"m.new_content": {
|
||||
body: "//dev/null is my favourite place",
|
||||
msgtype: "m.text",
|
||||
"body": "//dev/null is my favourite place",
|
||||
"msgtype": "m.text",
|
||||
"m.mentions": {},
|
||||
},
|
||||
"m.relates_to": {
|
||||
event_id: editedEvent.getId(),
|
||||
rel_type: "m.replace",
|
||||
},
|
||||
"m.mentions": {},
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("with feature_intentional_mentions enabled", () => {
|
||||
const mockSettings = (mockValues: Record<string, unknown> = {}) => {
|
||||
const defaultMockValues = {
|
||||
feature_intentional_mentions: true,
|
||||
};
|
||||
jest.spyOn(SettingsStore, "getValue")
|
||||
.mockClear()
|
||||
.mockImplementation((settingName) => {
|
||||
return { ...defaultMockValues, ...mockValues }[settingName];
|
||||
});
|
||||
};
|
||||
describe("when message is not a reply", () => {
|
||||
it("should attach an empty mentions object for a message with no mentions", async () => {
|
||||
const editState = new EditorStateTransfer(editedEvent);
|
||||
getComponent(editState);
|
||||
const editContent = " + edit";
|
||||
await editText(editContent);
|
||||
|
||||
beforeEach(() => {
|
||||
mockSettings();
|
||||
fireEvent.click(screen.getByText("Save"));
|
||||
|
||||
const messageContent = mockClient.sendMessage.mock.calls[0][2];
|
||||
|
||||
// both content.mentions and new_content.mentions are empty
|
||||
expect(messageContent["m.mentions"]).toEqual({});
|
||||
expect(messageContent["m.new_content"]["m.mentions"]).toEqual({});
|
||||
});
|
||||
|
||||
describe("when message is not a reply", () => {
|
||||
it("should attach an empty mentions object for a message with no mentions", async () => {
|
||||
const editState = new EditorStateTransfer(editedEvent);
|
||||
getComponent(editState);
|
||||
const editContent = " + edit";
|
||||
await editText(editContent);
|
||||
it("should retain mentions in the original message that are not removed by the edit", async () => {
|
||||
const editState = new EditorStateTransfer(eventWithMentions);
|
||||
getComponent(editState);
|
||||
// Remove charlie from the message
|
||||
const editContent = "{backspace}{backspace}friends";
|
||||
await editText(editContent);
|
||||
|
||||
fireEvent.click(screen.getByText("Save"));
|
||||
fireEvent.click(screen.getByText("Save"));
|
||||
|
||||
const messageContent = mockClient.sendMessage.mock.calls[0][2];
|
||||
const messageContent = mockClient.sendMessage.mock.calls[0][2];
|
||||
|
||||
// both content.mentions and new_content.mentions are empty
|
||||
expect(messageContent["m.mentions"]).toEqual({});
|
||||
expect(messageContent["m.new_content"]["m.mentions"]).toEqual({});
|
||||
});
|
||||
|
||||
it("should retain mentions in the original message that are not removed by the edit", async () => {
|
||||
const editState = new EditorStateTransfer(eventWithMentions);
|
||||
getComponent(editState);
|
||||
// Remove charlie from the message
|
||||
const editContent = "{backspace}{backspace}friends";
|
||||
await editText(editContent);
|
||||
|
||||
fireEvent.click(screen.getByText("Save"));
|
||||
|
||||
const messageContent = mockClient.sendMessage.mock.calls[0][2];
|
||||
|
||||
// no new mentions were added, so nothing in top level mentions
|
||||
expect(messageContent["m.mentions"]).toEqual({});
|
||||
// bob is still mentioned, charlie removed
|
||||
expect(messageContent["m.new_content"]["m.mentions"]).toEqual({
|
||||
user_ids: ["@bob:server.org"],
|
||||
});
|
||||
});
|
||||
|
||||
it("should remove mentions that are removed by the edit", async () => {
|
||||
const editState = new EditorStateTransfer(eventWithMentions);
|
||||
getComponent(editState);
|
||||
const editContent = "new message!";
|
||||
// clear the original message
|
||||
await editText(editContent, true);
|
||||
|
||||
fireEvent.click(screen.getByText("Save"));
|
||||
|
||||
const messageContent = mockClient.sendMessage.mock.calls[0][2];
|
||||
|
||||
// no new mentions were added, so nothing in top level mentions
|
||||
expect(messageContent["m.mentions"]).toEqual({});
|
||||
// bob is not longer mentioned in the edited message, so empty mentions in new_content
|
||||
expect(messageContent["m.new_content"]["m.mentions"]).toEqual({});
|
||||
});
|
||||
|
||||
it("should add mentions that were added in the edit", async () => {
|
||||
const editState = new EditorStateTransfer(editedEvent);
|
||||
getComponent(editState);
|
||||
const editContent = " and @d";
|
||||
await editText(editContent);
|
||||
|
||||
// submit autocomplete for mention
|
||||
await editText("{enter}");
|
||||
|
||||
fireEvent.click(screen.getByText("Save"));
|
||||
|
||||
const messageContent = mockClient.sendMessage.mock.calls[0][2];
|
||||
|
||||
// new mention in the edit
|
||||
expect(messageContent["m.mentions"]).toEqual({
|
||||
user_ids: ["@dan:server.org"],
|
||||
});
|
||||
expect(messageContent["m.new_content"]["m.mentions"]).toEqual({
|
||||
user_ids: ["@dan:server.org"],
|
||||
});
|
||||
});
|
||||
|
||||
it("should add and remove mentions from the edit", async () => {
|
||||
const editState = new EditorStateTransfer(eventWithMentions);
|
||||
getComponent(editState);
|
||||
// Remove charlie from the message
|
||||
await editText("{backspace}{backspace}");
|
||||
// and replace with @room
|
||||
await editText("@d");
|
||||
// submit autocomplete for @dan mention
|
||||
await editText("{enter}");
|
||||
|
||||
fireEvent.click(screen.getByText("Save"));
|
||||
|
||||
const messageContent = mockClient.sendMessage.mock.calls[0][2];
|
||||
|
||||
// new mention in the edit
|
||||
expect(messageContent["m.mentions"]).toEqual({
|
||||
user_ids: ["@dan:server.org"],
|
||||
});
|
||||
// all mentions in the edited version of the event
|
||||
expect(messageContent["m.new_content"]["m.mentions"]).toEqual({
|
||||
user_ids: ["@bob:server.org", "@dan:server.org"],
|
||||
});
|
||||
// no new mentions were added, so nothing in top level mentions
|
||||
expect(messageContent["m.mentions"]).toEqual({});
|
||||
// bob is still mentioned, charlie removed
|
||||
expect(messageContent["m.new_content"]["m.mentions"]).toEqual({
|
||||
user_ids: ["@bob:server.org"],
|
||||
});
|
||||
});
|
||||
|
||||
describe("when message is replying", () => {
|
||||
const originalEvent = mkEvent({
|
||||
type: "m.room.message",
|
||||
user: "@ernie:test",
|
||||
room: roomId,
|
||||
content: { body: "original message", msgtype: "m.text" },
|
||||
event: true,
|
||||
});
|
||||
it("should remove mentions that are removed by the edit", async () => {
|
||||
const editState = new EditorStateTransfer(eventWithMentions);
|
||||
getComponent(editState);
|
||||
const editContent = "new message!";
|
||||
// clear the original message
|
||||
await editText(editContent, true);
|
||||
|
||||
const replyEvent = mkEvent({
|
||||
type: "m.room.message",
|
||||
user: "@bert:test",
|
||||
room: roomId,
|
||||
content: {
|
||||
"body": "reply with plain message",
|
||||
"msgtype": "m.text",
|
||||
"m.relates_to": {
|
||||
"m.in_reply_to": {
|
||||
event_id: originalEvent.getId(),
|
||||
},
|
||||
},
|
||||
"m.mentions": {
|
||||
user_ids: [originalEvent.getSender()!],
|
||||
fireEvent.click(screen.getByText("Save"));
|
||||
|
||||
const messageContent = mockClient.sendMessage.mock.calls[0][2];
|
||||
|
||||
// no new mentions were added, so nothing in top level mentions
|
||||
expect(messageContent["m.mentions"]).toEqual({});
|
||||
// bob is not longer mentioned in the edited message, so empty mentions in new_content
|
||||
expect(messageContent["m.new_content"]["m.mentions"]).toEqual({});
|
||||
});
|
||||
|
||||
it("should add mentions that were added in the edit", async () => {
|
||||
const editState = new EditorStateTransfer(editedEvent);
|
||||
getComponent(editState);
|
||||
const editContent = " and @d";
|
||||
await editText(editContent);
|
||||
|
||||
// wait for autocompletion to render
|
||||
await screen.findByText("Dan");
|
||||
// submit autocomplete for mention
|
||||
await editText("{enter}");
|
||||
|
||||
fireEvent.click(screen.getByText("Save"));
|
||||
|
||||
const messageContent = mockClient.sendMessage.mock.calls[0][2];
|
||||
|
||||
// new mention in the edit
|
||||
expect(messageContent["m.mentions"]).toEqual({
|
||||
user_ids: ["@dan:server.org"],
|
||||
});
|
||||
expect(messageContent["m.new_content"]["m.mentions"]).toEqual({
|
||||
user_ids: ["@dan:server.org"],
|
||||
});
|
||||
});
|
||||
|
||||
it("should add and remove mentions from the edit", async () => {
|
||||
const editState = new EditorStateTransfer(eventWithMentions);
|
||||
getComponent(editState);
|
||||
// Remove charlie from the message
|
||||
await editText("{backspace}{backspace}");
|
||||
// and replace with @room
|
||||
await editText("@d");
|
||||
// wait for autocompletion to render
|
||||
await screen.findByText("Dan");
|
||||
// submit autocomplete for @dan mention
|
||||
await editText("{enter}");
|
||||
|
||||
fireEvent.click(screen.getByText("Save"));
|
||||
|
||||
const messageContent = mockClient.sendMessage.mock.calls[0][2];
|
||||
|
||||
// new mention in the edit
|
||||
expect(messageContent["m.mentions"]).toEqual({
|
||||
user_ids: ["@dan:server.org"],
|
||||
});
|
||||
// all mentions in the edited version of the event
|
||||
expect(messageContent["m.new_content"]["m.mentions"]).toEqual({
|
||||
user_ids: ["@bob:server.org", "@dan:server.org"],
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("when message is replying", () => {
|
||||
const originalEvent = mkEvent({
|
||||
type: "m.room.message",
|
||||
user: "@ernie:test",
|
||||
room: roomId,
|
||||
content: { body: "original message", msgtype: "m.text" },
|
||||
event: true,
|
||||
});
|
||||
|
||||
const replyEvent = mkEvent({
|
||||
type: "m.room.message",
|
||||
user: "@bert:test",
|
||||
room: roomId,
|
||||
content: {
|
||||
"body": "reply with plain message",
|
||||
"msgtype": "m.text",
|
||||
"m.relates_to": {
|
||||
"m.in_reply_to": {
|
||||
event_id: originalEvent.getId(),
|
||||
},
|
||||
},
|
||||
event: true,
|
||||
});
|
||||
"m.mentions": {
|
||||
user_ids: [originalEvent.getSender()!],
|
||||
},
|
||||
},
|
||||
event: true,
|
||||
});
|
||||
|
||||
const replyWithMentions = mkEvent({
|
||||
const replyWithMentions = mkEvent({
|
||||
type: "m.room.message",
|
||||
user: "@bert:test",
|
||||
room: roomId,
|
||||
content: {
|
||||
"body": 'reply that mentions <a href="https://matrix.to/#/@bob:server.org">Bob</a>',
|
||||
"msgtype": "m.text",
|
||||
"m.relates_to": {
|
||||
"m.in_reply_to": {
|
||||
event_id: originalEvent.getId(),
|
||||
},
|
||||
},
|
||||
"m.mentions": {
|
||||
user_ids: [
|
||||
// sender of event we replied to
|
||||
originalEvent.getSender()!,
|
||||
// mentions from this event
|
||||
"@bob:server.org",
|
||||
],
|
||||
},
|
||||
},
|
||||
event: true,
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
setupRoomWithEventsTimeline(room, [originalEvent, replyEvent]);
|
||||
});
|
||||
|
||||
it("should retain parent event sender in mentions when editing with plain text", async () => {
|
||||
const editState = new EditorStateTransfer(replyEvent);
|
||||
getComponent(editState);
|
||||
const editContent = " + edit";
|
||||
await editText(editContent);
|
||||
|
||||
fireEvent.click(screen.getByText("Save"));
|
||||
|
||||
const messageContent = mockClient.sendMessage.mock.calls[0][2];
|
||||
|
||||
// no new mentions from edit
|
||||
expect(messageContent["m.mentions"]).toEqual({});
|
||||
// edited reply still mentions the parent event sender
|
||||
expect(messageContent["m.new_content"]["m.mentions"]).toEqual({
|
||||
user_ids: [originalEvent.getSender()],
|
||||
});
|
||||
});
|
||||
|
||||
it("should retain parent event sender in mentions when adding a mention", async () => {
|
||||
const editState = new EditorStateTransfer(replyEvent);
|
||||
getComponent(editState);
|
||||
await editText(" and @d");
|
||||
// wait for autocompletion to render
|
||||
await screen.findByText("Dan");
|
||||
// submit autocomplete for @dan mention
|
||||
await editText("{enter}");
|
||||
|
||||
fireEvent.click(screen.getByText("Save"));
|
||||
|
||||
const messageContent = mockClient.sendMessage.mock.calls[0][2];
|
||||
|
||||
// new mention in edit
|
||||
expect(messageContent["m.mentions"]).toEqual({
|
||||
user_ids: ["@dan:server.org"],
|
||||
});
|
||||
// edited reply still mentions the parent event sender
|
||||
// plus new mention @dan
|
||||
expect(messageContent["m.new_content"]["m.mentions"]).toEqual({
|
||||
user_ids: [originalEvent.getSender(), "@dan:server.org"],
|
||||
});
|
||||
});
|
||||
|
||||
it("should retain parent event sender in mentions when removing all mentions from content", async () => {
|
||||
const editState = new EditorStateTransfer(replyWithMentions);
|
||||
getComponent(editState);
|
||||
// replace text to remove all mentions
|
||||
await editText("no mentions here", true);
|
||||
|
||||
fireEvent.click(screen.getByText("Save"));
|
||||
|
||||
const messageContent = mockClient.sendMessage.mock.calls[0][2];
|
||||
|
||||
// no mentions in edit
|
||||
expect(messageContent["m.mentions"]).toEqual({});
|
||||
// edited reply still mentions the parent event sender
|
||||
// existing @bob mention removed
|
||||
expect(messageContent["m.new_content"]["m.mentions"]).toEqual({
|
||||
user_ids: [originalEvent.getSender()],
|
||||
});
|
||||
});
|
||||
|
||||
it("should retain parent event sender in mentions when removing mention of said user", async () => {
|
||||
const replyThatMentionsParentEventSender = mkEvent({
|
||||
type: "m.room.message",
|
||||
user: "@bert:test",
|
||||
room: roomId,
|
||||
content: {
|
||||
"body": 'reply that mentions <a href="https://matrix.to/#/@bob:server.org">Bob</a>',
|
||||
"body": `reply that mentions the sender of the message we replied to <a href="https://matrix.to/#/${originalEvent.getSender()!}">Ernie</a>`,
|
||||
"msgtype": "m.text",
|
||||
"m.relates_to": {
|
||||
"m.in_reply_to": {
|
||||
|
|
@ -434,114 +524,25 @@ describe("<EditMessageComposer/>", () => {
|
|||
user_ids: [
|
||||
// sender of event we replied to
|
||||
originalEvent.getSender()!,
|
||||
// mentions from this event
|
||||
"@bob:server.org",
|
||||
],
|
||||
},
|
||||
},
|
||||
event: true,
|
||||
});
|
||||
const editState = new EditorStateTransfer(replyThatMentionsParentEventSender);
|
||||
getComponent(editState);
|
||||
// replace text to remove all mentions
|
||||
await editText("no mentions here", true);
|
||||
|
||||
beforeEach(() => {
|
||||
setupRoomWithEventsTimeline(room, [originalEvent, replyEvent]);
|
||||
});
|
||||
fireEvent.click(screen.getByText("Save"));
|
||||
|
||||
it("should retain parent event sender in mentions when editing with plain text", async () => {
|
||||
const editState = new EditorStateTransfer(replyEvent);
|
||||
getComponent(editState);
|
||||
const editContent = " + edit";
|
||||
await editText(editContent);
|
||||
const messageContent = mockClient.sendMessage.mock.calls[0][2];
|
||||
|
||||
fireEvent.click(screen.getByText("Save"));
|
||||
|
||||
const messageContent = mockClient.sendMessage.mock.calls[0][2];
|
||||
|
||||
// no new mentions from edit
|
||||
expect(messageContent["m.mentions"]).toEqual({});
|
||||
// edited reply still mentions the parent event sender
|
||||
expect(messageContent["m.new_content"]["m.mentions"]).toEqual({
|
||||
user_ids: [originalEvent.getSender()],
|
||||
});
|
||||
});
|
||||
|
||||
it("should retain parent event sender in mentions when adding a mention", async () => {
|
||||
const editState = new EditorStateTransfer(replyEvent);
|
||||
getComponent(editState);
|
||||
await editText(" and @d");
|
||||
// submit autocomplete for @dan mention
|
||||
await editText("{enter}");
|
||||
|
||||
fireEvent.click(screen.getByText("Save"));
|
||||
|
||||
const messageContent = mockClient.sendMessage.mock.calls[0][2];
|
||||
|
||||
// new mention in edit
|
||||
expect(messageContent["m.mentions"]).toEqual({
|
||||
user_ids: ["@dan:server.org"],
|
||||
});
|
||||
// edited reply still mentions the parent event sender
|
||||
// plus new mention @dan
|
||||
expect(messageContent["m.new_content"]["m.mentions"]).toEqual({
|
||||
user_ids: [originalEvent.getSender(), "@dan:server.org"],
|
||||
});
|
||||
});
|
||||
|
||||
it("should retain parent event sender in mentions when removing all mentions from content", async () => {
|
||||
const editState = new EditorStateTransfer(replyWithMentions);
|
||||
getComponent(editState);
|
||||
// replace text to remove all mentions
|
||||
await editText("no mentions here", true);
|
||||
|
||||
fireEvent.click(screen.getByText("Save"));
|
||||
|
||||
const messageContent = mockClient.sendMessage.mock.calls[0][2];
|
||||
|
||||
// no mentions in edit
|
||||
expect(messageContent["m.mentions"]).toEqual({});
|
||||
// edited reply still mentions the parent event sender
|
||||
// existing @bob mention removed
|
||||
expect(messageContent["m.new_content"]["m.mentions"]).toEqual({
|
||||
user_ids: [originalEvent.getSender()],
|
||||
});
|
||||
});
|
||||
|
||||
it("should retain parent event sender in mentions when removing mention of said user", async () => {
|
||||
const replyThatMentionsParentEventSender = mkEvent({
|
||||
type: "m.room.message",
|
||||
user: "@bert:test",
|
||||
room: roomId,
|
||||
content: {
|
||||
"body": `reply that mentions the sender of the message we replied to <a href="https://matrix.to/#/${originalEvent.getSender()!}">Ernie</a>`,
|
||||
"msgtype": "m.text",
|
||||
"m.relates_to": {
|
||||
"m.in_reply_to": {
|
||||
event_id: originalEvent.getId(),
|
||||
},
|
||||
},
|
||||
"m.mentions": {
|
||||
user_ids: [
|
||||
// sender of event we replied to
|
||||
originalEvent.getSender()!,
|
||||
],
|
||||
},
|
||||
},
|
||||
event: true,
|
||||
});
|
||||
const editState = new EditorStateTransfer(replyThatMentionsParentEventSender);
|
||||
getComponent(editState);
|
||||
// replace text to remove all mentions
|
||||
await editText("no mentions here", true);
|
||||
|
||||
fireEvent.click(screen.getByText("Save"));
|
||||
|
||||
const messageContent = mockClient.sendMessage.mock.calls[0][2];
|
||||
|
||||
// no mentions in edit
|
||||
expect(messageContent["m.mentions"]).toEqual({});
|
||||
// edited reply still mentions the parent event sender
|
||||
expect(messageContent["m.new_content"]["m.mentions"]).toEqual({
|
||||
user_ids: [originalEvent.getSender()],
|
||||
});
|
||||
// no mentions in edit
|
||||
expect(messageContent["m.mentions"]).toEqual({});
|
||||
// edited reply still mentions the parent event sender
|
||||
expect(messageContent["m.new_content"]["m.mentions"]).toEqual({
|
||||
user_ids: [originalEvent.getSender()],
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@ import { RoomPermalinkCreator } from "../../../../src/utils/permalinks/Permalink
|
|||
import { mockPlatformPeg } from "../../../test-utils/platform";
|
||||
import { doMaybeLocalRoomAction } from "../../../../src/utils/local-room";
|
||||
import { addTextToComposer } from "../../../test-utils/composer";
|
||||
import SettingsStore from "../../../../src/settings/SettingsStore";
|
||||
|
||||
jest.mock("../../../../src/utils/local-room", () => ({
|
||||
doMaybeLocalRoomAction: jest.fn(),
|
||||
|
|
@ -97,8 +96,9 @@ describe("<SendMessageComposer/>", () => {
|
|||
const content = createMessageContent("@alice:test", model, undefined, undefined, permalinkCreator);
|
||||
|
||||
expect(content).toEqual({
|
||||
body: "hello world",
|
||||
msgtype: "m.text",
|
||||
"body": "hello world",
|
||||
"msgtype": "m.text",
|
||||
"m.mentions": {},
|
||||
});
|
||||
});
|
||||
|
||||
|
|
@ -110,10 +110,11 @@ describe("<SendMessageComposer/>", () => {
|
|||
const content = createMessageContent("@alice:test", model, undefined, undefined, permalinkCreator);
|
||||
|
||||
expect(content).toEqual({
|
||||
body: "hello *world*",
|
||||
msgtype: "m.text",
|
||||
format: "org.matrix.custom.html",
|
||||
formatted_body: "hello <em>world</em>",
|
||||
"body": "hello *world*",
|
||||
"msgtype": "m.text",
|
||||
"format": "org.matrix.custom.html",
|
||||
"formatted_body": "hello <em>world</em>",
|
||||
"m.mentions": {},
|
||||
});
|
||||
});
|
||||
|
||||
|
|
@ -125,10 +126,11 @@ describe("<SendMessageComposer/>", () => {
|
|||
const content = createMessageContent("@alice:test", model, undefined, undefined, permalinkCreator);
|
||||
|
||||
expect(content).toEqual({
|
||||
body: "blinks __quickly__",
|
||||
msgtype: "m.emote",
|
||||
format: "org.matrix.custom.html",
|
||||
formatted_body: "blinks <strong>quickly</strong>",
|
||||
"body": "blinks __quickly__",
|
||||
"msgtype": "m.emote",
|
||||
"format": "org.matrix.custom.html",
|
||||
"formatted_body": "blinks <strong>quickly</strong>",
|
||||
"m.mentions": {},
|
||||
});
|
||||
});
|
||||
|
||||
|
|
@ -141,8 +143,9 @@ describe("<SendMessageComposer/>", () => {
|
|||
const content = createMessageContent("@alice:test", model, undefined, undefined, permalinkCreator);
|
||||
|
||||
expect(content).toEqual({
|
||||
body: "✨sparkles✨",
|
||||
msgtype: "m.emote",
|
||||
"body": "✨sparkles✨",
|
||||
"msgtype": "m.emote",
|
||||
"m.mentions": {},
|
||||
});
|
||||
});
|
||||
|
||||
|
|
@ -155,23 +158,14 @@ describe("<SendMessageComposer/>", () => {
|
|||
const content = createMessageContent("@alice:test", model, undefined, undefined, permalinkCreator);
|
||||
|
||||
expect(content).toEqual({
|
||||
body: "/dev/null is my favourite place",
|
||||
msgtype: "m.text",
|
||||
"body": "/dev/null is my favourite place",
|
||||
"msgtype": "m.text",
|
||||
"m.mentions": {},
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("attachMentions", () => {
|
||||
beforeEach(() => {
|
||||
jest.spyOn(SettingsStore, "getValue").mockImplementation(
|
||||
(settingName) => settingName === "feature_intentional_mentions",
|
||||
);
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
jest.spyOn(SettingsStore, "getValue").mockReset();
|
||||
});
|
||||
|
||||
const partsCreator = createPartCreator();
|
||||
|
||||
it("no mentions", () => {
|
||||
|
|
@ -488,8 +482,9 @@ describe("<SendMessageComposer/>", () => {
|
|||
fireEvent.keyDown(container.querySelector(".mx_SendMessageComposer")!, { key: "Enter" });
|
||||
|
||||
expect(mockClient.sendMessage).toHaveBeenCalledWith("myfakeroom", null, {
|
||||
body: "test message",
|
||||
msgtype: MsgType.Text,
|
||||
"body": "test message",
|
||||
"msgtype": MsgType.Text,
|
||||
"m.mentions": {},
|
||||
});
|
||||
});
|
||||
|
||||
|
|
@ -507,8 +502,9 @@ describe("<SendMessageComposer/>", () => {
|
|||
fireEvent.keyDown(container.querySelector(".mx_SendMessageComposer")!, { key: "Enter" });
|
||||
|
||||
expect(mockClient.sendMessage).toHaveBeenCalledWith("myfakeroom", null, {
|
||||
body: "test message",
|
||||
msgtype: MsgType.Text,
|
||||
"body": "test message",
|
||||
"msgtype": MsgType.Text,
|
||||
"m.mentions": {},
|
||||
});
|
||||
|
||||
expect(defaultDispatcher.dispatch).toHaveBeenCalledWith({ action: `effects.confetti` });
|
||||
|
|
@ -534,8 +530,9 @@ describe("<SendMessageComposer/>", () => {
|
|||
fireEvent.keyDown(container.querySelector(".mx_SendMessageComposer")!, { key: "Enter" });
|
||||
|
||||
expect(mockClient.sendMessage).toHaveBeenCalledWith("myfakeroom", null, {
|
||||
body: "test message",
|
||||
msgtype: MsgType.Text,
|
||||
"body": "test message",
|
||||
"msgtype": MsgType.Text,
|
||||
"m.mentions": {},
|
||||
});
|
||||
|
||||
expect(defaultDispatcher.dispatch).not.toHaveBeenCalledWith({ action: `effects.confetti` });
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ import { RoomPermalinkCreator } from "../../../../src/utils/permalinks/Permalink
|
|||
import { VoiceRecordingStore } from "../../../../src/stores/VoiceRecordingStore";
|
||||
import { PlaybackClock } from "../../../../src/audio/PlaybackClock";
|
||||
import { mkEvent } from "../../../test-utils";
|
||||
import SettingsStore from "../../../../src/settings/SettingsStore";
|
||||
|
||||
jest.mock("../../../../src/utils/local-room", () => ({
|
||||
doMaybeLocalRoomAction: jest.fn(),
|
||||
|
|
@ -103,10 +102,6 @@ describe("<VoiceRecordComposerTile/>", () => {
|
|||
return fn(roomId);
|
||||
},
|
||||
);
|
||||
|
||||
jest.spyOn(SettingsStore, "getValue").mockImplementation(
|
||||
(settingName) => settingName === "feature_intentional_mentions",
|
||||
);
|
||||
});
|
||||
|
||||
describe("send", () => {
|
||||
|
|
|
|||
|
|
@ -15,18 +15,11 @@ limitations under the License.
|
|||
*/
|
||||
|
||||
import React from "react";
|
||||
import { render, screen, waitFor } from "@testing-library/react";
|
||||
import { defer } from "matrix-js-sdk/src/utils";
|
||||
import { render, screen } from "@testing-library/react";
|
||||
|
||||
import LabsUserSettingsTab from "../../../../../../src/components/views/settings/tabs/user/LabsUserSettingsTab";
|
||||
import SettingsStore from "../../../../../../src/settings/SettingsStore";
|
||||
import {
|
||||
getMockClientWithEventEmitter,
|
||||
mockClientMethodsServer,
|
||||
mockClientMethodsUser,
|
||||
} from "../../../../../test-utils";
|
||||
import SdkConfig from "../../../../../../src/SdkConfig";
|
||||
import MatrixClientBackedController from "../../../../../../src/settings/controllers/MatrixClientBackedController";
|
||||
|
||||
describe("<LabsUserSettingsTab />", () => {
|
||||
const sdkConfigSpy = jest.spyOn(SdkConfig, "get");
|
||||
|
|
@ -36,12 +29,6 @@ describe("<LabsUserSettingsTab />", () => {
|
|||
};
|
||||
const getComponent = () => <LabsUserSettingsTab {...defaultProps} />;
|
||||
|
||||
const userId = "@alice:server.org";
|
||||
const cli = getMockClientWithEventEmitter({
|
||||
...mockClientMethodsUser(userId),
|
||||
...mockClientMethodsServer(),
|
||||
});
|
||||
|
||||
const settingsValueSpy = jest.spyOn(SettingsStore, "getValue");
|
||||
|
||||
beforeEach(() => {
|
||||
|
|
@ -73,31 +60,4 @@ describe("<LabsUserSettingsTab />", () => {
|
|||
const labsSections = container.getElementsByClassName("mx_SettingsSubsection");
|
||||
expect(labsSections).toHaveLength(9);
|
||||
});
|
||||
|
||||
it("allow setting a labs flag which requires unstable support once support is confirmed", async () => {
|
||||
// enable labs
|
||||
sdkConfigSpy.mockImplementation((configName) => configName === "show_labs_settings");
|
||||
|
||||
const deferred = defer<boolean>();
|
||||
cli.doesServerSupportUnstableFeature.mockImplementation(async (featureName) => {
|
||||
return featureName === "org.matrix.msc3952_intentional_mentions" ? deferred.promise : false;
|
||||
});
|
||||
MatrixClientBackedController.matrixClient = cli;
|
||||
|
||||
const { queryByText } = render(getComponent());
|
||||
|
||||
expect(
|
||||
queryByText("Enable intentional mentions")!
|
||||
.closest(".mx_SettingsFlag")!
|
||||
.querySelector(".mx_AccessibleButton"),
|
||||
).toHaveAttribute("aria-disabled", "true");
|
||||
deferred.resolve(true);
|
||||
await waitFor(() => {
|
||||
expect(
|
||||
queryByText("Enable intentional mentions")!
|
||||
.closest(".mx_SettingsFlag")!
|
||||
.querySelector(".mx_AccessibleButton"),
|
||||
).toHaveAttribute("aria-disabled", "false");
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue