Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Fix: Editing a poll will silently change it to a closed poll #9809

Merged
merged 3 commits into from
Dec 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/views/elements/PollCreateDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export default class PollCreateDialog extends ScrollableBaseModal<IProps, IState
const pollStart = PollStartEvent.from(
this.state.question.trim(),
this.state.options.map((a) => a.trim()).filter((a) => !!a),
this.state.kind,
this.state.kind.name,
).serialize();

if (!this.props.editingMxEvent) {
Expand Down
19 changes: 19 additions & 0 deletions test/components/views/elements/PollCreateDialog-test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,25 @@ describe("PollCreateDialog", () => {
},
});
});

it("retains poll disclosure type when editing", () => {
const previousEvent: MatrixEvent = new MatrixEvent(
PollStartEvent.from("Poll Q", ["Answer 1", "Answer 2"], M_POLL_KIND_DISCLOSED).serialize(),
);
previousEvent.event.event_id = "$prevEventId";

const dialog = mount(
<PollCreateDialog room={createRoom()} onFinished={jest.fn()} editingMxEvent={previousEvent} />,
);

changeValue(dialog, "Question or topic", "Poll Q updated");
dialog.find("button").simulate("click");

const [, , eventType, sentEventContent] = mockClient.sendEvent.mock.calls[0];
expect(M_POLL_START.matches(eventType)).toBeTruthy();
// didnt change
expect(sentEventContent["m.new_content"][M_POLL_START.name].kind).toEqual(M_POLL_KIND_DISCLOSED.name);
});
});

function createRoom(): Room {
Expand Down