wangchunlin
/
cvat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Cypress tests. Added the use of the "Done" button. (#3505)

Browse Source 
* Updated tests, commands

* Apply comments

* Removed unnecessary lines
main
Dmitry Kruchinin 5 years ago committed by GitHub
parent b293718e3a
commit 7ee8efb3bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 43 additions and 50 deletions
Show Stats Download Patch File Download Diff File

14
tests/cypress/integration/actions_objects2/case_10_polygon_shape_track_label_points.js
Unescape Escape View File

@ -6,7 +6,7 @@
import { taskName, labelName } from '../../support/const'; import { taskName, labelName } from '../../support/const';
context('Actions on polygon', () => { context('Actions on polygon.', () => {
const caseId = '10'; const caseId = '10';
const newLabelName = `New label for case ${caseId}`; const newLabelName = `New label for case ${caseId}`;
const createPolygonShape = { const createPolygonShape = {
@ -18,8 +18,6 @@ context('Actions on polygon', () => {
{ x: 250, y: 200 }, { x: 250, y: 200 },
{ x: 250, y: 250 }, { x: 250, y: 250 },
], ],
complete: true,
numberOfPoints: null,
}; };
const createPolygonTrack = { const createPolygonTrack = {
reDraw: false, reDraw: false,
@ -30,8 +28,6 @@ context('Actions on polygon', () => {
{ x: 350, y: 200 }, { x: 350, y: 200 },
{ x: 350, y: 350 }, { x: 350, y: 350 },
], ],
complete: true,
numberOfPoints: null,
}; };
const createPolygonShapePoints = { const createPolygonShapePoints = {
reDraw: false, reDraw: false,
@ -68,8 +64,7 @@ context('Actions on polygon', () => {
{ x: 650, y: 200 }, { x: 650, y: 200 },
{ x: 650, y: 250 }, { x: 650, y: 250 },
], ],
complete: true, finishWithButton: true,
numberOfPoints: null,
}; };
const createPolygonTrackSwitchLabel = { const createPolygonTrackSwitchLabel = {
reDraw: false, reDraw: false,
@ -80,8 +75,7 @@ context('Actions on polygon', () => {
{ x: 750, y: 200 }, { x: 750, y: 200 },
{ x: 750, y: 250 }, { x: 750, y: 250 },
], ],
complete: true, finishWithButton: true,
numberOfPoints: null,
}; };
before(() => { before(() => {
@ -101,7 +95,7 @@ context('Actions on polygon', () => {
cy.createPolygon(createPolygonTrackPoints); cy.createPolygon(createPolygonTrackPoints);
}); });
it('Draw a polygon shape, track with second label.', () => { it('Draw a polygon shape, track with second label and "Done" button.', () => {
cy.createPolygon(createPolygonShapeSwitchLabel); cy.createPolygon(createPolygonShapeSwitchLabel);
cy.createPolygon(createPolygonTrackSwitchLabel); cy.createPolygon(createPolygonTrackSwitchLabel);
}); });

14
tests/cypress/integration/actions_objects2/case_11_polylines_shape_track_label_points.js
Unescape Escape View File

@ -6,7 +6,7 @@
import { taskName, labelName } from '../../support/const'; import { taskName, labelName } from '../../support/const';
context('Actions on polylines', () => { context('Actions on polylines.', () => {
const caseId = '11'; const caseId = '11';
const newLabelName = `New label for case ${caseId}`; const newLabelName = `New label for case ${caseId}`;
const createPolylinesShape = { const createPolylinesShape = {
@ -17,8 +17,6 @@ context('Actions on polylines', () => {
{ x: 250, y: 200 }, { x: 250, y: 200 },
{ x: 250, y: 250 }, { x: 250, y: 250 },
], ],
complete: true,
numberOfPoints: null,
}; };
const createPolylinesTrack = { const createPolylinesTrack = {
type: 'Track', type: 'Track',
@ -28,8 +26,6 @@ context('Actions on polylines', () => {
{ x: 350, y: 200 }, { x: 350, y: 200 },
{ x: 350, y: 350 }, { x: 350, y: 350 },
], ],
complete: true,
numberOfPoints: null,
}; };
const createPolylinesShapePoints = { const createPolylinesShapePoints = {
type: 'Shape', type: 'Shape',
@ -63,8 +59,7 @@ context('Actions on polylines', () => {
{ x: 650, y: 200 }, { x: 650, y: 200 },
{ x: 650, y: 250 }, { x: 650, y: 250 },
], ],
complete: true, finishWithButton: true,
numberOfPoints: null,
}; };
const createPolylinesTrackSwitchLabel = { const createPolylinesTrackSwitchLabel = {
type: 'Track', type: 'Track',
@ -74,8 +69,7 @@ context('Actions on polylines', () => {
{ x: 750, y: 200 }, { x: 750, y: 200 },
{ x: 750, y: 250 }, { x: 750, y: 250 },
], ],
complete: true, finishWithButton: true,
numberOfPoints: null,
}; };
before(() => { before(() => {
@ -95,7 +89,7 @@ context('Actions on polylines', () => {
cy.createPolyline(createPolylinesTrackPoints); cy.createPolyline(createPolylinesTrackPoints);
}); });
it('Draw a polylines shape, track with second label.', () => { it('Draw a polylines shape, track with second label and "Done" button.', () => {
cy.createPolyline(createPolylinesShapeSwitchLabel); cy.createPolyline(createPolylinesShapeSwitchLabel);
cy.createPolyline(createPolylinesTrackSwitchLabel); cy.createPolyline(createPolylinesTrackSwitchLabel);
}); });

20
tests/cypress/integration/actions_objects2/case_12_points_shape_track_label.js
Unescape Escape View File

@ -6,7 +6,7 @@
import { taskName, labelName } from '../../support/const'; import { taskName, labelName } from '../../support/const';
context('Actions on points', () => { context('Actions on points.', () => {
const caseId = '12'; const caseId = '12';
const newLabelName = `New label for case ${caseId}`; const newLabelName = `New label for case ${caseId}`;
const createPointsShape = { const createPointsShape = {
@ -17,8 +17,6 @@ context('Actions on points', () => {
{ x: 250, y: 200 }, { x: 250, y: 200 },
{ x: 250, y: 250 }, { x: 250, y: 250 },
], ],
complete: true,
numberOfPoints: null,
}; };
const createPointsTrack = { const createPointsTrack = {
type: 'Track', type: 'Track',
@ -28,8 +26,6 @@ context('Actions on points', () => {
{ x: 350, y: 200 }, { x: 350, y: 200 },
{ x: 350, y: 350 }, { x: 350, y: 350 },
], ],
complete: true,
numberOfPoints: null,
}; };
const createPointsShapePoints = { const createPointsShapePoints = {
type: 'Shape', type: 'Shape',
@ -63,8 +59,7 @@ context('Actions on points', () => {
{ x: 650, y: 200 }, { x: 650, y: 200 },
{ x: 650, y: 250 }, { x: 650, y: 250 },
], ],
complete: true, finishWithButton: true,
numberOfPoints: null,
}; };
const createPointsTrackSwitchLabel = { const createPointsTrackSwitchLabel = {
type: 'Track', type: 'Track',
@ -74,8 +69,7 @@ context('Actions on points', () => {
{ x: 750, y: 200 }, { x: 750, y: 200 },
{ x: 750, y: 250 }, { x: 750, y: 250 },
], ],
complete: true, finishWithButton: true,
numberOfPoints: null,
}; };
before(() => { before(() => {
@ -85,15 +79,17 @@ context('Actions on points', () => {
}); });
describe(`Testing case "${caseId}"`, () => { describe(`Testing case "${caseId}"`, () => {
it('Draw a points shape, track', () => { it('Draw a points shape, track.', () => {
cy.createPoint(createPointsShape); cy.createPoint(createPointsShape);
cy.createPoint(createPointsTrack); cy.createPoint(createPointsTrack);
}); });
it('Draw a points shape, track with use parameter "number of points"', () => {
it('Draw a points shape, track with use parameter "number of points".', () => {
cy.createPoint(createPointsShapePoints); cy.createPoint(createPointsShapePoints);
cy.createPoint(createPointsTrackPoints); cy.createPoint(createPointsTrackPoints);
}); });
it('Draw a points shape, track with second label', () => {
it('Draw a points shape, track with second label and "Done" button.', () => {
cy.createPoint(createPointsShapeSwitchLabel); cy.createPoint(createPointsShapeSwitchLabel);
cy.createPoint(createPointsTrackSwitchLabel); cy.createPoint(createPointsTrackSwitchLabel);
}); });

45
tests/cypress/support/commands.js
Unescape Escape View File

@ -304,7 +304,6 @@ Cypress.Commands.add('createPoint', (createPointParams) => {
selectedValueGlobal = $labelValue.text(); selectedValueGlobal = $labelValue.text();
}); });
if (createPointParams.numberOfPoints) { if (createPointParams.numberOfPoints) {
createPointParams.complete = false;
cy.get('.ant-input-number-input').clear().type(createPointParams.numberOfPoints); cy.get('.ant-input-number-input').clear().type(createPointParams.numberOfPoints);
} }
cy.contains('button', createPointParams.type).click(); cy.contains('button', createPointParams.type).click();
@ -312,11 +311,15 @@ Cypress.Commands.add('createPoint', (createPointParams) => {
createPointParams.pointsMap.forEach((element) => { createPointParams.pointsMap.forEach((element) => {
cy.get('.cvat-canvas-container').click(element.x, element.y); cy.get('.cvat-canvas-container').click(element.x, element.y);
}); });
if (createPointParams.complete) { if (createPointParams.finishWithButton) {
const keyCodeN = 78; cy.contains('span', 'Done').click();
cy.get('.cvat-canvas-container') } else {
.trigger('keydown', { keyCode: keyCodeN }) if (! createPointParams.numberOfPoints) {
.trigger('keyup', { keyCode: keyCodeN }); const keyCodeN = 78;
cy.get('.cvat-canvas-container')
.trigger('keydown', { keyCode: keyCodeN })
.trigger('keyup', { keyCode: keyCodeN });
}
} }
cy.checkObjectParameters(createPointParams, 'POINTS'); cy.checkObjectParameters(createPointParams, 'POINTS');
}); });
@ -348,7 +351,6 @@ Cypress.Commands.add('createPolygon', (createPolygonParams) => {
selectedValueGlobal = $labelValue.text(); selectedValueGlobal = $labelValue.text();
}); });
if (createPolygonParams.numberOfPoints) { if (createPolygonParams.numberOfPoints) {
createPolygonParams.complete = false;
cy.get('.ant-input-number-input').clear().type(createPolygonParams.numberOfPoints); cy.get('.ant-input-number-input').clear().type(createPolygonParams.numberOfPoints);
} }
cy.contains('button', createPolygonParams.type).click(); cy.contains('button', createPolygonParams.type).click();
@ -357,11 +359,15 @@ Cypress.Commands.add('createPolygon', (createPolygonParams) => {
createPolygonParams.pointsMap.forEach((element) => { createPolygonParams.pointsMap.forEach((element) => {
cy.get('.cvat-canvas-container').click(element.x, element.y); cy.get('.cvat-canvas-container').click(element.x, element.y);
}); });
if (createPolygonParams.complete) { if (createPolygonParams.finishWithButton) {
const keyCodeN = 78; cy.contains('span', 'Done').click();
cy.get('.cvat-canvas-container') } else {
.trigger('keydown', { keyCode: keyCodeN }) if (! createPolygonParams.numberOfPoints) {
.trigger('keyup', { keyCode: keyCodeN }); const keyCodeN = 78;
cy.get('.cvat-canvas-container')
.trigger('keydown', { keyCode: keyCodeN })
.trigger('keyup', { keyCode: keyCodeN });
}
} }
cy.checkObjectParameters(createPolygonParams, 'POLYGON'); cy.checkObjectParameters(createPolygonParams, 'POLYGON');
}); });
@ -490,7 +496,6 @@ Cypress.Commands.add('createPolyline', (createPolylineParams) => {
selectedValueGlobal = $labelValue.text(); selectedValueGlobal = $labelValue.text();
}); });
if (createPolylineParams.numberOfPoints) { if (createPolylineParams.numberOfPoints) {
createPolylineParams.complete = false;
cy.get('.ant-input-number-input').clear().type(createPolylineParams.numberOfPoints); cy.get('.ant-input-number-input').clear().type(createPolylineParams.numberOfPoints);
} }
cy.contains('button', createPolylineParams.type).click(); cy.contains('button', createPolylineParams.type).click();
@ -498,11 +503,15 @@ Cypress.Commands.add('createPolyline', (createPolylineParams) => {
createPolylineParams.pointsMap.forEach((element) => { createPolylineParams.pointsMap.forEach((element) => {
cy.get('.cvat-canvas-container').click(element.x, element.y); cy.get('.cvat-canvas-container').click(element.x, element.y);
}); });
if (createPolylineParams.complete) { if (createPolylineParams.finishWithButton) {
const keyCodeN = 78; cy.contains('span', 'Done').click();
cy.get('.cvat-canvas-container') } else {
.trigger('keydown', { keyCode: keyCodeN }) if (! createPolylineParams.numberOfPoints) {
.trigger('keyup', { keyCode: keyCodeN }); const keyCodeN = 78;
cy.get('.cvat-canvas-container')
.trigger('keydown', { keyCode: keyCodeN })
.trigger('keyup', { keyCode: keyCodeN });
}
} }
cy.checkObjectParameters(createPolylineParams, 'POLYLINE'); cy.checkObjectParameters(createPolylineParams, 'POLYLINE');
}); });

Write Preview
Loading…
Cancel
Save