Merge branch 'develop' into widget_state_no_update_invitation_room

cypress/e2e/editing/editing.spec.ts

@@ -108,7 +108,7 @@ describe("Editing", () => {
             // send a load of padding events. We make them large, so that they fill the whole screen
             // and the client doesn't end up paginating into the event we want.
             let i = 0;
-            while (i < 20) {
+            while (i < 10) {
                 await bob.sendMessage(room.room_id, mkPadding(i++));
             }
 
@@ -127,7 +127,7 @@ describe("Editing", () => {
             cy.log(`Bot user sent edit event ${editEventId}`);
 
             // ... then a load more padding ...
-            while (i < 40) {
+            while (i < 20) {
                 await bob.sendMessage(room.room_id, mkPadding(i++));
             }
         });

cypress/e2e/polls/polls.spec.ts

@@ -16,8 +16,6 @@ limitations under the License.
 
 /// <reference types="cypress" />
 
-import { PollResponseEvent } from "matrix-events-sdk";
-
 import { HomeserverInstance } from "../../plugins/utils/homeserver";
 import { MatrixClient } from "../../global";
 import Chainable = Cypress.Chainable;
@@ -70,8 +68,16 @@ describe("Polls", () => {
             cy.get('input[type="radio"]')
                 .invoke("attr", "value")
                 .then((optionId) => {
-                    const pollVote = PollResponseEvent.from([optionId], pollId).serialize();
-                    bot.sendEvent(roomId, pollVote.type, pollVote.content);
+                    // We can't use the js-sdk types for this stuff directly, so manually construct the event.
+                    bot.sendEvent(roomId, "org.matrix.msc3381.poll.response", {
+                        "m.relates_to": {
+                            rel_type: "m.reference",
+                            event_id: pollId,
+                        },
+                        "org.matrix.msc3381.poll.response": {
+                            answers: [optionId],
+                        },
+                    });
                 });
         });
     };