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

Add a 'm.relates_to' to edits in receipt tests and disable failing tests #11501

Merged
merged 4 commits into from
Sep 4, 2023
Merged

Add a 'm.relates_to' to edits in receipt tests and disable failing tests #11501

merged 4 commits into from
Sep 4, 2023

Conversation

andybalaam
Copy link
Member

@andybalaam andybalaam commented Aug 31, 2023 •
edited by github-actions bot
Loading

Part of element-hq/element-web#25449

This change is marked as an internal change (Task), so will not be included in the changelog.

@andybalaam andybalaam added the T-Task Refactoring, enabling or disabling functionality, other engineering tasks label Aug 31, 2023
@andybalaam andybalaam marked this pull request as ready for review September 1, 2023 11:29
@andybalaam andybalaam requested a review from a team as a code owner September 1, 2023 11:29
t3chguy
t3chguy suggested changes Sep 1, 2023
View reviewed changes
Copy link
Member

@t3chguy t3chguy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think if adding this means disabling a chunk of the tests then it is a bad idea, can we fix them in the same PR?

@andybalaam
Copy link
Member Author

I think if adding this means disabling a chunk of the tests then it is a bad idea, can we fix them in the same PR?

I've spent the last 2 days trying to fix them and haven't figured it out yet. The tests were never valid because we were not actually sending events that Element Web recognised as edits.

I've got lots of other changes queued behind this one, and every time these tests fail they crash the Chrome renderer, and take well over an hour to complete and give me a log file.

So I'd really like to merge this and return to the failing tests later.

@andybalaam andybalaam requested a review from t3chguy September 1, 2023 11:51
@t3chguy t3chguy changed the title Add a 'm.relates_to' to edits in receipt tests Add a 'm.relates_to' to edits in receipt tests and disable failing tests Sep 1, 2023
@andybalaam andybalaam added this pull request to the merge queue Sep 1, 2023
@andybalaam
Copy link
Member Author

Meanwhile, I have had some thoughts about what is happening. All the failures are related to "mark as read", which we know is causing other failures too, so I'll work on re-enabling some tests by changing them to avoid using mark as read (in cases where it is not needed).

@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Sep 1, 2023
@andybalaam andybalaam added this pull request to the merge queue Sep 4, 2023
Merged via the queue into develop with commit f8ff953 Sep 4, 2023
23 checks passed
@andybalaam andybalaam deleted the andybalaam/just-fix-edit branch September 4, 2023 16:58
nurjinjafar pushed a commit to nordeck/matrix-react-sdk that referenced this pull request Sep 6, 2023
@andybalaam @nurjinjafar
Add a 'm.relates_to' to edits in receipt tests and disable failing te…
555faa2 
…sts (matrix-org#11501)

* Add a 'm.relates_to' to edits in receipt tests

* Disable a test that fails with real edits

* Wait for the room to be read after we mark it as read

* Skip tests that are failing because of inconsistencies between local and CI behaviour
github-merge-queue bot pushed a commit that referenced this pull request Sep 7, 2023
@nurjinjafar @ahmadkadri
@andybalaam @Johennes @charlynguyen @richvdh @t3chguy @renovate
Notify users about denied access on ask-to-join rooms (#11480)
ce96853 
* Implement denied request mask and logic

Signed-off-by: AHMAD KADRI <[email protected]>

* refactor / fix deny requests isues

* fix tests create denied message test

Signed-off-by: AHMAD KADRI <[email protected]>

* add another test for the primary action for denied request

Signed-off-by: AHMAD KADRI <[email protected]>

* fix linter issues

Signed-off-by: nurjinn jafar <[email protected]>

* regenerate translation

Signed-off-by: nurjinn jafar <[email protected]>

* fix translation and minor refactoring
Signed-off-by: nurjinn jafar <[email protected]>

* segment into 4

* Remove parallel from Cypress command to avoid talking to Cypress Cloud

* Re-add --parallel flag for Percy

* Prevent event propagation when clicking icon buttons (#11515)

* Prevent event propagation when clicking icon buttons

* Inhibit view user on click behaviour for room header face pile

* Update snapshot

* Add a 'm.relates_to' to edits in receipt tests and disable failing tests (#11501)

* Add a 'm.relates_to' to edits in receipt tests

* Disable a test that fails with real edits

* Wait for the room to be read after we mark it as read

* Skip tests that are failing because of inconsistencies between local and CI behaviour

* Allow creating public knock rooms (#11481)

* Allow creating public knock rooms

Signed-off-by: Charly Nguyen <[email protected]>

* Apply PR feedback

Signed-off-by: Charly Nguyen <[email protected]>

* Apply PR feedback

Signed-off-by: Charly Nguyen <[email protected]>

---------

Signed-off-by: Charly Nguyen <[email protected]>

* Collect `console.debug` logs during cypress tests (#11478)

In order for the logs collected by cypress to actually be useful, we really
need `cons:debug`.

* Migrate more strings to translation keys (#11522)

* Only show Search button in RoomSummaryCard if new room UI enabled (#11524)

* Only show Search button in RoomSummaryCard if new room UI enabled

* Update snapshot

* Update vector-im (#11526)

* Update vector-im

* Update snapshots of Compound Avatars

* Update snapshots of Compound Avatars

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <[email protected]>

* Migrate more strings to translation keys (#11530)

* Fix regression around FacePile with overflow (#11527)

* Work around compound-web AvatarStack not applying overlap to non-Avatars

* Fix FacePile overflow tile not being layed out correctly

* Use RoomStateEvent.Update for knocks (#11516)

Signed-off-by: Charly Nguyen <[email protected]>

* Cypress tests for event shields (#11525)

* Factor downloadKey out to `utils.ts`

* Add a new `describe` block for event shields

* create a beforeEach block

* Cypress tests for event shields

* Document how to match the CI config for Cypress (#11531)

* Document how to match the CI config for Cypress

* Clarify language about needing Chrome

* Move Cypress info into the Cypress-specific docs

* Migrate more strings to translation keys (#11532)

---------

Signed-off-by: AHMAD KADRI <[email protected]>
Signed-off-by: nurjinn jafar <[email protected]>
Signed-off-by: Charly Nguyen <[email protected]>
Co-authored-by: AHMAD KADRI <[email protected]>
Co-authored-by: Kerry Archibald <[email protected]>
Co-authored-by: Andy Balaam <[email protected]>
Co-authored-by: Johannes Marbach <[email protected]>
Co-authored-by: Germain <[email protected]>
Co-authored-by: Charly Nguyen <[email protected]>
Co-authored-by: Richard van der Hoff <[email protected]>
Co-authored-by: Michael Telatynski <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@t3chguy t3chguy t3chguy approved these changes

@kerryarchibald kerryarchibald Awaiting requested review from kerryarchibald kerryarchibald is a code owner automatically assigned from matrix-org/element-web-reviewers

Assignees
No one assigned
Labels
T-Task Refactoring, enabling or disabling functionality, other engineering tasks
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@andybalaam @t3chguy