try to fix e2e

OHIF · Sep 22, 2023 · 1f56c5b · 1f56c5b
1 parent 09c2741
commit 1f56c5b
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 10 deletions.
diff --git a/extensions/cornerstone-dicom-seg/.webpack/webpack.prod.js b/extensions/cornerstone-dicom-seg/.webpack/webpack.prod.js
@@ -45,10 +45,10 @@ module.exports = (env, argv) => {
       new webpack.optimize.LimitChunkCountPlugin({
         maxChunks: 1,
       }),
-      // new MiniCssExtractPlugin({
-      //   filename: `./dist/${outputName}.css`,
-      //   chunkFilename: `./dist/${outputName}.css`,
-      // }),
+      new MiniCssExtractPlugin({
+        filename: `./dist/${outputName}.css`,
+        chunkFilename: `./dist/${outputName}.css`,
+      }),
     ],
   });
 };
diff --git a/platform/app/cypress/integration/MultiStudy.spec.js b/platform/app/cypress/integration/MultiStudy.spec.js
@@ -13,8 +13,12 @@ describe('OHIF Multi Study', () => {
   it('Should display 2 comparison up', () => {
     beforeSetup();
 
-    cy.get('[data-cy="viewport-pane"]').its('length').should('be.eq', 4);
-    cy.get('[data-cy="studyDate"]').should(studyDate => {
+    cy.get('[data-cy="viewport-pane"]').as('viewportPane');
+    cy.get('@viewportPane').its('length').should('be.eq', 4);
+
+    cy.get('[data-cy="studyDate"]').as('studyDate');
+
+    cy.get('@studyDate').should(studyDate => {
       expect(studyDate.length).to.be.eq(4);
       expect(studyDate.text()).to.contain('2014').contain('2001');
       expect(studyDate.text().indexOf('2014')).to.be.lessThan(studyDate.text().indexOf('2001'));

diff --git a/platform/app/cypress/integration/measurement-tracking/OHIFMeasurementPanel.spec.js b/platform/app/cypress/integration/measurement-tracking/OHIFMeasurementPanel.spec.js
@@ -25,10 +25,15 @@ describe('OHIF Measurement Panel', function () {
     cy.addLengthMeasurement();
     cy.get('[data-cy="viewport-notification"]').should('exist');
     cy.get('[data-cy="viewport-notification"]').should('be.visible');
-    cy.get('[data-cy="prompt-begin-tracking-yes-btn"]').click();
-    cy.get('[data-cy="measurement-item"]').click();
 
-    cy.get('[data-cy="measurement-item"]').find('svg').click();
+    cy.get('[data-cy="prompt-begin-tracking-yes-btn"]').as('promptBeginTrackingYesBtn');
+    cy.get('@promptBeginTrackingYesBtn').click();
+
+    cy.get('[data-cy="measurement-item"]').as('measurementItem');
+    cy.get('@measurementItem').click();
+
+    cy.get('[data-cy="measurement-item"]').find('svg').as('measurementItemSvg');
+    cy.get('@measurementItemSvg').click();
 
     // enter Bone label
     cy.get('[data-cy="input-annotation"]').should('exist');
@@ -42,7 +47,8 @@ describe('OHIF Measurement Panel', function () {
   it('checks if image would jump when clicked on a measurement item', function () {
     // Add length measurement
     cy.addLengthMeasurement();
-    cy.get('[data-cy="prompt-begin-tracking-yes-btn"]').click();
+    cy.get('[data-cy="prompt-begin-tracking-yes-btn"]').as('promptBeginTrackingYesBtn');
+    cy.get('@promptBeginTrackingYesBtn').click();
 
     cy.scrollToIndex(13);
 

diff --git a/yarn.lock b/yarn.lock
@@ -1523,6 +1523,16 @@
     gl-matrix "^3.4.3"
     lodash.clonedeep "4.5.0"
 
+"@cornerstonejs/core@^1.16.6":
+  version "1.16.6"
+  resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-1.16.6.tgz#a216fc655f3c4b110196e63dcf129e02839d0890"
+  integrity sha512-ysd+t2N2KVk88TLYg0Nx174uYd47wQRBdFQZ4ApHhI/IHq5lY/qrP8prrtLR/DEtyLyUERIxDyGFRr+lEBZpxg==
+  dependencies:
+    "@kitware/vtk.js" "27.3.1"
+    detect-gpu "^5.0.22"
+    gl-matrix "^3.4.3"
+    lodash.clonedeep "4.5.0"
+
 "@cornerstonejs/dicom-image-loader@^1.16.5":
   version "1.16.5"
   resolved "https://registry.yarnpkg.com/@cornerstonejs/dicom-image-loader/-/dicom-image-loader-1.16.5.tgz#23ca3e27e29b88cd05840c777578b37de60e5b87"
@@ -1544,6 +1554,15 @@
   dependencies:
     "@cornerstonejs/core" "^1.16.5"
 
+"@cornerstonejs/tools@^1.16.4":
+  version "1.16.6"
+  resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-1.16.6.tgz#0debc17fb9830288bff263bbf3a34cb940b726c2"
+  integrity sha512-qLjtEC0OGW+bpvvKXQPQs8TEE/ze+NIiBbg1qBSXo2vm7O3YO1DRWbWthJMVL7tIWYuVxZx5OsAI2WOkydQUOA==
+  dependencies:
+    "@cornerstonejs/core" "^1.16.6"
+    lodash.clonedeep "4.5.0"
+    lodash.get "^4.4.2"
+
 "@cornerstonejs/tools@^1.16.5":
   version "1.16.5"
   resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-1.16.5.tgz#79948216521c591a02f395e2130d72e0b9347eca"