tests: Test cases implemented: Cornerstone tools Clear and Eraser; Measurement panel Relabel and Description (#1014)

* Fix for test scripts that were failing in CI

* Test cases for tools: Length and Angle

* Test cases implemented: Scroll series, Levels, Pan, Reset, Zoom

* Added test cases for tools: Cine, More, Layout, Invert, Rotate, FlipH, FlipV

* Fixes made according to comments on PR review

* Fixes for failing scenarios: Layout and Cine

* Test cases implemented: Cornerstone tools Clear and Eraser; Measurement panel Relabel and Description

* Fix for CI failure

platform/viewer/cypress/support/aliases.js

@@ -0,0 +1,34 @@
+//Creating aliases for Cornerstone tools buttons
+export function initCornerstoneToolsAliases() {
+  cy.get('.ToolbarRow > :nth-child(2)').as('stackScrollBtn');
+  cy.get('.ToolbarRow > :nth-child(3)').as('zoomBtn');
+  cy.get('.ToolbarRow > :nth-child(4)').as('levelsBtn');
+  cy.get('.ToolbarRow > :nth-child(5)').as('panBtn');
+  cy.get('.ToolbarRow > :nth-child(6)').as('lengthBtn');
+  cy.get('.ToolbarRow > :nth-child(7)').as('annotateBtn');
+  cy.get('.ToolbarRow > :nth-child(8)').as('angleBtn');
+  cy.get('.ToolbarRow > :nth-child(9)').as('resetBtn');
+  cy.get('.ToolbarRow > :nth-child(10)').as('cineBtn');
+  cy.get('.expandableToolMenu').as('moreBtn');
+  cy.get('.PluginSwitch > .toolbar-button').as('twodmprBtn');
+  cy.get('.btn-group > .toolbar-button').as('layoutBtn');
+}
+
+//Creating aliases for Common page elements
+export function initCommonElementsAliases() {
+  cy.get(
+    '.pull-right > .RoundedButtonGroup > .roundedButtonWrapper > .roundedButton'
+  ).as('measurementsBtn');
+  cy.get('.viewport-element').as('viewport');
+  cy.get('section.sidepanel.from-right').as('measurementsPanel');
+  cy.get(
+    '.pull-left > .RoundedButtonGroup > .roundedButtonWrapper > .roundedButton'
+  ).as('seriesBtn');
+  cy.get('section.sidepanel.from-left').as('seriesPanel');
+  cy.get('div.ViewportOverlay > div.bottom-left.overlay-element > div').as(
+    'viewportInfoBottomLeft'
+  );
+  cy.get('div.ViewportOverlay > div.bottom-right.overlay-element > div').as(
+    'viewportInfoBottomRight'
+  );
+}

platform/viewer/cypress/support/commands.js

@@ -1,6 +1,8 @@
 import { DragSimulator } from '../helpers/DragSimulator.js';
-import { doesNotReject } from 'assert';
-import { disconnect } from 'cluster';
+import {
+  initCornerstoneToolsAliases,
+  initCommonElementsAliases,
+} from './aliases.js';
 
 // ***********************************************
 // This example commands.js shows you how to
@@ -28,6 +30,11 @@ import { disconnect } from 'cluster';
 // -- This is will overwrite an existing command --
 // Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
 
+/**
+ * Command to search for a patient name and open his/her study.
+ *
+ * @param {string} PatientName - Patient name that we would like to search for
+ */
 Cypress.Commands.add('openStudy', patientName => {
   cy.visit('/');
   cy.get('#patientName').type(patientName);
@@ -39,6 +46,12 @@ Cypress.Commands.add('openStudy', patientName => {
     });
 });
 
+/**
+ * Command to perform a drag and drop action. Before using this command, we must get the element that should be dragged first.
+ * Example of usage: cy.get(element-to-be-dragged).drag(dropzone-element)
+ *
+ * @param {*} element - Selector for element that we want to use as dropzone
+ */
 Cypress.Commands.add('drag', { prevSubject: 'element' }, (...args) =>
   DragSimulator.simulate(...args)
 );
@@ -119,12 +132,26 @@ Cypress.Commands.add('waitDicomImage', (timeout = 20000) => {
     });
 });
 
-//Command to reset the viewport changes throught the cornerstone method
+//Command to reset and clear all the changes made to the viewport
 Cypress.Commands.add('resetViewport', () => {
+  cy.initCornerstoneToolsAliases();
   cy.get('@resetBtn').click();
+  //Click on More button
+  cy.get('@moreBtn').click();
+  //Verify if overlay is displayed
+  cy.get('body').then(body => {
+    if (body.find('.tooltip-toolbar-overlay').length == 0) {
+      cy.get('@moreBtn').click();
+    }
+  });
+  //Click on Clear button
+  cy.get('.tooltip-inner > :nth-child(10)')
+    .as('clearBtn')
+    .click();
 });
 
 Cypress.Commands.add('imageZoomIn', () => {
+  cy.initCornerstoneToolsAliases();
   cy.get('@zoomBtn').click();
 
   //drags the mouse inside the viewport to be able to interact with series
@@ -135,6 +162,7 @@ Cypress.Commands.add('imageZoomIn', () => {
 });
 
 Cypress.Commands.add('imageContrast', () => {
+  cy.initCornerstoneToolsAliases();
   cy.get('@levelsBtn').click();
 
   //drags the mouse inside the viewport to be able to interact with series
@@ -143,3 +171,32 @@ Cypress.Commands.add('imageContrast', () => {
     .trigger('mousemove', 'top', { which: 1 })
     .trigger('mouseup');
 });
+
+//Initialize aliases for Cornerstone tools buttons
+Cypress.Commands.add('initCornerstoneToolsAliases', () => {
+  initCornerstoneToolsAliases();
+});
+
+//Initialize aliases for Common page elements
+Cypress.Commands.add('initCommonElementsAliases', () => {
+  initCommonElementsAliases();
+});
+
+//Add measurements in the viewport
+Cypress.Commands.add('addLengthMeasurement', () => {
+  cy.initCornerstoneToolsAliases();
+  cy.get('@lengthBtn').click();
+  const firstClick = [150, 100];
+  const secondClick = [130, 170];
+  cy.addLine('.cornerstone-canvas', firstClick, secondClick);
+});
+
+//Add measurements in the viewport
+Cypress.Commands.add('addAngleMeasurement', () => {
+  cy.initCornerstoneToolsAliases();
+  cy.get('@angleBtn').click();
+  const initPos = [180, 390];
+  const midPos = [300, 410];
+  const finalPos = [180, 450];
+  cy.addAngle('.cornerstone-canvas', initPos, midPos, finalPos);
+});