From 5dae96f06d11481c36e31c759fc9a66d251b1853 Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Wed, 6 Dec 2023 18:01:31 +0000
Subject: [PATCH] Fix playwright result reporting for js-sdk upstream tests
Make the reporter job check out the react sdk explictly so it gets
the right thing when used from other workflows like the js-sdk.
---
.github/workflows/end-to-end-tests.yaml | 5 +++++
cypress/e2e/read-receipts/read-receipts-utils.ts | 3 ++-
cypress/e2e/read-receipts/redactions.spec.ts | 2 +-
src/components/structures/TimelinePanel.tsx | 6 +++---
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/end-to-end-tests.yaml b/.github/workflows/end-to-end-tests.yaml
index e476494611..2a506d8505 100644
--- a/.github/workflows/end-to-end-tests.yaml
+++ b/.github/workflows/end-to-end-tests.yaml
@@ -124,6 +124,11 @@ jobs:
deployments: write
steps:
- uses: actions/checkout@v4
+ with:
+ ref: ${{ steps.sha.outputs.sha }}
+ persist-credentials: false
+ path: matrix-react-sdk
+ repository: ${{ inputs.react-sdk-repository || github.repository }}
- uses: actions/setup-node@v4
with:
diff --git a/cypress/e2e/read-receipts/read-receipts-utils.ts b/cypress/e2e/read-receipts/read-receipts-utils.ts
index 0e6b7d5e82..39a0fec522 100644
--- a/cypress/e2e/read-receipts/read-receipts-utils.ts
+++ b/cypress/e2e/read-receipts/read-receipts-utils.ts
@@ -359,7 +359,8 @@ export function openThread(rootMessage: string) {
.findByRole("button", { name: "Reply in thread", log: false })
.click();
});
- cy.get(".mx_ThreadView_timelinePanelWrapper", { log: false }).should("have.length", 1);
+ //cy.get(".mx_ThreadView_timelinePanelWrapper", { log: false }).should("have.length", 1);
+ cy.get(".mx_ThreadView_timelinePanelWrapper", { log: false }).get(".mx_Spinner").should("not.exist");
}
/**
diff --git a/cypress/e2e/read-receipts/redactions.spec.ts b/cypress/e2e/read-receipts/redactions.spec.ts
index a978b4013e..cc565f5989 100644
--- a/cypress/e2e/read-receipts/redactions.spec.ts
+++ b/cypress/e2e/read-receipts/redactions.spec.ts
@@ -380,7 +380,7 @@ describe("Read receipts", () => {
assertReadThread("Root");
});
// XXX: fails because it flakes (on CI only)
- it.skip("Reading an unread thread after a redaction of the latest message makes it read", () => {
+ it.only("Reading an unread thread after a redaction of the latest message makes it read", () => {
// Given an unread thread where the latest message was redacted
goTo(room1);
receiveMessages(room2, ["Root", threadedOff("Root", "ThreadMsg1"), threadedOff("Root", "ThreadMsg2")]);
diff --git a/src/components/structures/TimelinePanel.tsx b/src/components/structures/TimelinePanel.tsx
index 7d1ce90762..bdda65b504 100644
--- a/src/components/structures/TimelinePanel.tsx
+++ b/src/components/structures/TimelinePanel.tsx
@@ -80,9 +80,9 @@ const READ_MARKER_DEBOUNCE_MS = 100;
const VISIBLE_DECRYPTION_FAILURE_MARGIN = 100;
const debuglog = (...args: any[]): void => {
- if (SettingsStore.getValue("debug_timeline_panel")) {
- logger.log.call(console, "TimelinePanel debuglog:", ...args);
- }
+ //if (SettingsStore.getValue("debug_timeline_panel")) {
+ logger.log.call(console, "TimelinePanel debuglog:", ...args);
+ //}
};
const overlaysBefore = (overlayEvent: MatrixEvent, mainEvent: MatrixEvent): boolean =>
--
GitLab