From 7a33fc0339dcdcdd0bcacdeb340cb9e73f28685e Mon Sep 17 00:00:00 2001
From: Kirill Lakhov <kirill.lakhov@cvat.ai>
Date: Mon, 1 Aug 2022 14:42:09 +0300
Subject: [PATCH] Fix unstable 2E2 tests (#68)

* Added workaround

* fixed yolo format test

* applied comment

* removed logout intercept
---
 cvat-ui/src/components/cvat-app.tsx                | 14 ++++++++++----
 .../export-dataset/export-dataset-modal.tsx        |  2 +-
 .../case_113_new_organization_pipeline.js          |  4 ----
 ..._2473_import_annotations_frames_dots_in_name.js |  3 +--
 tests/cypress/support/commands.js                  |  6 +++---
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/cvat-ui/src/components/cvat-app.tsx b/cvat-ui/src/components/cvat-app.tsx
index a155061c..0f376b4c 100644
--- a/cvat-ui/src/components/cvat-app.tsx
+++ b/cvat-ui/src/components/cvat-app.tsx
@@ -310,6 +310,8 @@ class CVATApplication extends React.PureComponent<CVATAppProps & RouteComponentP
             formatsInitialized,
             modelsInitialized,
             organizationsInitialized,
+            userAgreementsInitialized,
+            authActionsInitialized,
             switchShortcutsDialog,
             switchSettingsDialog,
             user,
@@ -318,14 +320,18 @@ class CVATApplication extends React.PureComponent<CVATAppProps & RouteComponentP
             isModelPluginActive,
         } = this.props;
 
-        const readyForRender =
-            (userInitialized && (user == null || !user.isVerified)) ||
-            (userInitialized &&
+        const notRegisteredUserInitialized = (userInitialized && (user == null || !user.isVerified));
+        let readyForRender = userAgreementsInitialized && authActionsInitialized;
+        readyForRender = readyForRender && (notRegisteredUserInitialized ||
+            (
+                userInitialized &&
                 formatsInitialized &&
                 pluginsInitialized &&
                 aboutInitialized &&
                 organizationsInitialized &&
-                (!isModelPluginActive || modelsInitialized));
+                (!isModelPluginActive || modelsInitialized)
+            )
+        );
 
         const subKeyMap = {
             SWITCH_SHORTCUTS: keyMap.SWITCH_SHORTCUTS,
diff --git a/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx b/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx
index 973bf528..d0f962ac 100644
--- a/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx
+++ b/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx
@@ -114,7 +114,7 @@ function ExportDatasetModal(): JSX.Element {
                     label='Export format'
                     rules={[{ required: true, message: 'Format must be selected' }]}
                 >
-                    <Select placeholder='Select dataset format' className='cvat-modal-export-select'>
+                    <Select virtual={false} placeholder='Select dataset format' className='cvat-modal-export-select'>
                         {dumpers
                             .sort((a: any, b: any) => a.name.localeCompare(b.name))
                             .filter((dumper: any): boolean => dumper.dimension === instance?.dimension)
diff --git a/tests/cypress/integration/actions_organizations/case_113_new_organization_pipeline.js b/tests/cypress/integration/actions_organizations/case_113_new_organization_pipeline.js
index fcde75a8..df2f6e5e 100644
--- a/tests/cypress/integration/actions_organizations/case_113_new_organization_pipeline.js
+++ b/tests/cypress/integration/actions_organizations/case_113_new_organization_pipeline.js
@@ -102,10 +102,6 @@ context('New organization pipeline.', () => {
         cy.logout();
 
         for (const user of Object.values(users)) {
-            // When we continuously register users, elements on login/register page become detached from DOM
-            // because of our re-renders after additional requests, waiting is workaround for this issue
-            // https://github.com/cypress-io/cypress/issues/7306
-            cy.wait(1000);
             cy.goToRegisterPage();
             cy.userRegistration(
                 user.firstName,
diff --git a/tests/cypress/integration/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js b/tests/cypress/integration/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js
index e1c4f652..f04c125b 100644
--- a/tests/cypress/integration/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js
+++ b/tests/cypress/integration/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js
@@ -72,9 +72,8 @@ context('Import annotations for frames with dots in name.', { browser: '!firefox
                 .not('.ant-select-dropdown-hidden')
                 .within(() => {
                     cy.get('.rc-virtual-list-holder')
-                        .trigger('wheel', { deltaY: 1000 })
-                        .trigger('wheel', { deltaY: 1000 })
                         .contains('.cvat-modal-export-option-item', dumpType)
+                        .scrollIntoView()
                         .should('be.visible')
                         .click();
                 });
diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js
index 58facf0f..950a5cca 100644
--- a/tests/cypress/support/commands.js
+++ b/tests/cypress/support/commands.js
@@ -35,9 +35,9 @@ Cypress.Commands.add('logout', (username = Cypress.env('user')) => {
     });
     cy.get('span[aria-label="logout"]').click();
     cy.url().should('include', '/auth/login');
-    cy.intercept('/auth/login').as('login');
-    cy.visit('/auth/login'); // clear query parameter "next"
-    cy.wait('@login').then(() => cy.contains('Login').should('exist'));
+    cy.visit('/auth/login');
+    cy.url().should('not.include', '?next=');
+    cy.contains('Login').should('exist');
 });
 
 Cypress.Commands.add('userRegistration', (firstName, lastName, userName, emailAddr, password) => {