Updating tests for migration to a new version of antd #3623

dvkruchinin · 2021-08-30T12:58:05Z

Depends on #3558

Motivation and context

Additional test update.

How has this been tested?

Checklist

I submit my changes into the develop branch
I have added description of my changes into CHANGELOG file
I have updated the documentation accordingly
I have added tests to cover my changes
I have linked related issues (read github docs)
I have increased versions of npm packages if it is necessary (cvat-canvas,
cvat-core, cvat-data and cvat-ui)

License

I submit my code changes under the same MIT License that covers the project.
Feel free to contact the maintainers if that's a concern.
I have updated the license header for each file (see an example below)

# Copyright (C) 2021 Intel Corporation
#
# SPDX-License-Identifier: MIT

…into dkru/fix-tests-migrating-antd-origin

…o dkru/fix-tests-migrating-antd-origin

dvkruchinin · 2021-09-02T07:41:56Z

@bsekachev
PR is ready for review.
As it turned out, the problem turned out to be in the procedure for closing the popover. When drawing fast identical shapes, cypress could turn to the popover which is currently still closing. Which led to an error.
I have revert the last changes in file handle-popover-visibility.tsx
The adaptation and verification of passing tests in the Firefox browser was also carried out: https://github.com/dvkruchinin/cvat/actions/runs/1193031673

bsekachev · 2021-09-02T11:31:39Z

...omponents/annotation-page/standard-workspace/controls-side-bar/handle-popover-visibility.tsx

