snapshot of https://github.com/mattermost/mattermost.git (master, 2026-09-16; blobs > 131072B omitted)

e2e-tests/playwright/specs/functional/channels/content_flagging/edge-cases/author-deletes-message-before-review.spec.ts

@@ -0,0 +1,49 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {expect, test} from '@mattermost/playwright-lib';
+
+import {createPost, verifyAuthorNotification, setupContentFlagging} from './../support';
+
+/**
+ * @objective Verify that when the author deletes a flagged message before review,
+ * the flag status is updated to "Removed" and the report reflects the deletion.
+ */
+// TODO: Fix defect https://mattermost.atlassian.net/browse/MM-66342
+test.skip('should not be able to restore flagged messages when author deletes message', async ({pw}) => {
+    const {adminClient, team, user: reviewerUser} = await pw.initSetup();
+    // Create second user and add to team
+    const reporterUser = await pw.random.user('second');
+    const {id: reporterUserID} = await adminClient.createUser(reporterUser, '', '');
+    await adminClient.addToTeam(team.id, reporterUserID);
+
+    // Create third user and add to team
+    const postFromThirdUser = await pw.random.user('third');
+    const {id: postFromThirdUserID} = await adminClient.createUser(postFromThirdUser, '', '');
+    await adminClient.addToTeam(team.id, postFromThirdUserID);
+
+    const {client: thirdUserClient} = await pw.makeClient(postFromThirdUser);
+    const {client: reporterUserClient} = await pw.makeClient(reporterUser);
+
+    await setupContentFlagging(adminClient, [reviewerUser.id], true, false);
+    const message = `Post by @${reviewerUser.username}, is flagged once`;
+
+    const {post} = await createPost(adminClient, thirdUserClient, team, postFromThirdUser, message);
+
+    await reporterUserClient.flagPost(post.id, 'Classification mismatch', 'This message is inappropriate');
+
+    // delete the post as the author
+    await thirdUserClient.deletePost(post.id);
+
+    // verify the flag status is updated to "Removed"
+    const flagReport = await adminClient.getFlaggedPost(post.id);
+
+    // Verify the delete_at timestamp is set (indicating deletion)
+    expect(flagReport.delete_at).not.toBe(0);
+
+    const {channelsPage, contentReviewPage} = await pw.testBrowser.login(reviewerUser);
+    await channelsPage.goto(team.name, 'town-square');
+    await channelsPage.toBeVisible();
+
+    await verifyAuthorNotification(post.id, channelsPage, contentReviewPage, team.name, message, 'Removed');
+});

e2e-tests/playwright/specs/functional/channels/content_flagging/edge-cases/author-edits-message-during-review.spec.ts

@@ -0,0 +1,77 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {test} from '@mattermost/playwright-lib';
+
+import {createPost, verifyAuthorNotification, setupContentFlagging} from './../support';
+
+/** @objective Verify Post message is updated for the reviewer, if author updates the post before reviewer's action
+ * @testcase
+ * 1. Setup Content Flagging with reviewers
+ * 2. Create a post by User A
+ * 3. Flag the post by User B
+ * 4. Edit the post by User A before reviewer's action
+ * 5. Login as Reviewer and verify the updated message in Content Review page
+ */
+test("Verify Post message is updated for the reviewer, if author updates the post before reviewer's action ", async ({
+    pw,
+}) => {
+    const {adminClient, team, user, userClient, adminUser} = await pw.initSetup();
+
+    // Create second user and add to team
+    const secondUser = await pw.random.user('reviewer');
+    const {id: secondUserID} = await adminClient.createUser(secondUser, '', '');
+    await adminClient.addToTeam(team.id, secondUserID);
+    // Promote to system_admin so SystemAdminsAsReviewers:true (the test-suite default)
+    // keeps them as a reviewer even if a concurrent initSetup() resets CommonReviewerIds:[].
+    await adminClient.updateUserRoles(secondUserID, 'system_user system_admin');
+
+    // Setup content flagging with explicit reviewer list and HideFlaggedContent=false.
+    // The default test config sets EnableContentFlagging=true and SystemAdminsAsReviewers=true,
+    // so concurrent initSetup() resets from other workers cannot silently disable this test.
+    await setupContentFlagging(adminClient, [adminUser.id, secondUserID], true, false);
+
+    const message = `Post by @${user.username}, is flagged once`;
+
+    const {post} = await createPost(adminClient, userClient, team, user, message);
+    await adminClient.flagPost(post.id, 'Classification mismatch', 'This message is inappropriate');
+
+    let updatedMessage = `${message} - Edited during review`;
+    await userClient.updatePost({
+        id: post.id,
+        create_at: post.create_at,
+        update_at: Date.now(),
+        edit_at: 0,
+        delete_at: 0,
+        is_pinned: false,
+        user_id: post.user_id,
+        channel_id: post.channel_id,
+        root_id: '',
+        original_id: '',
+        message: updatedMessage,
+        type: '',
+        props: {},
+        hashtags: '',
+        file_ids: [],
+        pending_post_id: '',
+        remote_id: '',
+        reply_count: 0,
+        last_reply_at: 0,
+        participants: null,
+        metadata: post.metadata,
+    });
+
+    const {channelsPage: secondChannelsPage, contentReviewPage: secondContentReviewPage} =
+        await pw.testBrowser.login(secondUser);
+
+    // The edited post will have Edited indicator automatically added by the system
+    updatedMessage = `${updatedMessage} Edited`;
+    await verifyAuthorNotification(
+        post.id,
+        secondChannelsPage,
+        secondContentReviewPage,
+        team.name,
+        updatedMessage,
+        'Pending',
+    );
+});