From a53ef17e7fc7926ce712ccb88409118dc850d483 Mon Sep 17 00:00:00 2001
From: Splines <37160523+Splines@users.noreply.github.com>
Date: Mon, 9 Dec 2024 16:34:16 +0100
Subject: [PATCH] Fix flaky voucher redemption Cypress test (#726)

* Add cy.then after logout/login

* Wait for delete account request to have finished
---
 .../e2e/vouchers_redemptions_spec.cy.js       | 49 +++++++++++++------
 .../e2e/vouchers_redemptions_spec_helpers.js  |  4 +-
 2 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/spec/cypress/e2e/vouchers_redemptions_spec.cy.js b/spec/cypress/e2e/vouchers_redemptions_spec.cy.js
index 61ee1bf4e..e972b21d6 100644
--- a/spec/cypress/e2e/vouchers_redemptions_spec.cy.js
+++ b/spec/cypress/e2e/vouchers_redemptions_spec.cy.js
@@ -7,10 +7,13 @@ function testVoucherRedemptionWithNothingToClaim(context, role, itemType) {
   helpers.redeemVoucherToBecomeRole(context, role);
   helpers.verifyLectureIsSubscribed(context);
   helpers.logoutAndLoginAsTeacher(context);
-  helpers.visitEditPage(context, itemType);
-  helpers.verifyNoClaimsYetButUserEligibleForRole(context, role);
-  helpers.verifyRoleNotification(context, role);
-  helpers.verifyNothingClaimedInNotification(context, itemType);
+
+  cy.then(() => {
+    helpers.visitEditPage(context, itemType);
+    helpers.verifyNoClaimsYetButUserEligibleForRole(context, role);
+    helpers.verifyRoleNotification(context, role);
+    helpers.verifyNothingClaimedInNotification(context, itemType);
+  });
 }
 
 function testVoucherRedemptionWithSomethingClaimed(context, itemType, role) {
@@ -31,9 +34,9 @@ function testVoucherRedemptionWithSomethingClaimed(context, itemType, role) {
 
   helpers.verifyLectureIsSubscribed(context);
   helpers.logoutAndLoginAsTeacher(context);
-  helpers.visitEditPage(context, itemType);
 
   cy.then(() => {
+    helpers.visitEditPage(context, itemType);
     helpers.verifyClaimsContainUserName(context, itemType, itemIds);
   });
 
@@ -51,7 +54,9 @@ function testAlreadyRedeemedVoucher(context, role) {
   helpers.verifyAlreadyRedeemedVoucherMessage(context, role);
   helpers.verifyCancelVoucherButton();
   helpers.logoutAndLoginAsTeacher(context);
-  helpers.verifyNoNewNotification();
+  cy.then(() => {
+    helpers.verifyNoNewNotification();
+  });
 }
 
 function testAlreadyRoleForAllItems(context, itemType) {
@@ -60,7 +65,9 @@ function testAlreadyRoleForAllItems(context, itemType) {
   helpers.verifyAllItemsTakenMessage(context, itemType);
   helpers.verifyCancelVoucherButton();
   helpers.logoutAndLoginAsTeacher(context);
-  helpers.verifyNoNotification();
+  cy.then(() => {
+    helpers.verifyNoNotification();
+  });
 }
 
 describe("Verify Voucher Form", () => {
@@ -137,16 +144,21 @@ describe("Editor voucher redemption", () => {
       helpers.verifyAlreadyRedeemedVoucherMessage(this, "editor");
       helpers.verifyCancelVoucherButton();
       helpers.logoutAndLoginAsTeacher(this);
-      helpers.verifyNoNewNotification();
+      cy.then(() => {
+        helpers.verifyNoNewNotification();
+      });
     });
   });
 
   context("when the user is the teacher of the lecture", () => {
     it("displays the message that a teacher cannot become an editor", function () {
       helpers.logoutAndLoginAsTeacher(this);
-      helpers.submitVoucher(this.voucher);
-      helpers.verifyTeachersCantBecomeEditorsMessage(this);
-      helpers.verifyCancelVoucherButton();
+
+      cy.then(() => {
+        helpers.submitVoucher(this.voucher);
+        helpers.verifyTeachersCantBecomeEditorsMessage(this);
+        helpers.verifyCancelVoucherButton();
+      });
     });
   });
 });
@@ -172,9 +184,12 @@ describe("Teacher voucher redemption", () => {
   context("when the user is already the teacher", () => {
     it("displays a message that the user is already the teacher", function () {
       helpers.logoutAndLoginAsTeacher(this);
-      helpers.submitVoucher(this.voucher);
-      helpers.verifyAlreadyTeacherMessage(this);
-      helpers.verifyCancelVoucherButton();
+
+      cy.then(() => {
+        helpers.submitVoucher(this.voucher);
+        helpers.verifyAlreadyTeacherMessage(this);
+        helpers.verifyCancelVoucherButton();
+      });
     });
   });
 });
@@ -221,10 +236,16 @@ describe("User & Redemption deletion", () => {
     cy.visit("/profile/edit");
     cy.getBySelector("delete-account-btn").click();
     cy.getBySelector("delete-account-pwd-field").type(this.user.password);
+
+    cy.intercept("POST", "/users*").as("deleteUserRequest");
     cy.getBySelector("delete-account-confirm-btn").click();
+    cy.wait("@deleteUserRequest");
 
     cy.then(() => {
       helpers.logoutAndLoginAsTeacher(this);
+    });
+
+    cy.then(() => {
       helpers.visitEditPage(this, "tutorial");
       helpers.verifyNoTutorialsButUserEligibleAsTutor(this, false);
     });
diff --git a/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js b/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
index c53967f10..be7ef65d9 100644
--- a/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
+++ b/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
@@ -112,7 +112,9 @@ export function verifyClaimsContainUserName(context, claimType, claimIds, totalC
 
 export function logoutAndLoginAsTeacher(context) {
   cy.logout();
-  cy.login(context.teacher);
+  cy.then(() => {
+    cy.login(context.teacher);
+  });
 }
 
 export function verifyNoTutorialsButUserEligibleAsTutor(context, shouldBeEligible = true) {