Fix C388499

Author: usavkov-epam

cypress/e2e/consortia/switch-active-affiliation-option-is-not-displayed.cy.js

@@ -1,49 +1,59 @@
-import Permissions from '../../support/dictionary/permissions';
 import Affiliations, { tenantNames } from '../../support/dictionary/affiliations';
-import Users from '../../support/fragments/users/users';
-import TopMenu from '../../support/fragments/topMenu';
+import Permissions from '../../support/dictionary/permissions';
 import ConsortiumManager from '../../support/fragments/settings/consortium-manager/consortium-manager';
+import TopMenu from '../../support/fragments/topMenu';
+import Users from '../../support/fragments/users/users';
+import { ExecutionFlowManager } from '../../support/utils';
+
+const R = {
+  USER: 'user',
+};
+
+const initialNavigationOptions = {
+  path: TopMenu.usersPath,
+  waiter: Users.waitLoading,
+};
+
+const assignUserToAffiliationByAdmin = (flow) => {
+  cy.logout();
+  cy.resetTenant();
+  cy.getAdminToken();
+  cy.assignAffiliationToUser(Affiliations.College, flow.get(R.USER).userId);
+  cy.login(flow.get(R.USER).username, flow.get(R.USER).password, initialNavigationOptions);
+};
 
 describe('Consortia', () => {
-  let user;
+  const flow = new ExecutionFlowManager();
 
   before(() => {
     cy.getAdminToken();
+    cy.createTempUser([
+      Permissions.consortiaSettingsConsortiaAffiliationsEdit.gui,
+      Permissions.uiUserCanAssignUnassignPermissions.gui,
+      Permissions.uiUserEdit.gui,
+      Permissions.uiUsersPermissionsView.gui,
+      Permissions.uiUsersView.gui,
+    ]).then((userProperties) => {
+      flow.set(R.USER, userProperties, (user) => Users.deleteViaApi(user.userId));
+      cy.login(userProperties.username, userProperties.password, initialNavigationOptions);
+    });
   });
 
   after('Delete users, data', () => {
     cy.resetTenant();
     cy.getAdminToken();
-    Users.deleteViaApi(user.userId);
+    flow.cleanup();
   });
 
   it(
     'C388499 "Switch active affiliation" option is NOT displayed when a user has only one assigned affiliation (consortia) (thunderjet)',
     { tags: ['criticalPathECS', 'thunderjet', 'C388499'] },
     () => {
-      cy.createTempUser([
-        Permissions.consortiaSettingsConsortiaAffiliationsEdit.gui,
-        Permissions.uiUserCanAssignUnassignPermissions.gui,
-        Permissions.uiUserEdit.gui,
-        Permissions.uiUsersPermissionsView.gui,
-        Permissions.uiUsersView.gui,
-      ])
-        .then((userProperties) => {
-          user = userProperties;
-          cy.login(user.username, user.password, {
-            path: TopMenu.usersPath,
-            waiter: Users.waitLoading,
-          });
-          cy.wait(8000);
-          ConsortiumManager.checkCurrentTenantInTopMenu(tenantNames.central);
-          ConsortiumManager.switchActiveAffiliationIsAbsent();
-        })
-        .then(() => {
-          cy.getAdminToken();
-          cy.assignAffiliationToUser(Affiliations.College, user.userId);
-          cy.setTenant(Affiliations.College);
-        });
-      cy.reload();
+      ConsortiumManager.checkCurrentTenantInTopMenu(tenantNames.central);
+      ConsortiumManager.switchActiveAffiliationIsAbsent();
+
+      assignUserToAffiliationByAdmin(flow);
+
       ConsortiumManager.switchActiveAffiliationExists();
       ConsortiumManager.switchActiveAffiliation(tenantNames.central, tenantNames.college);
       ConsortiumManager.checkCurrentTenantInTopMenu(tenantNames.college);