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

Fix cypress test for events from unsigned devices #11636

Merged
richvdh merged 1 commit into from
Sep 21, 2023
Merged

Fix cypress test for events from unsigned devices #11636

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions cypress/e2e/crypto/crypto.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,9 +404,9 @@ describe("Cryptography", function () {

cy.get(".mx_EventTile_last")
.should("contain", "test encrypted from unverified")
.find(".mx_EventTile_e2eIcon", { timeout: 100000 })
.find(".mx_EventTile_e2eIcon")
Copy link
Copy Markdown
Member Author

@richvdh richvdh Sep 20, 2023

Choose a reason for hiding this comment

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

I set this timeout very high when I was debugging and apparently forgot to reduce it.

.should("have.class", "mx_EventTile_e2eIcon_warning")
.should("have.attr", "aria-label", "Encrypted by an unverified user.");
.should("have.attr", "aria-label", "Encrypted by a device not verified by its owner.");
Copy link
Copy Markdown
Member Author

@richvdh richvdh Sep 20, 2023

Choose a reason for hiding this comment

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

this is the actual fix in this PR


/* Should show a grey padlock for a message from an unknown device */

Expand All @@ -415,10 +415,12 @@ describe("Cryptography", function () {
.then(() => bobSecondDevice.logout(true))
.then(() => cy.log(`Bob logged out second device`));

// some debate over whether this should have a red or a grey shield. Legacy crypto shows a grey shield,
// Rust crypto a red one.
cy.get(".mx_EventTile_last")
.should("contain", "test encrypted from unverified")
.find(".mx_EventTile_e2eIcon")
.should("have.class", "mx_EventTile_e2eIcon_normal")
//.should("have.class", "mx_EventTile_e2eIcon_normal")
Copy link
Copy Markdown
Member

@t3chguy t3chguy Sep 20, 2023

Choose a reason for hiding this comment

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

Should this be removed rather than comment out?

Copy link
Copy Markdown
Member Author

@richvdh richvdh Sep 20, 2023

Choose a reason for hiding this comment

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

hrm, maybe. I'm trying to highlight the fact that we deliberately aren't testing the class (and also, making it easier to put back once we make our mind up what we're doing).

.should("have.attr", "aria-label", "Encrypted by an unknown or deleted device.");
Comment on lines +418 to 424
Copy link
Copy Markdown
Member Author

@richvdh richvdh Sep 20, 2023

Choose a reason for hiding this comment

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

this is actually a separate fix, but it's kinda handy to throw into this PR

});

Expand All @@ -437,7 +439,7 @@ describe("Cryptography", function () {
// no e2e icon
.should("not.have.descendants", ".mx_EventTile_e2eIcon");

/* log out, and back i */
/* log out, and back in */
logOutOfElement();
cy.get<string>("@securityKey").then((securityKey) => {
logIntoElement(homeserver.baseUrl, aliceCredentials.username, aliceCredentials.password, securityKey);
Expand Down