Merge "Improve clearSessionStorage timings"

2 files changed, 7 insertions, 6 deletions

diff --git a/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts
index 027901f0f..ac36f6771 100644
--- a/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts
@@ -134,10 +134,11 @@ describe('View Edit Page: Upgrade VFModule', function () {
   describe('More UI test', () => {
 
     beforeEach(() => {
-      cy.clearSessionStorage();
-      cy.setTestApiParamToGR();
-      cy.initVidMock();
-      cy.login();
+      cy.clearSessionStorage().then(() => {
+        cy.setTestApiParamToGR();
+        cy.initVidMock();
+        cy.login();
+      });
     });
 
     afterEach(() => {
diff --git a/vid-webpack-master/cypress/support/application/application.session.actions.ts b/vid-webpack-master/cypress/support/application/application.session.actions.ts
index 9126ae1a4..99d5d867a 100644
--- a/vid-webpack-master/cypress/support/application/application.session.actions.ts
+++ b/vid-webpack-master/cypress/support/application/application.session.actions.ts
@@ -25,8 +25,8 @@ function getReduxState(): Chainable<any> {
   });
 }
 
-function clearSessionStorage() : void {
-  cy.window().then((win) => {
+function clearSessionStorage() : Cypress.Chainable<any> {
+  return cy.window().then((win) => {
     win.sessionStorage.clear();
   });
 }