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

Fix rte flaky test #9811

Merged
merged 2 commits into from
Dec 21, 2022
Merged

Fix rte flaky test #9811

merged 2 commits into from
Dec 21, 2022

Conversation

florianduros
Copy link
Contributor

@florianduros florianduros commented Dec 21, 2022

Checklist

  • Tests written for new code (and old code if feasible)
  • Linter and other CI checks pass
  • Sign-off given on the changes (see CONTRIBUTING.md)

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

@florianduros florianduros added the T-Task Refactoring, enabling or disabling functionality, other engineering tasks label Dec 21, 2022
@florianduros florianduros enabled auto-merge (squash) December 21, 2022 11:03
@florianduros florianduros merged commit 7db2ee7 into develop Dec 21, 2022
@florianduros florianduros deleted the tech/fix-rte-flaky-test branch December 21, 2022 11:22
weeman1337 pushed a commit that referenced this pull request Dec 21, 2022
weeman1337 added a commit that referenced this pull request Dec 21, 2022
turt2live pushed a commit that referenced this pull request Dec 21, 2022
* Prevent unnecessary m.direct updates

Signed-off-by: Michael Weimann <michaelw@matrix.org>

* Replace object with Map

* Clean up comment; simplify code

* Fix rte flaky test (#9811)

* Snap in PiP widget when content changed (#9797)

* Check modified at the end of setDMRoom

* Revert "Snap in PiP widget when content changed (#9797)"

This reverts commit be1e575.

* Revert "Fix rte flaky test (#9811)"

This reverts commit 20d9eb3.

* Update src/Rooms.ts

Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>

Signed-off-by: Michael Weimann <michaelw@matrix.org>
Co-authored-by: Florian Duros <florianduros@element.io>
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
RiotRobot pushed a commit that referenced this pull request Dec 21, 2022
* Prevent unnecessary m.direct updates

Signed-off-by: Michael Weimann <michaelw@matrix.org>

* Replace object with Map

* Clean up comment; simplify code

* Fix rte flaky test (#9811)

* Snap in PiP widget when content changed (#9797)

* Check modified at the end of setDMRoom

* Revert "Snap in PiP widget when content changed (#9797)"

This reverts commit be1e575.

* Revert "Fix rte flaky test (#9811)"

This reverts commit 20d9eb3.

* Update src/Rooms.ts

Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>

Signed-off-by: Michael Weimann <michaelw@matrix.org>
Co-authored-by: Florian Duros <florianduros@element.io>
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
(cherry picked from commit 93dd010)
turt2live added a commit that referenced this pull request Dec 21, 2022
* Prevent unnecessary m.direct updates (#9805)

* Prevent unnecessary m.direct updates

Signed-off-by: Michael Weimann <michaelw@matrix.org>

* Replace object with Map

* Clean up comment; simplify code

* Fix rte flaky test (#9811)

* Snap in PiP widget when content changed (#9797)

* Check modified at the end of setDMRoom

* Revert "Snap in PiP widget when content changed (#9797)"

This reverts commit be1e575.

* Revert "Fix rte flaky test (#9811)"

This reverts commit 20d9eb3.

* Update src/Rooms.ts

Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>

Signed-off-by: Michael Weimann <michaelw@matrix.org>
Co-authored-by: Florian Duros <florianduros@element.io>
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
(cherry picked from commit 93dd010)

* Use a function that exists on staging

Co-authored-by: Michael Weimann <michaelw@matrix.org>
Co-authored-by: Travis Ralston <travisr@matrix.org>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
T-Task Refactoring, enabling or disabling functionality, other engineering tasks
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants