Merge branch 'develop' into bs/opencv

cvat-ai · Feb 3, 2021 · f9c0a34 · f9c0a34
2 parents 2a5e91b + 3d4fad4
commit f9c0a34
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/...2524_issue_not_reset_after_change_task.js → ..._after_change_task_issue_point_firefox.js b/...2524_issue_not_reset_after_change_task.js → ..._after_change_task_issue_point_firefox.js
@@ -1,15 +1,15 @@
-// Copyright (C) 2020 Intel Corporation
+// Copyright (C) 2020-2021 Intel Corporation
 //
 // SPDX-License-Identifier: MIT
 
 /// <reference types="cypress" />
 
 context("Some parts of the Redux state (issues) isn't reset after chaning a task.", () => {
-    const issueId = '2524';
-    const labelName = `Case ${issueId}`;
+    const issueId = '2524_2633';
+    const labelName = `Issue ${issueId}`;
     const taskName = {
-        firstTaskName: 'First task issue 2524',
-        secondTaskName: 'Second task issue 2524',
+        firstTaskName: `First task issue ${issueId}`,
+        secondTaskName: `Second task issue ${issueId}`,
     };
     const attrName = `Attr for ${labelName}`;
     const textDefaultValue = 'Some default value for type Text';
@@ -33,6 +33,12 @@ context("Some parts of the Redux state (issues) isn't reset after chaning a task
         secondX: 650,
         secondY: 200,
     };
+    const createIssuePoint = {
+        type: 'point',
+        description: 'point issue',
+        firstX: 500,
+        firstY: 300,
+    };
 
     before(() => {
         cy.clearLocalStorageSnapshot();
@@ -83,9 +89,10 @@ context("Some parts of the Redux state (issues) isn't reset after chaning a task
             cy.url().should('include', '/tasks');
         });
 
-        it('Open job again and create an issue', () => {
+        it('Open job again and create an issue. Check issue 2633.', () => {
             cy.openJob();
             cy.createIssueFromControlButton(createIssueRectangle);
+            cy.createIssueFromControlButton(createIssuePoint); // Issue 2633
         });
 
         it('Open the second task. Open job. Issue not exist.', () => {

diff --git a/tests/cypress/support/commands_review_pipeline.js b/tests/cypress/support/commands_review_pipeline.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2020 Intel Corporation
+// Copyright (C) 2020-2021 Intel Corporation
 //
 // SPDX-License-Identifier: MIT
 
@@ -120,7 +120,9 @@ Cypress.Commands.add('createIssueFromControlButton', (createIssueParams) => {
             .trigger('mousemove', createIssueParams.secondX, createIssueParams.secondY)
             .trigger('mouseup');
     } else if (createIssueParams.type === 'point') {
-        cy.get('.cvat-canvas-container').click(createIssueParams.firstX, createIssueParams.firstY);
+        cy.get('.cvat-canvas-container')
+            .trigger('mousedown', createIssueParams.firstX, createIssueParams.firstY, { button: 0 })
+            .trigger('mouseup');
     }
     cy.get('.cvat-create-issue-dialog').within(() => {
         cy.get('#issue_description').type(createIssueParams.description);