diff --git a/tests/cypress/integration/actions_projects_models/case_95_move_task_to_project.js b/tests/cypress/integration/actions_projects_models/case_95_move_task_to_project.js index 3a39367a..bc41e32e 100644 --- a/tests/cypress/integration/actions_projects_models/case_95_move_task_to_project.js +++ b/tests/cypress/integration/actions_projects_models/case_95_move_task_to_project.js @@ -11,6 +11,10 @@ context('Move a task to a project.', () => { label: 'Tree', attrName: 'Kind', attrValue: 'Oak', + nameSecond: `Case ${caseID} second`, + labelSecond: 'Car', + attrNameSecons: 'Color', + attrValueSecond: 'Red', }; const project = { @@ -37,6 +41,8 @@ context('Move a task to a project.', () => { cy.login(); cy.imageGenerator(imagesFolder, imageFileName, width, height, color, posX, posY, task.name, imagesCount); cy.createZipArchive(directoryToArchive, archivePath); + cy.goToTaskList(); + cy.createAnnotationTask(task.nameSecond, task.labelSecond, task.attrNameSecons, task.attrValueSecond, archiveName); }); beforeEach(() => { @@ -58,9 +64,12 @@ context('Move a task to a project.', () => { cy.get('.cvat-tasks-list-item').should('not.exist'); cy.goToTaskList(); cy.movingTask(task.name, project.name, task.label, project.label); + // Check issue 3403 + cy.goToTaskList(); + cy.movingTask(task.nameSecond, project.name, task.labelSecond, project.label); cy.goToProjectsList(); cy.openProject(project.name); - cy.get('.cvat-tasks-list-item').should('exist'); + cy.get('.cvat-tasks-list-item').should('exist').and('have.length', 2); }); it('Move a task from task.', () => { diff --git a/tests/cypress/support/commands_projects.js b/tests/cypress/support/commands_projects.js index 7493bed2..e0bb6258 100644 --- a/tests/cypress/support/commands_projects.js +++ b/tests/cypress/support/commands_projects.js @@ -94,19 +94,15 @@ Cypress.Commands.add('closeNotification', (className) => { Cypress.Commands.add('movingTask', (taskName, projectName, labelMappingFrom, labelMappingTo, fromTask) => { if (fromTask) { cy.contains('.cvat-text-color', 'Actions').click(); - cy.get('.ant-dropdown') - .not('.ant-dropdown-hidden') - .within(() => { - cy.contains('Move to project').click(); - }); } else { cy.contains('strong', taskName).parents('.cvat-tasks-list-item').find('.cvat-menu-icon').click(); - cy.get('.ant-dropdown') - .not('.ant-dropdown-hidden') - .within(() => { - cy.contains('Move to project').click(); - }); } + cy.get('.cvat-actions-menu') + .should('be.visible') + .find('[role="menuitem"]') + .filter(':contains("Move to project")') + .last() + .click(); cy.get('.cvat-task-move-modal').find('.cvat-project-search-field').click(); cy.get('.ant-select-dropdown') .not('.ant-select-dropdown-hidden')