ci: Added verification on Before hook to avoid navigating again to viewer page (#1505)

* Added verification on Before hook to avoid navigating again to viewer page

* Removed unecessary screenshots and duplicated test cases

* Navigation Fix for HTML extension and improved Flip button verification

Co-authored-by: Danny Brown <danny.ri.brown@gmail.com>

platform/viewer/cypress/integration/pwa/OHIFExtensionHTMLPDF.spec.js

@@ -1,6 +1,8 @@
 describe('OHIF HTML Extension', () => {
   before(() => {
-    cy.openStudy('Dummy');
+    cy.openStudyInViewer(
+      '1.2.826.0.13854362241694438965858641723883466450351448'
+    );
     cy.expectMinimumThumbnails(5);
   });
 
@@ -40,5 +42,37 @@ describe('OHIF HTML Extension', () => {
         .scrollTo('bottom');
       cy.wrap($viewport).should('have.class', 'active');
     });
+
+    cy.setLayout('1', '1');
+  });
+});
+
+describe('OHIF PDF Extension', () => {
+  before(() => {
+    cy.checkStudyRouteInViewer(
+      '1.2.826.0.13854362241694438965858641723883466450351448'
+    );
+    cy.expectMinimumThumbnails(5);
+  });
+
+  it('checks if series thumbnails are being displayed', () => {
+    cy.get('[data-cy="thumbnail-list"]')
+      .contains('DOC')
+      .its('length')
+      .should('to.be.at.least', 1);
+  });
+
+  it('drags and drop a PDF thumbnail into viewport', () => {
+    cy.get('[data-cy="thumbnail-list"]')
+      .contains('DOC')
+      .scrollIntoView()
+      .drag('.viewport-drop-target');
+
+    cy.get('.DicomPDFViewport')
+      .its('length')
+      .should('be.eq', 1);
+
+    //Take Screenshot
+    cy.screenshot('PDF Extension - Should load PDF file');
   });
 });

platform/viewer/cypress/integration/pwa/OHIFExtensionPDF.spec.js

@@ -1,27 +0,0 @@
-describe('OHIF PDF Extension', () => {
-  before(() => {
-    cy.openStudy('Dummy');
-    cy.expectMinimumThumbnails(6);
-  });
-
-  it('checks if series thumbnails are being displayed', () => {
-    cy.get('[data-cy="thumbnail-list"]')
-      .contains('DOC')
-      .its('length')
-      .should('to.be.at.least', 1);
-  });
-
-  it('drags and drop a PDF thumbnail into viewport', () => {
-    cy.get('[data-cy="thumbnail-list"]')
-      .contains('DOC')
-      .drag('.viewport-drop-target');
-
-    cy.get('.DicomPDFViewport')
-      .its('length')
-      .should('be.eq', 1);
-
-    // This won't work unless we switch to an extension that renders using `canvas`
-    // Currently, we rely on the browser's built-in implementation
-    cy.screenshot('PDF Extension - Should load PDF file');
-  });
-});

platform/viewer/cypress/integration/pwa/OHIFExtensionVTK.spec.js

