diff --git a/tests/cypress/integration/actions_users/registration_involved/case_28_review_pipeline_feature.js b/tests/cypress/integration/actions_users/registration_involved/case_28_review_pipeline_feature.js index 6b4edad8..c9fb4397 100644 --- a/tests/cypress/integration/actions_users/registration_involved/case_28_review_pipeline_feature.js +++ b/tests/cypress/integration/actions_users/registration_involved/case_28_review_pipeline_feature.js @@ -246,6 +246,7 @@ context('Review pipeline feature', () => { it('Use quick issues "Incorrect position". Issue will be created immediately.', () => { cy.createIssueFromObject('#cvat_canvas_shape_1', 'Quick issue: incorrect position'); cy.checkIssueLabel('Wrong position'); + cy.get('.cvat_canvas_issue_region').should('have.length', 1); }); it('Item submenu: "Quick issue ..." does not appear.', () => { @@ -259,6 +260,7 @@ context('Review pipeline feature', () => { it('Create different issues with a custom text.', () => { cy.createIssueFromObject('#cvat_canvas_shape_2', 'Open an issue ...', customeIssueDescription); cy.checkIssueLabel(customeIssueDescription); + cy.get('.cvat_canvas_issue_region').should('have.length', 2); }); it('Now item submenu: "Quick issue ..." appears and it contains several latest options.', () => { @@ -278,6 +280,7 @@ context('Review pipeline feature', () => { it('Use one of items to create quick issue on another object on another frame. Issue has been created.', () => { cy.goCheckFrameNumber(2); cy.createIssueFromObject('#cvat_canvas_shape_4', 'Quick issue: incorrect attribute'); + cy.get('.cvat_canvas_issue_region').should('have.length', 1); cy.checkIssueLabel('Wrong attribute'); cy.goCheckFrameNumber(0); // Back to first frame }); @@ -285,6 +288,7 @@ context('Review pipeline feature', () => { it('Reload page. All the issue still exists.', () => { cy.reload(); cy.get('.cvat-canvas-container').should('exist'); + cy.get('.cvat_canvas_issue_region').should('have.length', 2); cy.checkIssueLabel(customeIssueDescription); cy.checkIssueLabel('Wrong position'); }); @@ -344,11 +348,9 @@ context('Review pipeline feature', () => { cy.contains('[role="tab"]', 'Issues').click().should('have.attr', 'aria-selected', 'true'); }); cy.get('.cvat-objects-sidebar-issues-list-header').should('be.visible'); - cy.get('.cvat-objects-sidebar-issue-item').then((sidebarIssueItems) => { - cy.get('.cvat-hidden-issue-label').then((issueLabels) => { - expect(sidebarIssueItems.length).to.be.equal(issueLabels.length); - }); - }); + cy.get('.cvat-objects-sidebar-issue-item').should('have.length', 4); + cy.get('.cvat-hidden-issue-label').should('have.length', 4); + cy.get('.cvat_canvas_issue_region').should('have.length', 4); }); it('Select an issue on sidebar. Issue indication has changed the color for highlighted issue', () => { diff --git a/tests/cypress/support/commands_review_pipeline.js b/tests/cypress/support/commands_review_pipeline.js index 1161e7e6..a0a896a9 100644 --- a/tests/cypress/support/commands_review_pipeline.js +++ b/tests/cypress/support/commands_review_pipeline.js @@ -95,31 +95,41 @@ Cypress.Commands.add('checkIssueRegion', () => { const sccSelectorIssueRegionId = '#cvat_canvas_issue_region_'; cy.collectIssueRegionId().then((issueRegionIdList) => { const maxId = Math.max(...issueRegionIdList); - cy.get(`${sccSelectorIssueRegionId}${maxId}`).trigger('mousemove').should('exist').and('be.visible'); + cy.get(`${sccSelectorIssueRegionId}${maxId}`) + .trigger('mousemove') + .should('be.visible'); }); }); Cypress.Commands.add('createIssueFromObject', (object, issueType, customeIssueDescription) => { - cy.get(object).trigger('mousemove').rightclick(); - cy.get('.cvat-canvas-context-menu').within(() => { - cy.contains('.cvat-context-menu-item', new RegExp(`^${issueType}$`, 'g')).click(); + cy.get(object).then(($object) => { + const objectFillOpacity = $object.attr('fill-opacity'); + cy.get($object) + .trigger('mousemove') + .trigger('mouseover') + .should('have.attr', 'fill-opacity', Number(objectFillOpacity) * 10) + .rightclick(); + }); + cy.get('.cvat-canvas-context-menu').should('be.visible').within(() => { + cy.contains('.cvat-context-menu-item', new RegExp(`^${issueType}$`)).click(); }); if (issueType === 'Open an issue ...') { - cy.get('.cvat-create-issue-dialog').within(() => { + cy.get('.cvat-create-issue-dialog').should('be.visible').within(() => { cy.get('#issue_description').type(customeIssueDescription); cy.get('[type="submit"]').click(); }); } else if (issueType === 'Quick issue ...') { cy.get('.cvat-quick-issue-from-latest-item') .should('be.visible') - .contains('.cvat-context-menu-item', new RegExp(`^${customeIssueDescription}$`, 'g')) + .contains('.cvat-context-menu-item', new RegExp(`^${customeIssueDescription}$`)) .click(); } + cy.get('.cvat-canvas-context-menu').should('not.exist'); cy.checkIssueRegion(); }); Cypress.Commands.add('createIssueFromControlButton', (createIssueParams) => { - cy.get('.cvat-issue-control').click(); + cy.get('.cvat-issue-control').click().should('have.class', 'cvat-active-canvas-control'); if (createIssueParams.type === 'rectangle') { cy.get('.cvat-canvas-container') .trigger('mousedown', createIssueParams.firstX, createIssueParams.firstY, { button: 0 })