@@ -4080,56 +4080,51 @@ describe("matrix live qa scenarios", () => {
4080408040814081const scenario = requireMatrixQaScenario("matrix-e2ee-verification-notice-no-trigger");
408240824083-await expect(
4084-runMatrixQaScenario(scenario, {
4085-baseUrl: "http://127.0.0.1:28008/",
4086-canary: undefined,
4087-driverAccessToken: "driver-token",
4088-driverDeviceId: "DRIVERDEVICE",
4089-driverUserId: "@driver:matrix-qa.test",
4090-observedEvents: [],
4091-observerAccessToken: "observer-token",
4092-observerUserId: "@observer:matrix-qa.test",
4093-outputDir: "/tmp/matrix-qa",
4094-roomId: "!main:matrix-qa.test",
4095-restartGateway: undefined,
4096-syncState: {},
4097-sutAccessToken: "sut-token",
4098-sutUserId: "@sut:matrix-qa.test",
4099-timeoutMs: 8_000,
4100-topology: {
4101-defaultRoomId: "!main:matrix-qa.test",
4102-defaultRoomKey: "main",
4103-rooms: [
4104-{
4105-key: matrixQaE2eeRoomKey("matrix-e2ee-verification-notice-no-trigger"),
4106-kind: "group",
4107-memberRoles: ["driver", "observer", "sut"],
4108-memberUserIds: [
4109-"@driver:matrix-qa.test",
4110-"@observer:matrix-qa.test",
4111-"@sut:matrix-qa.test",
4112-],
4113-name: "E2EE",
4114-requireMention: true,
4115-roomId: "!e2ee:matrix-qa.test",
4116-},
4117-],
4118-},
4119-}),
4120-).resolves.toMatchObject({
4121-artifacts: {
4122-noticeEventId: "$verification-notice",
4123-roomId: "!e2ee:matrix-qa.test",
4083+const result = await runMatrixQaScenario(scenario, {
4084+baseUrl: "http://127.0.0.1:28008/",
4085+canary: undefined,
4086+driverAccessToken: "driver-token",
4087+driverDeviceId: "DRIVERDEVICE",
4088+driverUserId: "@driver:matrix-qa.test",
4089+observedEvents: [],
4090+observerAccessToken: "observer-token",
4091+observerUserId: "@observer:matrix-qa.test",
4092+outputDir: "/tmp/matrix-qa",
4093+roomId: "!main:matrix-qa.test",
4094+restartGateway: undefined,
4095+syncState: {},
4096+sutAccessToken: "sut-token",
4097+sutUserId: "@sut:matrix-qa.test",
4098+timeoutMs: 8_000,
4099+topology: {
4100+defaultRoomId: "!main:matrix-qa.test",
4101+defaultRoomKey: "main",
4102+rooms: [
4103+{
4104+key: matrixQaE2eeRoomKey("matrix-e2ee-verification-notice-no-trigger"),
4105+kind: "group",
4106+memberRoles: ["driver", "observer", "sut"],
4107+memberUserIds: [
4108+"@driver:matrix-qa.test",
4109+"@observer:matrix-qa.test",
4110+"@sut:matrix-qa.test",
4111+],
4112+name: "E2EE",
4113+requireMention: true,
4114+roomId: "!e2ee:matrix-qa.test",
4115+},
4116+],
41244117},
41254118});
4119+const artifacts = result.artifacts as {
4120+noticeEventId?: unknown;
4121+roomId?: unknown;
4122+};
4123+expect(artifacts.noticeEventId).toBe("$verification-notice");
4124+expect(artifacts.roomId).toBe("!e2ee:matrix-qa.test");
4126412541274126expect(noticeToken).toMatch(/^MATRIX_QA_E2EE_VERIFY_NOTICE_[A-Z0-9]+$/);
4128-expect(waitForOptionalRoomEvent).toHaveBeenCalledWith(
4129-expect.objectContaining({
4130-roomId: "!e2ee:matrix-qa.test",
4131-}),
4132-);
4127+expect(waitForOptionalRoomEvent.mock.calls[0]?.[0]?.roomId).toBe("!e2ee:matrix-qa.test");
41334128});
4134412941354130it("applies a recovery key before restoring backed up room keys", async () => {
@@ -4203,55 +4198,58 @@ describe("matrix live qa scenarios", () => {
4203419842044199const scenario = requireMatrixQaScenario("matrix-e2ee-recovery-key-lifecycle");
420542004206-await expect(
4207-runMatrixQaScenario(scenario, {
4208-baseUrl: "http://127.0.0.1:28008/",
4209-canary: undefined,
4210-driverAccessToken: "driver-token",
4211-driverDeviceId: "DRIVERDEVICE",
4212-driverPassword: "driver-password",
4213-driverUserId: "@driver:matrix-qa.test",
4214-observedEvents: [],
4215-observerAccessToken: "observer-token",
4216-observerUserId: "@observer:matrix-qa.test",
4217-outputDir: "/tmp/matrix-qa",
4218-roomId: "!main:matrix-qa.test",
4219-restartGateway: undefined,
4220-syncState: {},
4221-sutAccessToken: "sut-token",
4222-sutUserId: "@sut:matrix-qa.test",
4223-timeoutMs: 8_000,
4224-topology: {
4225-defaultRoomId: "!main:matrix-qa.test",
4226-defaultRoomKey: "main",
4227-rooms: [
4228-{
4229-encrypted: true,
4230-key: matrixQaE2eeRoomKey("matrix-e2ee-recovery-key-lifecycle"),
4231-kind: "group",
4232-memberRoles: ["driver", "observer", "sut"],
4233-memberUserIds: [
4234-"@driver:matrix-qa.test",
4235-"@observer:matrix-qa.test",
4236-"@sut:matrix-qa.test",
4237-],
4238-name: "E2EE",
4239-requireMention: true,
4240-roomId: "!e2ee:matrix-qa.test",
4241-},
4242-],
4243-},
4244-}),
4245-).resolves.toMatchObject({
4246-artifacts: {
4247-backupRestored: true,
4248-recoveryDeviceId: "RECOVERYDEVICE",
4249-recoveryKeyUsable: true,
4250-recoveryVerified: true,
4251-restoreImported: 1,
4252-restoreTotal: 1,
4201+const result = await runMatrixQaScenario(scenario, {
4202+baseUrl: "http://127.0.0.1:28008/",
4203+canary: undefined,
4204+driverAccessToken: "driver-token",
4205+driverDeviceId: "DRIVERDEVICE",
4206+driverPassword: "driver-password",
4207+driverUserId: "@driver:matrix-qa.test",
4208+observedEvents: [],
4209+observerAccessToken: "observer-token",
4210+observerUserId: "@observer:matrix-qa.test",
4211+outputDir: "/tmp/matrix-qa",
4212+roomId: "!main:matrix-qa.test",
4213+restartGateway: undefined,
4214+syncState: {},
4215+sutAccessToken: "sut-token",
4216+sutUserId: "@sut:matrix-qa.test",
4217+timeoutMs: 8_000,
4218+topology: {
4219+defaultRoomId: "!main:matrix-qa.test",
4220+defaultRoomKey: "main",
4221+rooms: [
4222+{
4223+encrypted: true,
4224+key: matrixQaE2eeRoomKey("matrix-e2ee-recovery-key-lifecycle"),
4225+kind: "group",
4226+memberRoles: ["driver", "observer", "sut"],
4227+memberUserIds: [
4228+"@driver:matrix-qa.test",
4229+"@observer:matrix-qa.test",
4230+"@sut:matrix-qa.test",
4231+],
4232+name: "E2EE",
4233+requireMention: true,
4234+roomId: "!e2ee:matrix-qa.test",
4235+},
4236+],
42534237},
42544238});
4239+const artifacts = result.artifacts as {
4240+backupRestored?: unknown;
4241+recoveryDeviceId?: unknown;
4242+recoveryKeyUsable?: unknown;
4243+recoveryVerified?: unknown;
4244+restoreImported?: unknown;
4245+restoreTotal?: unknown;
4246+};
4247+expect(artifacts.backupRestored).toBe(true);
4248+expect(artifacts.recoveryDeviceId).toBe("RECOVERYDEVICE");
4249+expect(artifacts.recoveryKeyUsable).toBe(true);
4250+expect(artifacts.recoveryVerified).toBe(true);
4251+expect(artifacts.restoreImported).toBe(1);
4252+expect(artifacts.restoreTotal).toBe(1);
4255425342564254expect(ownerBootstrapOwnDeviceVerification).toHaveBeenCalledWith({
42574255allowAutomaticCrossSigningReset: false,
此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。 原文来自 — 版权归原作者所有。