@@ -1,16 +1,9 @@
 describe('OHIF VTK Extension', () => {
   before(() => {
-    cy.openStudy('Juno');
-    cy.waitDicomImage();
+    cy.checkStudyRouteInViewer(
+      '1.3.6.1.4.1.25403.345050719074.3824.20170125113417.1'
+    );
     cy.expectMinimumThumbnails(7);
-  });
-
-  beforeEach(() => {
-    //TODO: Due to percy snapshot, the images inside the viewports are being resized
-    //and once the browser continues the test execution, the images are not centered in the viewport.
-    //To fix that, we need to reload the page before each test.
-    //https://github.com/OHIF/Viewers/issues/1168
-    cy.reload();
 
     //Waiting for the desired thumbnail content to be displayed
     cy.get('[data-cy="thumbnail-list"]').should($list => {
@@ -23,14 +16,16 @@ describe('OHIF VTK Extension', () => {
     // Drag and drop third thumbnail into first viewport
     cy.get('[data-cy="thumbnail-list"]')
       .contains('CT WB 5.0  B35f')
-      .drag('.viewport-drop-target')
+      .drag('.viewport-drop-target');
 
     //Select 2D MPR button
     cy.get('[data-cy="2d mpr"]').click();
 
     //Wait Reformatting Images
     cy.waitVTKReformatting();
+  });
 
+  beforeEach(() => {
     cy.initVTKToolsAliases();
   });
 
@@ -54,9 +49,6 @@ describe('OHIF VTK Extension', () => {
     cy.get('@layoutBtn')
       .should('be.visible')
       .contains('Layout');
-
-    // Visual comparison
-    cy.screenshot('VTK initial state - Should display toolbar and 3 viewports');
   });
 
   it('checks Crosshairs tool', () => {
@@ -64,20 +56,26 @@ describe('OHIF VTK Extension', () => {
 
     // Click and Move the mouse inside the viewport
     cy.get('[data-cy="viewport-container-0"]')
-      .trigger('mousedown', 'center', { which: 1 })
-      .trigger('mousemove', 'top', { which: 1 })
+      .trigger('mousedown', 'center', {
+        which: 1,
+      })
+      .trigger('mousemove', 'top', {
+        which: 1,
+      })
       .trigger('mouseup');
 
-    // Visual comparison
+    //Take Screenshot
     cy.screenshot(
       "VTK Crosshairs tool - Should display crosshairs' green lines"
     );
   });
 
-  /* TODO: Non-deterministic behavior (const expectedText = 'W: 350 L: -1044';)
   it('checks WWWC tool', () => {
     cy.get('@wwwcBtn').click();
 
+    //Initial label in the viewport
+    const initialLabelText = 'W: 350 L: 40';
+
     // Click and Move the mouse inside the viewport
     cy.get('[data-cy="viewport-container-0"]')
       .trigger('mousedown', 'center', { which: 1 })
@@ -86,29 +84,29 @@ describe('OHIF VTK Extension', () => {
       .trigger('mousemove', 'top', { which: 1 })
       .trigger('mouseup', { which: 1 })
       .then(() => {
-        const expectedText = 'W: 350 L: 40';
         cy.get('.ViewportOverlay > div.bottom-right.overlay-element').should(
-          'contains.text',
-          expectedText
+          'not.have.text',
+          initialLabelText
         );
       });
-
-    // Visual comparison
-    cy.screenshot('VTK WWWC tool - Canvas should be bright');
-  }); */
+  });
 
   it('checks Rotate tool', () => {
     cy.get('@rotateBtn').click();
 
     // Click and Move the mouse inside the viewport
     cy.get('[data-cy="viewport-container-0"]')
-      .trigger('mousedown', 'center', { which: 1 })
+      .trigger('mousedown', 'center', {
+        which: 1,
+      })
       .trigger('mousemove', 'top', { which: 1 })
-      .trigger('mousedown', 'center', { which: 1 })
+      .trigger('mousedown', 'center', {
+        which: 1,
+      })
       .trigger('mousemove', 'top', { which: 1 })
       .trigger('mouseup', { which: 1 });
 
-    // Visual comparison
+    //Take Screenshot
     cy.screenshot('VTK Rotate tool - Should rotate image');
   });
 });

platform/viewer/cypress/integration/pwa/OHIFSaveMeasurements.spec.js

@@ -1,7 +1,8 @@
 describe('OHIF Save Measurements', function() {
   before(() => {
-    cy.openStudyInViewer('1.2.840.113619.2.5.1762583153.215519.978957063.78');
-    cy.waitDicomImage();
+    cy.checkStudyRouteInViewer(
+      '1.2.840.113619.2.5.1762583153.215519.978957063.78'
+    );
     cy.expectMinimumThumbnails(5);
   });