diff --git a/tests/cypress/integration/actions_tasks_objects/case_10_polygon_shape_track_label_points.js b/tests/cypress/integration/actions_tasks_objects/case_10_polygon_shape_track_label_points.js index 98733818..7bc55163 100644 --- a/tests/cypress/integration/actions_tasks_objects/case_10_polygon_shape_track_label_points.js +++ b/tests/cypress/integration/actions_tasks_objects/case_10_polygon_shape_track_label_points.js @@ -1,8 +1,6 @@ -/* - * Copyright (C) 2020 Intel Corporation - * - * SPDX-License-Identifier: MIT - */ +// Copyright (C) 2020 Intel Corporation +// +// SPDX-License-Identifier: MIT /// @@ -90,17 +88,11 @@ context('Actions on polygon', () => { before(() => { cy.openTask(taskName); + cy.addNewLabel(newLabelName); + cy.openJob(); }); describe(`Testing case "${caseId}"`, () => { - it('Add new label', () => { - cy.contains('button', 'Add label').click(); - cy.get('[placeholder="Label name"]').type(newLabelName); - cy.contains('button', 'Done').click(); - }); - it('Open a job', () => { - cy.openJob(); - }); it('Draw a polygon shape, track', () => { cy.createPolygon(createPolygonShape); cy.createPolygon(createPolygonTrack); diff --git a/tests/cypress/integration/actions_tasks_objects/case_11_polylines_shape_track_label_points.js b/tests/cypress/integration/actions_tasks_objects/case_11_polylines_shape_track_label_points.js index 98ef87c4..593e787d 100644 --- a/tests/cypress/integration/actions_tasks_objects/case_11_polylines_shape_track_label_points.js +++ b/tests/cypress/integration/actions_tasks_objects/case_11_polylines_shape_track_label_points.js @@ -1,9 +1,7 @@ /* eslint-disable no-undef */ -/* - * Copyright (C) 2020 Intel Corporation - * - * SPDX-License-Identifier: MIT - */ +// Copyright (C) 2020 Intel Corporation +// +// SPDX-License-Identifier: MIT /// @@ -85,17 +83,11 @@ context('Actions on polylines', () => { before(() => { cy.openTask(taskName); + cy.addNewLabel(newLabelName); + cy.openJob(); }); describe(`Testing case "${caseId}"`, () => { - it('Add new label', () => { - cy.contains('button', 'Add label').click(); - cy.get('[placeholder="Label name"]').type(newLabelName); - cy.contains('button', 'Done').click(); - }); - it('Open a job', () => { - cy.openJob(); - }); it('Draw a polylines shape, track', () => { cy.createPolyline(createPolylinesShape); cy.createPolyline(createPolylinesTrack); diff --git a/tests/cypress/integration/actions_tasks_objects/case_12_points_shape_track_label.js b/tests/cypress/integration/actions_tasks_objects/case_12_points_shape_track_label.js index cb16ebbd..4e89c382 100644 --- a/tests/cypress/integration/actions_tasks_objects/case_12_points_shape_track_label.js +++ b/tests/cypress/integration/actions_tasks_objects/case_12_points_shape_track_label.js @@ -1,8 +1,6 @@ -/* - * Copyright (C) 2020 Intel Corporation - * - * SPDX-License-Identifier: MIT - */ +// Copyright (C) 2020 Intel Corporation +// +// SPDX-License-Identifier: MIT /// @@ -84,17 +82,11 @@ context('Actions on points', () => { before(() => { cy.openTask(taskName); + cy.addNewLabel(newLabelName); + cy.openJob(); }); describe(`Testing case "${caseId}"`, () => { - it('Add new label', () => { - cy.contains('button', 'Add label').click(); - cy.get('[placeholder="Label name"]').type(newLabelName); - cy.contains('button', 'Done').click(); - }); - it('Open a job', () => { - cy.openJob(); - }); it('Draw a points shape, track', () => { cy.createPoint(createPointsShape); cy.createPoint(createPointsTrack); diff --git a/tests/cypress/integration/actions_tasks_objects/case_17_lock_hide_features.js b/tests/cypress/integration/actions_tasks_objects/case_17_lock_hide_features.js index bf0bc18e..4f68f8a0 100644 --- a/tests/cypress/integration/actions_tasks_objects/case_17_lock_hide_features.js +++ b/tests/cypress/integration/actions_tasks_objects/case_17_lock_hide_features.js @@ -1,8 +1,6 @@ -/* - * Copyright (C) 2020 Intel Corporation - * - * SPDX-License-Identifier: MIT - */ +// Copyright (C) 2020 Intel Corporation +// +// SPDX-License-Identifier: MIT /// diff --git a/tests/cypress/integration/actions_tasks_objects/case_8_rectangle_shape_track_label.js b/tests/cypress/integration/actions_tasks_objects/case_8_rectangle_shape_track_label.js index 85af45ce..0cb9f8cb 100644 --- a/tests/cypress/integration/actions_tasks_objects/case_8_rectangle_shape_track_label.js +++ b/tests/cypress/integration/actions_tasks_objects/case_8_rectangle_shape_track_label.js @@ -1,8 +1,6 @@ -/* - * Copyright (C) 2020 Intel Corporation - * - * SPDX-License-Identifier: MIT - */ +// Copyright (C) 2020 Intel Corporation +// +// SPDX-License-Identifier: MIT /// @@ -82,17 +80,11 @@ context('Actions on rectangle', () => { before(() => { cy.openTask(taskName); + cy.addNewLabel(newLabelName); + cy.openJob(); }); describe(`Testing case "${caseId}"`, () => { - it('Add new label', () => { - cy.contains('button', 'Add label').click(); - cy.get('[placeholder="Label name"]').type(newLabelName); - cy.contains('button', 'Done').click(); - }); - it('Open a job', () => { - cy.openJob(); - }); it('Draw a rectangle shape in two ways (by 2 points, by 4 points)', () => { cy.createRectangle(createRectangleShape2Points); cy.createRectangle(createRectangleShape4Points); diff --git a/tests/cypress/integration/actions_tasks_objects/case_9_cuboid_shape_track_label.js b/tests/cypress/integration/actions_tasks_objects/case_9_cuboid_shape_track_label.js index 4b1f3d33..db20c848 100644 --- a/tests/cypress/integration/actions_tasks_objects/case_9_cuboid_shape_track_label.js +++ b/tests/cypress/integration/actions_tasks_objects/case_9_cuboid_shape_track_label.js @@ -1,8 +1,6 @@ -/* - * Copyright (C) 2020 Intel Corporation - * - * SPDX-License-Identifier: MIT - */ +// Copyright (C) 2020 Intel Corporation +// +// SPDX-License-Identifier: MIT /// @@ -82,17 +80,11 @@ context('Actions on Cuboid', () => { before(() => { cy.openTask(taskName); + cy.addNewLabel(newLabelName); + cy.openJob(); }); describe(`Testing case "${caseId}"`, () => { - it('Add new label', () => { - cy.contains('button', 'Add label').click(); - cy.get('[placeholder="Label name"]').type(newLabelName); - cy.contains('button', 'Done').click(); - }); - it('Open a job', () => { - cy.openJob(); - }); it('Draw a Cuboid shape in two ways (From rectangle, by 4 points)', () => { cy.createCuboid(createCuboidShape2Points); cy.createCuboid(createCuboidShape4Points); diff --git a/tests/cypress/integration/actions_tasks_objects/issue_1429_check_new_label.js b/tests/cypress/integration/actions_tasks_objects/issue_1429_check_new_label.js index b57b9521..e3eeb5e1 100644 --- a/tests/cypress/integration/actions_tasks_objects/issue_1429_check_new_label.js +++ b/tests/cypress/integration/actions_tasks_objects/issue_1429_check_new_label.js @@ -1,8 +1,6 @@ -/* - * Copyright (C) 2020 Intel Corporation - * - * SPDX-License-Identifier: MIT - */ +// Copyright (C) 2020 Intel Corporation +// +// SPDX-License-Identifier: MIT /// @@ -32,9 +30,7 @@ context('Check if the new label reflects in the options', () => { cy.url().should('include', '/tasks').and('not.contain', '/jobs'); }); it('Add new label', () => { - cy.contains('button', 'Add label').click(); - cy.get('[placeholder="Label name"]').type(newLabelName); - cy.contains('button', 'Done').click(); + cy.addNewLabel(newLabelName); }); it('Open the job again', () => { cy.openJob();