@@ -23,19 +23,15 @@ export default function withVisibilityHandling(WrappedComponent: typeof Popover,
                {...rest}
                trigger={visible ? 'click' : 'hover'}
                overlayClassName={overlayClassNames.join(' ').trim()}
+                afterVisibleChange={(_visible: boolean) => {


We use afterVisibleChange, but it is not a part of antd API, so it can be changed in the future.
What is more, as I found, afterVisibleChange does not guarantee that the popover does not have pointer-events: none and it is triggered several times. .
So, maybe current implementation with (waitFor) is better.

bsekachev · 2021-09-02T11:33:35Z

tests/cypress/support/commands.js

@@ -242,7 +242,11 @@ Cypress.Commands.add('openTaskJob', (taskName, jobID = 0, removeAnnotations = tr

 Cypress.Commands.add('interactControlButton', (objectType) => {
    cy.get('body').focus();
-    cy.get(`.cvat-${objectType}-control`).trigger('mouseleave').trigger('mouseout').trigger('mouseover');
+    cy.get(`.cvat-${objectType}-control`).trigger('mouseleave').trigger('mouseout').trigger('mousemove').trigger('mouseover');
+    cy.get(`.cvat-${objectType}-control`).should('have.class', 'ant-popover-open');


Can we avoid using ant-* classes?

I thought to use this as an additional check. But it works without it. Deleted it.

bsekachev · 2021-09-02T11:34:38Z

tests/cypress/support/commands_opencv.js

@@ -33,6 +41,9 @@ Cypress.Commands.add('opencvCreateShape', (opencvShapeParams) => {
 });

 Cypress.Commands.add('opncvCheckObjectParameters', (objectType) => {


Suggested change

Cypress.Commands.add('opncvCheckObjectParameters', (objectType) => {

Cypress.Commands.add('opencvCheckObjectParameters', (objectType) => {

bsekachev · 2021-09-02T11:36:13Z

tests/cypress/support/commands_opencv.js

+Cypress.Commands.add('interactOpenCVControlButton', () => {
+    cy.get('body').focus();
+    cy.get('.cvat-tools-control').trigger('mouseleave').trigger('mouseout').trigger('mousemove').trigger('mouseover');
+    cy.get('.cvat-tools-control').should('have.class', 'ant-popover-open');
+    cy.get('.cvat-opencv-control-popover-visible').should('exist');
+    cy.get('.cvat-opencv-control-popover-visible').should('be.visible');
+    cy.get('.cvat-opencv-control-popover-visible').should('have.attr', 'style').and('not.include', 'pointer-events');
+});
+


Why not to use cy.interactControlButton?

In this case, need to either heavily rework the command, or rename the classes. I think it's easier to create a separate command for this.

bsekachev · 2021-09-02T11:36:58Z

tests/cypress/support/commands.js

+    cy.get(`.cvat-draw-${objectType.toLowerCase()}-popover-visible`).should('not.exist');
+    cy.get(`.cvat-draw-${objectType.toLowerCase()}-popover`).should('be.hidden');
+    cy.get(`.cvat-draw-${objectType.toLowerCase()}-popover`).should('have.attr', 'style').and('include', 'pointer-events: none');


These actions are not expected to be in command with name checkObjectParameters

Moved it to a separate command.

bsekachev · 2021-09-02T11:39:10Z

tests/cypress/support/commands_canvas3d.js

+    cy.get('.cvat-draw-cuboid-popover-visible').should('not.exist');
+    cy.get('.cvat-draw-cuboid-popover').should('be.hidden');


I am not sure we should test that the popovers are closed now.

Without this check, there is a high probability of getting error AssertionError: Timed out retrying after 25000ms: Expected to find element: `.*-popover-visible`, but never found it.

bsekachev · 2021-09-02T11:40:18Z

tests/cypress/integration/actions_tasks2/case_101_opencv_basic_actions.js

+            cy.get('.cvat-opencv-control-popover-visible').should('not.exist');
+            cy.get('.cvat-opencv-control-popover').should('be.hidden');
+            cy.get('.cvat-opencv-control-popover').should('have.attr', 'style').and('include', 'pointer-events: none');


I am not sure we should test that the popovers are closed now.
At least check for pointer-events seems to be extra.

Without this check, there is a high probability of getting error AssertionError: Timed out retrying after 25000ms: Expected to find element: `.*-popover-visible`, but never found it.

Removed heck for pointer-events.

…o dkru/fix-tests-migrating-antd-origin

nmanovic · 2021-09-07T09:37:52Z

@dvkruchinin , could you please fix the conflict?

@ActiveChooN , could you please review ASAP?

ActiveChooN

LGTM

…o dkru/fix-tests-migrating-antd

dvkruchinin · 2021-09-07T10:06:25Z

Сonflicts have been fixed.

nmanovic · 2021-09-07T11:10:19Z

@dvkruchinin , could you please look at the failed test?

dvkruchinin · 2021-09-07T11:20:39Z

could you please look at the failed test?

Yes. I'm doing it now.

nmanovic

LGTM

nmanovic · 2021-09-13T08:47:03Z

cvat-ui/webpack.config.js

@@ -31,6 +31,7 @@ module.exports = (env) => ({
        host: process.env.CVAT_UI_HOST || 'localhost',
        port: 3000,
        historyApiFallback: true,
+        host: process.env.CVAT_UI_HOST || 'localhost',


@dvkruchinin , do we need the line two times?

Unfortunately, I am not the author of this change.
@ActiveChooN
Can you please tell if it should be like this? If not, I will delete the extra line.

OK. I will merge to unblock the PR. Thanks.

This reverts commit 1ecb44a.

…#3623)"" This reverts commit 0fd8b5d.

…3694) * Revert "Revert "Updating tests for migration to a new version of antd (#3623)"" This reverts commit 0fd8b5d. * Fixed issue with annotations uploading * Fixed menu on annotation page * Tried to fix: Cannot read property nodeType of null * Updated deps * Fixed a couple of issues in menu * Fixed import after updating antd * Update cvat-ui/webpack.config.js Co-authored-by: Dmitry Kalinin <[email protected]> Co-authored-by: Dmitry Kalinin <[email protected]>

bsekachev and others added 30 commits August 17, 2021 13:40

Migrated to new antd and react, fixed tests

451143a

Fixed warning

2add1b4

Popover visibility reworked

950e722

Fixed package-lock

14e26df

Fix command for a shape drawning.

b073811

Fix command for 3D functionality

f414fd4

Command reworked

699e551

Fixed cannot read property map of undefined

8be9c88

Merge branch 'develop' into bs/migration

89637bf

Merge branch 'bs/migration' of https://github.com/openvinotoolkit/cvat …

323fff9

…into dkru/fix-tests-migrating-antd-origin

Updated cypress and plugins

03a2609

Update main.yml

b0c838b

Update popover visibility in the tests

9539c9e

Rever update cypress.

5412cdf

Updated test for 3d

d8cdc94

Try to fix case 101

4752281

Rework command for 3d

5f8b25f

Replace "be.visible" to check "ant-popover-hidden" class

3a15658

rework check hidden popover

9fbc4f8

Rework check hidden popover

6dbe09e

Try to wait 300

d0a3c24

Merge branch 'develop' of https://github.com/openvinotoolkit/cvat int…

8b59dc7

…o dkru/fix-tests-migrating-antd-origin

Change condition for wating a popover visibility

4f8500f

Update case 101

ca4faf7

Update case 101

e28bafb

Update case 101

6146982

update case 78

f5e49cd

Increase wait case 101

955543f

Updated command to open a popover

9603605

Updated command

0fa20e1

dvkruchinin added 2 commits September 1, 2021 23:23

Revert some changes.

a5f9207

Updated the test for Firefox

4bec746

dvkruchinin changed the title ~~[WIP] Updating tests for migration to a new version of antd~~ Updating tests for migration to a new version of antd Sep 2, 2021

bsekachev mentioned this pull request Sep 2, 2021

[WIP] Migrated to new antd and react, fixed tests #3558

Closed

8 tasks

dvkruchinin changed the base branch from bs/migration to develop September 2, 2021 11:34

bsekachev reviewed Sep 2, 2021

View reviewed changes

dvkruchinin added 4 commits September 2, 2021 15:52

Applying comments

14d77ef

Apdated command

183ec2f

Merge branch 'develop' of https://github.com/openvinotoolkit/cvat int…

8d77997

…o dkru/fix-tests-migrating-antd-origin

Trying to fix cases 103, 104

821bce4

dvkruchinin force-pushed the dkru/fix-tests-migrating-antd branch from 17eef1b to 821bce4 Compare September 3, 2021 11:48

nmanovic requested a review from ActiveChooN September 6, 2021 13:13

ActiveChooN previously approved these changes Sep 7, 2021

View reviewed changes

Merge branch 'develop' of https://github.com/openvinotoolkit/cvat int…

0774e21

…o dkru/fix-tests-migrating-antd

dvkruchinin dismissed ActiveChooN’s stale review via b351454 September 7, 2021 12:39

Rework command.

ea7b45f

dvkruchinin force-pushed the dkru/fix-tests-migrating-antd branch from b351454 to ea7b45f Compare September 7, 2021 13:26

nmanovic approved these changes Sep 13, 2021

View reviewed changes

nmanovic reviewed Sep 13, 2021

View reviewed changes

nmanovic merged commit 1ecb44a into cvat-ai:develop Sep 13, 2021

Marishka17 mentioned this pull request Sep 15, 2021

Fix uploading annotation #3677

Closed

8 tasks

nmanovic pushed a commit that referenced this pull request Sep 16, 2021

Revert "Updating tests for migration to a new version of antd (#3623)"

0fd8b5d

This reverts commit 1ecb44a.

bsekachev added a commit that referenced this pull request Sep 20, 2021

Revert "Revert "Updating tests for migration to a new version of antd (…

a612146

…#3623)"" This reverts commit 0fd8b5d.

bsekachev mentioned this pull request Sep 20, 2021

Migrated to the new antd, fixed tests, fixed annotations uploading #3694

Merged

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updating tests for migration to a new version of antd #3623

Updating tests for migration to a new version of antd #3623

dvkruchinin commented Aug 30, 2021

dvkruchinin commented Sep 2, 2021

bsekachev Sep 2, 2021

dvkruchinin Sep 2, 2021

bsekachev Sep 2, 2021

dvkruchinin Sep 2, 2021

bsekachev Sep 2, 2021

dvkruchinin Sep 2, 2021

bsekachev Sep 2, 2021

dvkruchinin Sep 2, 2021 •

edited

Loading

bsekachev Sep 2, 2021

dvkruchinin Sep 2, 2021

bsekachev Sep 2, 2021

dvkruchinin Sep 2, 2021

bsekachev Sep 2, 2021

dvkruchinin Sep 2, 2021

nmanovic commented Sep 7, 2021

ActiveChooN left a comment

dvkruchinin commented Sep 7, 2021

nmanovic commented Sep 7, 2021

dvkruchinin commented Sep 7, 2021

nmanovic left a comment

nmanovic Sep 13, 2021

dvkruchinin Sep 13, 2021

nmanovic Sep 13, 2021

		@@ -33,6 +41,9 @@ Cypress.Commands.add('opencvCreateShape', (opencvShapeParams) => {
		});

		Cypress.Commands.add('opncvCheckObjectParameters', (objectType) => {

	Cypress.Commands.add('opncvCheckObjectParameters', (objectType) => {
	Cypress.Commands.add('opencvCheckObjectParameters', (objectType) => {

		cy.get('.cvat-draw-cuboid-popover-visible').should('not.exist');
		cy.get('.cvat-draw-cuboid-popover').should('be.hidden');

Updating tests for migration to a new version of antd #3623

Updating tests for migration to a new version of antd #3623

Conversation

dvkruchinin commented Aug 30, 2021

Motivation and context

How has this been tested?

Checklist

License

dvkruchinin commented Sep 2, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dvkruchinin Sep 2, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nmanovic commented Sep 7, 2021

ActiveChooN left a comment

Choose a reason for hiding this comment

dvkruchinin commented Sep 7, 2021

nmanovic commented Sep 7, 2021

dvkruchinin commented Sep 7, 2021

nmanovic left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dvkruchinin Sep 2, 2021 •

edited

Loading