ci: Use containerized PACS for running end-to-end tests #1122 (#1290)

* ci: Use containerized PACS for running end-to-end tests

* Try to fix cypress test results

Co-authored-by: dannyrb <danny.ri.brown@gmail.com>
This commit is contained in:
Erik Ziegleranddannyrb authored and GitHub committed 2020-12-03 10:26:22 +01:00
1 parent 6c5ad9e98d
commit dfe566e2aa
29 files changed
+748 -379

No files matched your search

@@ -3,7 +3,7 @@ describe('OHIF Cornerstone Hotkeys', () => {
cy.checkStudyRouteInViewer(
'1.2.840.113619.2.5.1762583153.215519.978957063.78'
);
cy.expectMinimumThumbnails(5);
cy.expectMinimumThumbnails(3);
});
beforeEach(() => {
@@ -3,12 +3,18 @@ describe('OHIF Cornerstone Toolbar', () => {
cy.checkStudyRouteInViewer(
'1.2.840.113619.2.5.1762583153.215519.978957063.78'
);
cy.expectMinimumThumbnails(5);
cy.expectMinimumThumbnails(3);
});
beforeEach(() => {
cy.initCornerstoneToolsAliases();
cy.initCommonElementsAliases();
cy.get('[data-cy="thumbnail-list"]:nth-child(1)').click();
const expectedText = 'Ser: 1';
cy.get('@viewportInfoBottomLeft').should('contains.text', expectedText);
cy.resetViewport();
});
@@ -49,7 +55,7 @@ describe('OHIF Cornerstone Toolbar', () => {
});
it('checks if Stack Scroll tool will navigate across all series in the viewport', () => {
//Click on button and vefiry if icon is active on toolbar
//Click on button and verify if icon is active on toolbar
cy.get('@stackScrollBtn')
.click()
.then($stackScrollBtn => {
@@ -85,7 +91,7 @@ describe('OHIF Cornerstone Toolbar', () => {
});
it('checks if Levels tool will change the contrast and brightness of an image in the viewport', () => {
//Click on button and vefiry if icon is active on toolbar
//Click on button and verify if icon is active on toolbar
cy.get('@levelsBtn')
.click()
.then($levelsBtn => {
@@ -106,7 +112,7 @@ describe('OHIF Cornerstone Toolbar', () => {
});
it('checks if Pan tool will move the image inside the viewport', () => {
//Click on button and vefiry if icon is active on toolbar
//Click on button and verify if icon is active on toolbar
cy.get('@panBtn')
.click()
.then($panBtn => {
@@ -120,7 +126,7 @@ describe('OHIF Cornerstone Toolbar', () => {
});
it('checks if Length annotation can be added on viewport and on measurements panel', () => {
//Click on button and vefiry if icon is active on toolbar
//Click on button and verify if icon is active on toolbar
cy.get('@lengthBtn')
.click()
.then($lengthbtn => {
@@ -147,7 +153,7 @@ describe('OHIF Cornerstone Toolbar', () => {
});
it('checks if Angle annotation can be added on viewport and on measurements panel', () => {
//Click on button and vefiry if icon is active on toolbar
//Click on button and verify if icon is active on toolbar
cy.get('@angleBtn')
.click()
.then($angleBtn => {
@@ -192,7 +198,8 @@ describe('OHIF Cornerstone Toolbar', () => {
//Click on button
cy.get('@cineBtn').click();
//Vefiry if cine control overlay is being displayed
// Verify if cine control overlay is being displayed
cy.get('.cine-controls')
.as('cineControls')
.should('be.visible');
@@ -253,13 +260,15 @@ describe('OHIF Cornerstone Toolbar', () => {
cy.get('@cineBtn')
.click()
.then(() => {
//Vefiry if cine control overlay is hidden
cy.get('@cineControls').should('not.be.visible');
// Verify that cine control overlay is hidden
cy.get('@cineControls').should('not.exist');
});
});
it('checks if More button will prompt a modal with secondary tools', () => {
//Click on More button
cy.get('@moreBtn').click();
//Verify if overlay is displayed
cy.get('.tooltip-toolbar-overlay')
.as('toolbarOverlay')
@@ -288,9 +297,10 @@ describe('OHIF Cornerstone Toolbar', () => {
});
//Verify if overlay is hidden
cy.get('@toolbarOverlay').should('not.be.visible');
cy.get('@toolbarOverlay').should('not.exist');
});
it('checks if Layout tool will multiply the number of viewports displayed', () => {
//Click on Layout button and verify if overlay is displayed
cy.get('@layoutBtn')
@@ -415,7 +425,7 @@ describe('OHIF Cornerstone Toolbar', () => {
// TODO: We need a seperate test server for this to work.
// As anyone can save measurements on a different slice.
cy.get('.measurementItem'); //.should('not.exist');
//cy.get('.measurementItem'); //.should('not.exist');
//Close More button overlay
cy.get('@moreBtn').click();
@@ -439,6 +449,9 @@ describe('OHIF Cornerstone Toolbar', () => {
cy.get('@viewportInfoMidLeft').should('contains.text', 'F');
cy.get('@viewportInfoMidTop').should('contains.text', 'R');
});
//Click on More button to close it
cy.get('@moreBtn').click();
});
it('check if Flip H tool will flip the image horizontally in the viewport', () => {
@@ -451,6 +464,10 @@ describe('OHIF Cornerstone Toolbar', () => {
cy.get('[data-cy="flip h"]').click();
cy.get('@viewportInfoMidLeft').should('contains.text', 'L');
cy.get('@viewportInfoMidTop').should('contains.text', 'H');
//Click on More button to close it
cy.get('@moreBtn').click();
cy.get('.tooltip-toolbar-overlay').should('not.exist');
});
it('check if Flip V tool will flip the image vertically in the viewport', () => {
@@ -463,5 +480,9 @@ describe('OHIF Cornerstone Toolbar', () => {
cy.get('[data-cy="flip v"]').click();
cy.get('@viewportInfoMidLeft').should('contains.text', 'R');
cy.get('@viewportInfoMidTop').should('contains.text', 'F');
//Click on More button to close it
cy.get('@moreBtn').click();
cy.get('.tooltip-toolbar-overlay').should('not.exist');
});
});
@@ -3,7 +3,7 @@ describe('OHIF Download Snapshot File', () => {
cy.checkStudyRouteInViewer(
'1.2.840.113619.2.5.1762583153.215519.978957063.78'
);
cy.expectMinimumThumbnails(5);
cy.expectMinimumThumbnails(3);
});
beforeEach(() => {
@@ -22,51 +22,54 @@ describe('OHIF Study List', function() {
//Wait result list to be displayed
cy.waitStudyList();
cy.get('@searchResult').should($list => {
expect($list.length).to.be.eq(3);
expect($list.length).to.be.eq(1);
expect($list).to.contain('Juno');
});
});
it('searches MRN with exact string', function() {
cy.get('@MRN').type('ProstateX-0000');
//Wait result list to be displayed
cy.waitStudyList();
cy.get('@searchResult').should($list => {
expect($list.length).to.be.eq(2);
expect($list).to.contain('ProstateX-0000');
});
});
it('searches Accession with exact string', function() {
cy.get('@AccessionNumber').type('0000481914');
cy.get('@MRN').type('0000003');
//Wait result list to be displayed
cy.waitStudyList();
cy.get('@searchResult').should($list => {
expect($list.length).to.be.eq(1);
expect($list).to.contain('0000481914');
expect($list).to.contain('0000003');
});
});
it('searches Accession with exact string', function() {
cy.get('@AccessionNumber').type('0000155811');
//Wait result list to be displayed
cy.waitStudyList();
cy.get('@searchResult').should($list => {
expect($list.length).to.be.eq(1);
expect($list).to.contain('0000155811');
});
});
it('searches Modality with camel case', function() {
cy.get('@modalities').type('Mr');
cy.get('@modalities').type('Ct');
//Wait result list to be displayed
cy.waitStudyList();
cy.get('@searchResult').should($list => {
// TODO: Why are we facing some inconsistency with this result? ¯\_(ツ)_/¯
expect($list.length).to.be.eq(9);
expect($list).to.contain('MR');
expect($list.length).to.be.greaterThan(1);
expect($list).to.contain('CT');
});
});
/*
TODO: Currently broken in dicomweb-server
it('searches Description with exact string', function() {
cy.get('@StudyDescription').type('CHEST');
cy.get('@StudyDescription').type('PETCT');
//Wait result list to be displayed
cy.waitStudyList();
cy.get('@searchResult').should($list => {
expect($list.length).to.be.eq(2);
expect($list).to.contain('CHEST');
expect($list.length).to.be.eq(1);
expect($list).to.contain('PETCT');
});
});
*/
it('changes Rows per page and checks the study count', function() {
//Show Rows per page options
@@ -128,52 +131,60 @@ describe('OHIF Study List', function() {
//Wait result list to be displayed
cy.waitStudyList();
cy.get('@searchResult').should($list => {
expect($list.length).to.be.eq(3);
expect($list.length).to.be.eq(1);
expect($list).to.contain('Juno');
});
});
it('searches MRN with with exact string', function() {
cy.get('@patientNameOrMRN').type('ProstateX-0000');
//Wait result list to be displayed
cy.waitStudyList();
cy.get('@searchResult').should($list => {
expect($list.length).to.be.eq(6);
expect($list).to.contain('ProstateX-0000');
});
});
it('searches Modality with exact string', function() {
cy.get('@accessionModalityDescription').type('MR');
//Wait result list to be displayed
cy.waitStudyList();
cy.get('@searchResult').should($list => {
// TODO: Why are we facing some inconsistency with this result? ¯\_(ツ)_/¯
expect($list.length).to.be.eq(9);
expect($list).to.contain('MR');
});
});
it('searches Accession with exact string', function() {
cy.get('@accessionModalityDescription').type('0000481914');
cy.get('@patientNameOrMRN').type('Juno');
//Wait result list to be displayed
cy.waitStudyList();
cy.get('@searchResult').should($list => {
expect($list.length).to.be.eq(1);
expect($list).to.contain('0000481914');
expect($list).to.contain('Juno');
});
});
it('searches Description with exact string', function() {
cy.get('@accessionModalityDescription').type('CHEST');
it('searches Modality with exact string', function() {
cy.get('@accessionModalityDescription').type('CT');
//Wait result list to be displayed
cy.waitStudyList();
cy.get('@searchResult').should($list => {
expect($list.length).to.be.eq(2);
expect($list).to.contain('CHEST');
expect($list.length).to.be.eq(1);
expect($list).to.contain('CT');
});
});
/*
/*
TODO: Currently broken in dicomweb-server
it('searches Accession with exact string', function() {
cy.get('@accessionModalityDescription').type('0000155811');
//Wait result list to be displayed
cy.waitStudyList();
cy.get('@searchResult').should($list => {
expect($list.length).to.be.eq(1);
expect($list).to.contain('0000155811');
});
});
*/
/*
TODO: Currently broken in dicomweb-server
it('searches Description with exact string', function() {
cy.get('@accessionModalityDescription').type('PETCT');
//Wait result list to be displayed
cy.waitStudyList();
cy.get('@searchResult').should($list => {
expect($list.length).to.be.eq(1);
expect($list).to.contain('PETCT');
});
});
*/
it('changes Rows per page and checks the study count', function() {
//Show Rows per page options
const pageRows = [25, 50, 100];
@@ -3,12 +3,12 @@ describe('OHIF Study Viewer Page', function() {
cy.checkStudyRouteInViewer(
'1.2.840.113619.2.5.1762583153.215519.978957063.78'
);
cy.expectMinimumThumbnails(5);
cy.expectMinimumThumbnails(3);
});
beforeEach(function() {
cy.initCommonElementsAliases();
cy.resetViewport();
cy.resetViewport().wait(50);
});
it('checks if series thumbnails are being displayed', function() {
@@ -50,10 +50,10 @@ describe('OHIF Study Viewer Page', function() {
.click();
// Click "Relabel"
cy.get('.btnAction')
cy.get('.btnAction', { timeout: 10000 })
.first()
.contains('Relabel')
.click();
.click().should('be.visible');
// Search for "Bone"
cy.get('.searchInput').type('Bone');
@@ -68,11 +68,20 @@ describe('OHIF Study Viewer Page', function() {
// Verify if 'Bone' label was added
cy.get('.measurementLocation').should('contain.text', 'Bone');
// Remove the measurement we just added
cy.get('.btnAction')
.last()
.contains('Delete')
.click()
// Close panel
cy.get('@measurementsBtn').click();
cy.get('@measurementsPanel').should('not.be.enabled');
});
/*
TODO: Not sure why this is failing
it('checks if Description can be added to measurement item under Measurements panel', () => {
cy.addLengthMeasurement(); //Adding measurement in the viewport
cy.get('@measurementsBtn').click();
@@ -94,7 +103,19 @@ describe('OHIF Study Viewer Page', function() {
//Verify if descriptionText was added
cy.get('.measurementLocation').should('contain.text', descriptionText);
// Remove the measurement we just added
cy.get('.btnAction')
.last()
.contains('Delete')
.click()
// Close panel
cy.get('@measurementsBtn').click();
cy.get('@measurementsPanel').should('not.be.enabled');
});
*/
it('checks if measurement item can be deleted through the context menu on the viewport', function() {
cy.addLengthMeasurement([100, 100], [200, 100]); //Adding measurement in the viewport
@@ -108,6 +129,7 @@ describe('OHIF Study Viewer Page', function() {
.trigger('mouseup', x1, y1, {
which: 3,
})
.wait(300)
.then(() => {
//Contextmenu is visible
cy.get('.ToolContextMenu').should('be.visible');
@@ -122,12 +144,9 @@ describe('OHIF Study Viewer Page', function() {
cy.get('@measurementsBtn').click();
//Verify measurements was removed from panel
cy.get('.measurementItem');
// TODO: We need a seperate test server for this to work.
// As anyone can save measurements on a different slice.
// .should('not.exist')
// .log('Annotation removed with success');
cy.get('.measurementItem')
.should('not.exist')
.log('Annotation successfully removed');
//Close panel
cy.get('@measurementsBtn').click();
@@ -228,7 +247,7 @@ describe('OHIF Study Viewer Page', function() {
});
const expectedText =
'Ser: 5Img: 1 12/12512 x 512Loc: -15.40 mm Thick: 4.00 mm'; //'Img: 13 13/13';
'Ser: 2Img: 13 13/13512 x 512Loc: 18.40 mm Thick: 3.00 mm'; //'Img: 13 13/13';
cy.get('@viewportInfoBottomLeft').should('contains.text', expectedText);
});
@@ -246,7 +265,8 @@ describe('OHIF Study Viewer Page', function() {
.trigger('mousemove', 'center', { which: 3 })
.trigger('mouseup');
const expectedText = 'Zoom: 301%';
const expectedText = 'Zoom: 442%';
cy.get('@viewportInfoBottomRight').should('contains.text', expectedText);
});
@@ -301,6 +321,6 @@ describe('OHIF Study Viewer Page', function() {
//close modal
cy.get('[data-cy="close-button"]').click();
cy.get('@aboutOverlay').should('not.be.enabled');
cy.get('@aboutOverlay').should('not.exist');
});
});
@@ -184,7 +184,7 @@ describe('OHIF User Preferences', () => {
cy.checkStudyRouteInViewer(
'1.2.840.113619.2.5.1762583153.215519.978957063.78'
);
cy.expectMinimumThumbnails(5);
cy.expectMinimumThumbnails(3);
cy.initCommonElementsAliases();
// Check if application is in Spanish
@@ -217,7 +217,7 @@ describe('OHIF User Preferences', () => {
cy.checkStudyRouteInViewer(
'1.2.840.113619.2.5.1762583153.215519.978957063.78'
);
cy.expectMinimumThumbnails(5);
cy.expectMinimumThumbnails(3);
});
beforeEach(() => {
@@ -583,7 +583,7 @@ describe('OHIF User Preferences', () => {
cy.checkStudyRouteInViewer(
'1.2.840.113619.2.5.1762583153.215519.978957063.78'
);
cy.expectMinimumThumbnails(5);
cy.expectMinimumThumbnails(3);
});
beforeEach(() => {
@@ -1,9 +1,12 @@
/*
Temporarily disabling as we transition to containerized PACS for E2E tests
describe('OHIF HTML Extension', () => {
before(() => {
cy.openStudyInViewer(
'1.2.826.0.13854362241694438965858641723883466450351448'
);
cy.expectMinimumThumbnails(5);
cy.expectMinimumThumbnails(3);
});
// TODO -> Commented these out until we get a seperate temporary PACS running on the CI.
@@ -79,3 +82,4 @@ describe('OHIF HTML Extension', () => {
// cy.screenshot('PDF Extension - Should load PDF file');
// });
// });
*/
@@ -1,3 +1,6 @@
/*
Temporarily disabling as we transition to containerized PACS for E2E tests
describe('OHIF Microscopy Extension', () => {
before(() => {
cy.openStudyModality('SM');
@@ -27,3 +30,4 @@ describe('OHIF Microscopy Extension', () => {
cy.screenshot('Microscopy Extension - Should display loaded canvas');
});
});
*/
@@ -3,10 +3,14 @@ describe('OHIF VTK Extension', () => {
cy.checkStudyRouteInViewer(
'1.3.6.1.4.1.25403.345050719074.3824.20170125113417.1'
);
cy.expectMinimumThumbnails(7);
cy.expectMinimumThumbnails(3);
// TODO: Added 1s wait because we are loading initial series list
// from QIDO-RS, which is breaking some cypress checks
//Waiting for the desired thumbnail content to be displayed
cy.get('[data-cy="thumbnail-list"]').should($list => {
cy.get('[data-cy="thumbnail-list"]').wait(1000).should($list => {
expect($list).to.contain('CT WB 5.0 B35f');
});
@@ -15,7 +19,7 @@ describe('OHIF VTK Extension', () => {
// has data from a drag-n-drop
// Drag and drop third thumbnail into first viewport
cy.get('[data-cy="thumbnail-list"]')
.contains('CT WB 5.0 B35f')
.eq(2)
.drag('.viewport-drop-target');
//Select 2D MPR button
@@ -3,7 +3,7 @@ describe('OHIF Save Measurements', function() {
cy.checkStudyRouteInViewer(
'1.2.840.113619.2.5.1762583153.215519.978957063.78'
);
cy.expectMinimumThumbnails(5);
cy.expectMinimumThumbnails(3);
});
beforeEach(() => {
@@ -3,7 +3,7 @@ describe('Visual Regression - OHIF Cornerstone Hotkeys', () => {
cy.checkStudyRouteInViewer(
'1.2.840.113619.2.5.1762583153.215519.978957063.78'
);
cy.expectMinimumThumbnails(5);
cy.expectMinimumThumbnails(3);
});
beforeEach(() => {
@@ -3,7 +3,7 @@ describe('Visual Regression - OHIF Cornerstone Toolbar', () => {
cy.checkStudyRouteInViewer(
'1.2.840.113619.2.5.1762583153.215519.978957063.78'
);
cy.expectMinimumThumbnails(5);
cy.expectMinimumThumbnails(3);
});
beforeEach(() => {
@@ -13,7 +13,7 @@ describe('Visual Regression - OHIF Cornerstone Toolbar', () => {
});
it('checks if Pan tool will move the image inside the viewport', () => {
//Click on button and vefiry if icon is active on toolbar
//Click on button and verify if icon is active on toolbar
cy.get('@panBtn')
.click()
.then($panBtn => {
@@ -3,7 +3,7 @@ describe('Visual Regression - OHIF Download Snapshot File', () => {
cy.checkStudyRouteInViewer(
'1.2.840.113619.2.5.1762583153.215519.978957063.78'
);
cy.expectMinimumThumbnails(5);
cy.expectMinimumThumbnails(3);
});
beforeEach(() => {
@@ -1,3 +1,6 @@
/*
Temporarily disabling as we transition to containerized PACS for E2E tests
describe('Visual Regression - OHIF Microscopy Extension', () => {
before(() => {
cy.openStudyModality('SM');
@@ -20,3 +23,4 @@ describe('Visual Regression - OHIF Microscopy Extension', () => {
);
});
});
*/
@@ -1,3 +1,6 @@
/*
Temporarily disabling as we transition to containerized PACS for E2E tests
describe('Visual Regression - OHIF PDF Extension', () => {
before(() => {
cy.checkStudyRouteInViewer(
@@ -20,3 +23,4 @@ describe('Visual Regression - OHIF PDF Extension', () => {
cy.percyCanvasSnapshot('PDF Extension - Should load PDF file');
});
});
*/
@@ -1,3 +1,6 @@
/*
Temporarily disabling as we transition to containerized PACS for E2E tests
describe('Visual Regression - OHIF VTK Extension', () => {
before(() => {
cy.checkStudyRouteInViewer(
@@ -91,3 +94,4 @@ describe('Visual Regression - OHIF VTK Extension', () => {
cy.percyCanvasSnapshot('VTK Rotate tool - Should rotate image');
});
});
*/
@@ -13,7 +13,7 @@ describe('Visual Regression - OHIF Routes', function() {
);
cy.server();
cy.route('GET', '**/ TESTStudy; /**').as('getTESTStudy');
cy.route('GET', '*TESTStudy; /**').as('getTESTStudy');
cy.wait('@getTESTStudy.all');
cy.get('@getTESTStudy').should($route => {
@@ -3,7 +3,7 @@ describe('Visual Regression - OHIF Study Viewer Page', function() {
cy.checkStudyRouteInViewer(
'1.2.840.113619.2.5.1762583153.215519.978957063.78'
);
cy.expectMinimumThumbnails(5);
cy.expectMinimumThumbnails(3);
});
beforeEach(function() {
@@ -31,6 +31,6 @@ describe('Visual Regression - OHIF Study Viewer Page', function() {
//close modal
cy.get('[data-cy="close-button"]').click();
cy.get('@aboutOverlay').should('not.be.enabled');
cy.get('@aboutOverlay').should('not.exist');
});
});
@@ -9,6 +9,11 @@ describe('Visual Regression - OHIF User Preferences', () => {
cy.openPreferences();
});
afterEach(() => {
// Close User Preferences modal
cy.closePreferences();
});
it('checks displayed information on User Preferences modal', function() {
// Go go hotkeys tab
cy.selectPreferencesTab('@userPreferencesHotkeysTab');
@@ -52,7 +57,7 @@ describe('Visual Regression - OHIF User Preferences', () => {
context('Study Viewer Page', function() {
before(() => {
cy.openStudyInViewer('1.2.840.113619.2.5.1762583153.215519.978957063.78');
cy.expectMinimumThumbnails(5);
cy.expectMinimumThumbnails(3);
});
beforeEach(() => {
@@ -64,6 +69,11 @@ describe('Visual Regression - OHIF User Preferences', () => {
cy.openPreferences();
});
afterEach(() => {
// Close User Preferences modal
cy.closePreferences();
});
it('checks displayed information on User Preferences modal', function() {
// Go go hotkeys tab
cy.selectPreferencesTab('@userPreferencesHotkeysTab');
@@ -150,13 +160,13 @@ describe('Visual Regression - OHIF User Preferences', () => {
// Set new hotkey for 'Next Image Viewport' function
cy.setNewHotkeyShortcutOnUserPreferencesModal(
'Next Image Viewport',
'Next Viewport',
'{shift}{rightarrow}'
);
// Set new hotkey for 'Previous Image Viewport' function
cy.setNewHotkeyShortcutOnUserPreferencesModal(
'Previous Image Viewport',
'Previous Viewport',
'{shift}{leftarrow}'
);