othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: E2E tests for W/L Presets (#1557)

Browse Source 
* E2E tests for W/L Presets

* CI Fix
This commit is contained in:
Mirna Silva 2020-03-25 22:46:28 -03:00 committed by GitHub
parent 57de66a65f
commit e676f0b5b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 401 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

364
platform/viewer/cypress/integration/common/OHIFUserPreferences.spec.js
View File

@ -7,15 +7,22 @@ describe('OHIF User Preferences', () => {
beforeEach(() => { beforeEach(() => {
// Open User Preferences modal // Open User Preferences modal
cy.openPreferences(); cy.openPreferences();
cy.initPreferencesModalAliases();
}); });
it('checks displayed information on User Preferences modal', function() { it('checks displayed information on User Preferences modal', function() {
cy.initPreferencesModalAliases();
//Check Title
cy.get('@preferencesModal').should('contain.text', 'User Preferences'); cy.get('@preferencesModal').should('contain.text', 'User Preferences');
//Check tabs
cy.get('@userPreferencesHotkeysTab') cy.get('@userPreferencesHotkeysTab')
.should('have.text', 'Hotkeys') .should('have.text', 'Hotkeys')
.and('have.class', 'active'); .and('have.class', 'active');
cy.get('@userPreferencesGeneralTab').should('have.text', 'General'); cy.get('@userPreferencesGeneralTab').should('have.text', 'General');
cy.get('@userPreferencesWindowLevelTab').should(
'have.text',
'Window Level'
);
//Check buttons
cy.get('@restoreBtn') cy.get('@restoreBtn')
.scrollIntoView() .scrollIntoView()
.should('have.text', 'Reset to Defaults'); .should('have.text', 'Reset to Defaults');
@ -26,8 +33,7 @@ describe('OHIF User Preferences', () => {
}); });
it('checks translation by selecting Spanish language', function() { it('checks translation by selecting Spanish language', function() {
cy.changePreferencesTab('@userPreferencesGeneralTab'); cy.selectPreferencesTab('@userPreferencesGeneralTab');
cy.get('@userPreferencesGeneralTab').should('have.class', 'active');
// Language dropdown should be displayed // Language dropdown should be displayed
cy.get('#language-select').should('be.visible'); cy.get('#language-select').should('be.visible');
@ -92,16 +98,22 @@ describe('OHIF User Preferences', () => {
cy.openPreferences(); cy.openPreferences();
// Go to general tab // Go to general tab
cy.changePreferencesTab('@userPreferencesGeneralTab'); cy.selectPreferencesTab('@userPreferencesGeneralTab');
cy.get('@restoreBtn') cy.get('@restoreBtn')
.scrollIntoView() .scrollIntoView()
.click(); .click();
// Save // Close Success Message overlay (if displayed)
cy.get('@saveBtn') cy.get('body').then(body => {
.scrollIntoView() if (body.find('.sb-closeIcon').length > 0) {
.click(); cy.get('.sb-closeIcon').click({ force: true });
}
// click on save button
cy.get('@saveBtn')
.scrollIntoView()
.click();
});
// Header should be in "English (USA)" // Header should be in "English (USA)"
cy.get('.research-use') cy.get('.research-use')
@ -124,30 +136,54 @@ describe('OHIF User Preferences', () => {
cy.get('[data-cy="options-menu"]').click(); cy.get('[data-cy="options-menu"]').click();
}); });
it('checks if W/L Preferences table is being displayed in the Window Level tab', function() {
//Navigate to Window Level tab
cy.selectPreferencesTab('@userPreferencesWindowLevelTab');
//Check table header
cy.get('.wlRow.header')
.should('contains.text', 'Preset')
.and('contains.text', 'Description')
.and('contains.text', 'Window')
.and('contains.text', 'Level');
//Check table has more than 1 row (more than header)
cy.get('.wlRow')
.its('length')
.should('be.greaterThan', 1);
});
it('checks if Preferences set in Study List Page will be consistent on Viewer Page', function() { it('checks if Preferences set in Study List Page will be consistent on Viewer Page', function() {
// Go go hotkeys tab // Go go hotkeys tab
cy.changePreferencesTab('@userPreferencesHotkeysTab'); cy.selectPreferencesTab('@userPreferencesHotkeysTab');
cy.get('@userPreferencesHotkeysTab').should('have.class', 'active');
// Set new hotkey for 'Rotate Right' function // Set new hotkey for 'Rotate Right' function
cy.setNewHotkeyShortcutOnUserPreferencesModal('Rotate Right', '{shift}Q'); cy.setNewHotkeyShortcutOnUserPreferencesModal('Rotate Right', '{shift}Q');
// Save new hotkey
cy.get('@saveBtn') // Close Success Message overlay (if displayed)
.scrollIntoView() cy.get('body').then(body => {
.click(); if (body.find('.sb-closeIcon').length > 0) {
cy.get('.sb-closeIcon').click({ force: true });
}
// click on save button
cy.get('@saveBtn')
.scrollIntoView()
.click();
});
// Open User Preferences modal again // Open User Preferences modal again
cy.openPreferences(); cy.openPreferences();
// Go to General tab // Go to General tab
cy.changePreferencesTab('@userPreferencesGeneralTab'); cy.selectPreferencesTab('@userPreferencesGeneralTab');
// Set language to Spanish // Set language to Spanish
cy.setLanguage('Spanish'); cy.setLanguage('Spanish');
// Go to Study Viewer page // Go to Study Viewer page
cy.openStudyInViewer('1.2.840.113619.2.5.1762583153.215519.978957063.78'); cy.checkStudyRouteInViewer(
cy.waitDicomImage(); '1.2.840.113619.2.5.1762583153.215519.978957063.78'
);
cy.expectMinimumThumbnails(5); cy.expectMinimumThumbnails(5);
cy.initCommonElementsAliases(); cy.initCommonElementsAliases();
@ -178,7 +214,9 @@ describe('OHIF User Preferences', () => {
context('Study Viewer Page', function() { context('Study Viewer Page', function() {
before(() => { before(() => {
cy.openStudyInViewer('1.2.840.113619.2.5.1762583153.215519.978957063.78'); cy.checkStudyRouteInViewer(
'1.2.840.113619.2.5.1762583153.215519.978957063.78'
);
cy.expectMinimumThumbnails(5); cy.expectMinimumThumbnails(5);
}); });
@ -186,29 +224,40 @@ describe('OHIF User Preferences', () => {
cy.initCommonElementsAliases(); cy.initCommonElementsAliases();
cy.resetViewport(); cy.resetViewport();
cy.resetUserHoktkeyPreferences(); cy.resetUserHotkeyPreferences();
cy.resetUserGeneralPreferences();
// Open User Preferences modal // Open User Preferences modal
cy.openPreferences(); cy.openPreferences();
}); });
afterEach(() => {
// Close User Preferences Modal (if displayed)
cy.get('body').then(body => {
if (body.find('.OHIFModal__header').length > 0) {
cy.get('[data-cy="close-button"]').click({ force: true });
}
});
});
it('checks displayed information on User Preferences modal', function() { it('checks displayed information on User Preferences modal', function() {
cy.get('@preferencesModal').should('contain.text', 'User Preferences'); cy.get('@preferencesModal').should('contain.text', 'User Preferences');
cy.get('@userPreferencesHotkeysTab') cy.get('@userPreferencesHotkeysTab')
.should('have.text', 'Hotkeys') .should('have.text', 'Hotkeys')
.and('have.class', 'active'); .and('have.class', 'active');
cy.get('@userPreferencesGeneralTab').should('have.text', 'General'); cy.get('@userPreferencesGeneralTab').should('have.text', 'General');
cy.get('@userPreferencesWindowLevelTab').should(
'have.text',
'Window Level'
);
cy.get('@restoreBtn') cy.get('@restoreBtn')
.scrollIntoView() .scrollIntoView()
.should('have.text', 'Reset to Defaults'); .should('have.text', 'Reset to Defaults');
cy.get('@cancelBtn').should('have.text', 'Cancel'); cy.get('@cancelBtn').should('have.text', 'Cancel');
cy.get('@saveBtn').should('have.text', 'Save'); cy.get('@saveBtn').should('have.text', 'Save');
cy.get('[data-cy="close-button"]').click(); //close User Preferences modal
}); });
it('checks translation by selecting Spanish language', function() { it('checks translation by selecting Spanish language', function() {
cy.changePreferencesTab('@userPreferencesGeneralTab'); cy.selectPreferencesTab('@userPreferencesGeneralTab');
cy.get('@userPreferencesGeneralTab').should('have.class', 'active');
// Language dropdown should be displayed // Language dropdown should be displayed
cy.get('#language-select').should('be.visible'); cy.get('#language-select').should('be.visible');
@ -232,9 +281,6 @@ describe('OHIF User Preferences', () => {
cy.get('[data-cy="dd-item-menu"]') cy.get('[data-cy="dd-item-menu"]')
.last() .last()
.should('contain.text', 'Preferencias'); .should('contain.text', 'Preferencias');
// Close Options menu
cy.get('[data-cy="options-menu"]').click();
}); });
it('checks if user can cancel the language selection and application will be in "English (USA)"', function() { it('checks if user can cancel the language selection and application will be in "English (USA)"', function() {
@ -260,13 +306,10 @@ describe('OHIF User Preferences', () => {
cy.get('[data-cy="dd-item-menu"]') cy.get('[data-cy="dd-item-menu"]')
.last() .last()
.should('contain.text', 'Preferences'); .should('contain.text', 'Preferences');
// Close Options menu
cy.get('[data-cy="options-menu"]').click();
}); });
it('checks if user can restore to default the language selection and application will be in "English (USA)', function() { it('checks if user can restore to default the language selection and application will be in "English (USA)', function() {
cy.changePreferencesTab('@userPreferencesGeneralTab'); cy.selectPreferencesTab('@userPreferencesGeneralTab');
cy.get('@userPreferencesGeneralTab').should('have.class', 'active');
// Language dropdown should be displayed // Language dropdown should be displayed
cy.get('#language-select').should('be.visible'); cy.get('#language-select').should('be.visible');
@ -278,12 +321,14 @@ describe('OHIF User Preferences', () => {
cy.openPreferences(); cy.openPreferences();
// Go to general tab // Go to general tab
cy.changePreferencesTab('@userPreferencesGeneralTab'); cy.selectPreferencesTab('@userPreferencesGeneralTab');
// click on restore button
cy.get('@restoreBtn') cy.get('@restoreBtn')
.scrollIntoView() .scrollIntoView()
.click(); .click();
// click on save button
cy.get('@saveBtn') cy.get('@saveBtn')
.scrollIntoView() .scrollIntoView()
.click(); .click();
@ -303,15 +348,11 @@ describe('OHIF User Preferences', () => {
cy.get('[data-cy="dd-item-menu"]') cy.get('[data-cy="dd-item-menu"]')
.last() .last()
.should('contain.text', 'Preferences'); .should('contain.text', 'Preferences');
// Close Options menu
cy.get('[data-cy="options-menu"]').click();
}); });
it('checks new hotkeys for "Rotate Right" and "Rotate Left"', function() { it('checks new hotkeys for "Rotate Right" and "Rotate Left"', function() {
// Go go hotkeys tab // Go go hotkeys tab
cy.changePreferencesTab('@userPreferencesHotkeysTab'); cy.selectPreferencesTab('@userPreferencesHotkeysTab');
cy.get('@userPreferencesHotkeysTab').should('have.class', 'active');
// Set new hotkey for 'Rotate Right' function // Set new hotkey for 'Rotate Right' function
cy.setNewHotkeyShortcutOnUserPreferencesModal( cy.setNewHotkeyShortcutOnUserPreferencesModal(
@ -324,10 +365,16 @@ describe('OHIF User Preferences', () => {
'{shift}{leftarrow}' '{shift}{leftarrow}'
); );
//Save new hotkeys // Close Success Message overlay (if displayed)
cy.get('@saveBtn') cy.get('body').then(body => {
.scrollIntoView() if (body.find('.sb-closeIcon').length > 0) {
.click(); cy.get('.sb-closeIcon').click({ force: true });
}
// click on save button
cy.get('@saveBtn')
.scrollIntoView()
.click();
});
//Rotate Right with new Hotkey //Rotate Right with new Hotkey
cy.get('body').type('{shift}{rightarrow}'); cy.get('body').type('{shift}{rightarrow}');
@ -340,8 +387,8 @@ describe('OHIF User Preferences', () => {
it('checks new hotkeys for "Next" and "Previous" Image on Viewport', function() { it('checks new hotkeys for "Next" and "Previous" Image on Viewport', function() {
// Update hotkeys for 'Next/Previous Viewport' // Update hotkeys for 'Next/Previous Viewport'
cy.changePreferencesTab('@userPreferencesHotkeysTab'); cy.selectPreferencesTab('@userPreferencesHotkeysTab');
cy.get('@userPreferencesHotkeysTab').should('have.class', 'active');
cy.setNewHotkeyShortcutOnUserPreferencesModal( cy.setNewHotkeyShortcutOnUserPreferencesModal(
'Next Viewport', 'Next Viewport',
'{shift}{rightarrow}' '{shift}{rightarrow}'
@ -350,9 +397,16 @@ describe('OHIF User Preferences', () => {
'Previous Viewport', 'Previous Viewport',
'{shift}{leftarrow}' '{shift}{leftarrow}'
); );
cy.get('@saveBtn') // Close Success Message overlay (if displayed)
.scrollIntoView() cy.get('body').then(body => {
.click(); if (body.find('.sb-closeIcon').length > 0) {
cy.get('.sb-closeIcon').click({ force: true });
}
// click on save button
cy.get('@saveBtn')
.scrollIntoView()
.click();
});
// Set 3 viewports layout // Set 3 viewports layout
cy.setLayout(3, 1); cy.setLayout(3, 1);
@ -391,7 +445,7 @@ describe('OHIF User Preferences', () => {
it('checks error message when duplicated hotkeys are inserted', function() { it('checks error message when duplicated hotkeys are inserted', function() {
// Go go hotkeys tab // Go go hotkeys tab
cy.changePreferencesTab('@userPreferencesHotkeysTab'); cy.selectPreferencesTab('@userPreferencesHotkeysTab');
// Set duplicated hotkey for 'Rotate Right' function // Set duplicated hotkey for 'Rotate Right' function
cy.setNewHotkeyShortcutOnUserPreferencesModal('Rotate Right', '{i}'); cy.setNewHotkeyShortcutOnUserPreferencesModal('Rotate Right', '{i}');
@ -404,15 +458,11 @@ describe('OHIF User Preferences', () => {
.as('errorMsg') .as('errorMsg')
.should('have.text', '"Invert" is already using the "i" shortcut.'); .should('have.text', '"Invert" is already using the "i" shortcut.');
}); });
//Cancel hotkeys
cy.get('@cancelBtn')
.scrollIntoView()
.click();
}); });
it('checks error message when invalid hotkey is inserted', function() { it('checks error message when invalid hotkey is inserted', function() {
// Go go hotkeys tab // Go go hotkeys tab
cy.changePreferencesTab('@userPreferencesHotkeysTab'); cy.selectPreferencesTab('@userPreferencesHotkeysTab');
// Set invalid hotkey for 'Rotate Right' function // Set invalid hotkey for 'Rotate Right' function
cy.setNewHotkeyShortcutOnUserPreferencesModal('Rotate Right', '{ctrl}Z'); cy.setNewHotkeyShortcutOnUserPreferencesModal('Rotate Right', '{ctrl}Z');
@ -425,16 +475,11 @@ describe('OHIF User Preferences', () => {
.as('errorMsg') .as('errorMsg')
.should('have.text', '"ctrl+z" shortcut combination is not allowed'); .should('have.text', '"ctrl+z" shortcut combination is not allowed');
}); });
//Cancel hotkeys
cy.get('@cancelBtn')
.scrollIntoView()
.click();
}); });
it('checks error message when only modifier keys are inserted', function() { it('checks error message when only modifier keys are inserted', function() {
// Go go hotkeys tab // Go go hotkeys tab
cy.changePreferencesTab('@userPreferencesHotkeysTab'); cy.selectPreferencesTab('@userPreferencesHotkeysTab');
// Set invalid modifier key: ctrl // Set invalid modifier key: ctrl
cy.setNewHotkeyShortcutOnUserPreferencesModal('Zoom Out', '{ctrl}'); cy.setNewHotkeyShortcutOnUserPreferencesModal('Zoom Out', '{ctrl}');
@ -465,16 +510,11 @@ describe('OHIF User Preferences', () => {
'have.text', 'have.text',
"It's not possible to define only modifier keys (ctrl, alt and shift) as a shortcut" "It's not possible to define only modifier keys (ctrl, alt and shift) as a shortcut"
); );
//Cancel hotkeys
cy.get('@cancelBtn')
.scrollIntoView()
.click();
}); });
it('checks if user can cancel changes made on User Preferences Hotkeys tab', function() { it('checks if user can cancel changes made on User Preferences Hotkeys tab', function() {
// Go go hotkeys tab // Go go hotkeys tab
cy.changePreferencesTab('@userPreferencesHotkeysTab'); cy.selectPreferencesTab('@userPreferencesHotkeysTab');
// Set new hotkey for 'Rotate Right' function // Set new hotkey for 'Rotate Right' function
cy.setNewHotkeyShortcutOnUserPreferencesModal( cy.setNewHotkeyShortcutOnUserPreferencesModal(
@ -482,10 +522,16 @@ describe('OHIF User Preferences', () => {
'{ctrl}{shift}S' '{ctrl}{shift}S'
); );
//Cancel hotkeys // Close Success Message overlay (if displayed)
cy.get('@cancelBtn') cy.get('body').then(body => {
.scrollIntoView() if (body.find('.sb-closeIcon').length > 0) {
.click(); cy.get('.sb-closeIcon').click({ force: true });
}
//Cancel hotkeys
cy.get('@cancelBtn')
.scrollIntoView()
.click();
});
// Open User Preferences modal again // Open User Preferences modal again
cy.openPreferences(); cy.openPreferences();
@ -497,12 +543,11 @@ describe('OHIF User Preferences', () => {
.find('input') .find('input')
.should('have.value', 'r'); .should('have.value', 'r');
}); });
cy.get('[data-cy="close-button"]').click();
}); });
it('checks if user can reset to default values on User Preferences Hotkeys tab', function() { it('checks if user can reset to default values on User Preferences Hotkeys tab', function() {
// Go go hotkeys tab // Go go hotkeys tab
cy.changePreferencesTab('@userPreferencesHotkeysTab'); cy.selectPreferencesTab('@userPreferencesHotkeysTab');
// Set new hotkey for 'Rotate Right' function // Set new hotkey for 'Rotate Right' function
cy.setNewHotkeyShortcutOnUserPreferencesModal( cy.setNewHotkeyShortcutOnUserPreferencesModal(
@ -510,7 +555,7 @@ describe('OHIF User Preferences', () => {
'{ctrl}{shift}S' '{ctrl}{shift}S'
); );
//Save hotkeys // click on save button
cy.get('@saveBtn') cy.get('@saveBtn')
.scrollIntoView() .scrollIntoView()
.click(); .click();
@ -523,9 +568,6 @@ describe('OHIF User Preferences', () => {
.scrollIntoView() .scrollIntoView()
.click(); .click();
// Open User Preferences modal again
cy.openPreferences();
//Check that hotkey for 'Rotate Right' function was not changed //Check that hotkey for 'Rotate Right' function was not changed
cy.get('.HotkeysPreferences').within(() => { cy.get('.HotkeysPreferences').within(() => {
cy.contains('Rotate Right') // label we're looking for cy.contains('Rotate Right') // label we're looking for
@ -533,7 +575,183 @@ describe('OHIF User Preferences', () => {
.find('input') .find('input')
.should('have.value', 'r'); .should('have.value', 'r');
}); });
});
});
context('W/L Preset Preferences', function() {
before(() => {
cy.checkStudyRouteInViewer(
'1.2.840.113619.2.5.1762583153.215519.978957063.78'
);
cy.expectMinimumThumbnails(5);
});
beforeEach(() => {
cy.initCommonElementsAliases();
// Open User Preferences modal
cy.openPreferences();
// Navigate to Window Level tab
cy.selectPreferencesTab('@userPreferencesWindowLevelTab');
});
it('checks if W/L Preferences table is being displayed in the Window Level tab', function() {
//Check table header
cy.get('.wlRow.header')
.should('contains.text', 'Preset')
.and('contains.text', 'Description')
.and('contains.text', 'Window')
.and('contains.text', 'Level');
//Check table has more than 1 row (more than header)
cy.get('.wlRow')
.its('length')
.should('be.greaterThan', 1);
});
// //TODO: Test blocked by issue #1551: https://github.com/OHIF/Viewers/issues/1551
// it('checks if user can add a new W/L preset', function() {
// let description = ':nth-child(8) > .description > .preferencesInput';
// let window = ':nth-child(8) > .window > .preferencesInput';
// let level = ':nth-child(8) > .level > .preferencesInput';
// let new_window_value = 150;
// let new_level_value = -600;
// // Check existing preset values
// cy.get(description).should('have.value', '');
// cy.get(window).should('have.value', '');
// cy.get(level).should('have.value', '');
// // Set new preset value
// cy.setWindowLevelPreset(
// 7,
// 'New Description',
// new_window_value,
// new_level_value
// );
// cy.get('@saveBtn').click();
// // Open User Preferences modal
// cy.openPreferences();
// // Navigate to Window Level tab
// cy.selectPreferencesTab('@userPreferencesWindowLevelTab');
// // Check recently added preset values
// cy.get(description).should('have.value', 'New Description');
// cy.get(window).should('have.value', new_window_value);
// cy.get(level).should('have.value', new_level_value);
// // Close User Preferences modal
// cy.get('[data-cy="close-button"]').click();
// // Check if new hotkey preset is working on viewport
// cy.get('body').type('8');
// cy.get('@viewportInfoBottomRight').should(
// 'contains.text',
// 'W: ' + new_window_value + ' L: ' + new_level_value
// );
// });
it('checks if user can remove an existing W/L preset', function() {
let description = ':nth-child(3) > .description > .preferencesInput';
let window = ':nth-child(3) > .window > .preferencesInput';
let level = ':nth-child(3) > .level > .preferencesInput';
// Check existing preset values
cy.get(description)
.should('not.have.value', '')
.clear();
cy.get(window)
.should('not.have.value', '')
.clear();
cy.get(level)
.should('not.have.value', '')
.clear();
// Save changes
cy.get('@saveBtn').click();
// Open User Preferences modal
cy.openPreferences();
// Navigate to Window Level tab
cy.selectPreferencesTab('@userPreferencesWindowLevelTab');
// Check recently added preset values
cy.get(description).should('have.value', '');
cy.get(window).should('have.value', '');
cy.get(level).should('have.value', '');
// Close User Preferences modal
cy.get('[data-cy="close-button"]').click(); cy.get('[data-cy="close-button"]').click();
}); });
// //TODO: Test blocked by issue #1551: https://github.com/OHIF/Viewers/issues/1551
// it('checks if user can edit an existing W/L preset', function() {
// let description = ':nth-child(2) > .description > .preferencesInput';
// let window = ':nth-child(2) > .window > .preferencesInput';
// let level = ':nth-child(2) > .level > .preferencesInput';
// // Check existing preset values
// cy.get(description).should('have.value', 'Soft tissue');
// cy.get(window).should('have.value', '550');
// cy.get(level).should('have.value', '40');
// // Set new preset value
// cy.setWindowLevelPreset(1, 'Soft tissue New Description', 1220, 333);
// cy.get('@saveBtn').click();
// // Open User Preferences modal
// cy.openPreferences();
// // Navigate to Window Level tab
// cy.selectPreferencesTab('@userPreferencesWindowLevelTab');
// // Check recently added preset values
// cy.get(description).should('have.value', 'Soft tissue New Description');
// cy.get(window).should('have.value', '1220');
// cy.get(level).should('have.value', '333');
// });
it('checks if user can change the W/L by triggering different hotkeys with W/L presets', function() {
// Close User Preferences modal
cy.get('[data-cy="close-button"]').click();
// Check if hotkey preset is working on viewport
cy.get('body').type('3');
cy.get('@viewportInfoBottomRight').should(
'contains.text',
'W: 150 L: 90'
);
// Check if hotkey preset is working on viewport
cy.get('body').type('4');
cy.get('@viewportInfoBottomRight').should(
'contains.text',
'W: 2500 L: 480'
);
});
it('checks if user can change the W/L by triggering different hotkeys with W/L presets on multiple viewports', function() {
// Close User Preferences modal
cy.get('[data-cy="close-button"]').click();
// Set 3 viewports layout
cy.setLayout(3, 1);
cy.waitViewportImageLoading();
// Check if hotkey preset is working on viewport
cy.get('body').type('3');
cy.get('@viewportInfoBottomRight').should(
'contains.text',
'W: 150 L: 90'
);
// Overlay information from 2nd viewport
let second_viewport_overlay =
'div:nth-child(2) > div > div.viewport-element > div.ViewportOverlay > div.bottom-right.overlay-element > div';
// Shift active viewport to Viewport #2
cy.get('body').type('{rightarrow}');
// Check if hotkey preset is working on viewport #2
cy.get('body').type('4');
cy.get(second_viewport_overlay).should('contains.text', 'W: 2500 L: 480');
// Set 1 viewport layout
cy.setLayout(1, 1);
});
}); });
}); });

2
platform/viewer/cypress/integration/visual-regression/PercyCheckOHIFExtensionPDF.spec.js
View File

@ -4,7 +4,7 @@ describe('Visual Regression - OHIF PDF Extension', () => {
'1.2.826.0.13854362241694438965858641723883466450351448' '1.2.826.0.13854362241694438965858641723883466450351448'
); );
cy.expectMinimumThumbnails(5); cy.expectMinimumThumbnails(5);
});v });
it('drags and drop a PDF thumbnail into viewport', () => { it('drags and drop a PDF thumbnail into viewport', () => {
cy.get('[data-cy="thumbnail-list"]') cy.get('[data-cy="thumbnail-list"]')

31
platform/viewer/cypress/integration/visual-regression/PercyCheckOHIFUserPreferences.spec.js
View File

@ -7,10 +7,11 @@ describe('Visual Regression - OHIF User Preferences', () => {
beforeEach(() => { beforeEach(() => {
// Open User Preferences modal // Open User Preferences modal
cy.openPreferences(); cy.openPreferences();
cy.initPreferencesModalAliases();
}); });
it('checks displayed information on User Preferences modal', function() { it('checks displayed information on User Preferences modal', function() {
// Go go hotkeys tab
cy.selectPreferencesTab('@userPreferencesHotkeysTab');
cy.get('@restoreBtn').scrollIntoView(); cy.get('@restoreBtn').scrollIntoView();
// Visual comparison // Visual comparison
@ -21,8 +22,7 @@ describe('Visual Regression - OHIF User Preferences', () => {
}); });
it('checks translation by selecting Spanish language', function() { it('checks translation by selecting Spanish language', function() {
cy.changePreferencesTab('@userPreferencesGeneralTab'); cy.selectPreferencesTab('@userPreferencesGeneralTab');
cy.get('@userPreferencesGeneralTab').should('have.class', 'active');
// Language dropdown should be displayed // Language dropdown should be displayed
cy.get('#language-select').should('be.visible'); cy.get('#language-select').should('be.visible');
@ -59,12 +59,14 @@ describe('Visual Regression - OHIF User Preferences', () => {
cy.initCommonElementsAliases(); cy.initCommonElementsAliases();
cy.resetViewport(); cy.resetViewport();
cy.resetUserHoktkeyPreferences(); cy.resetUserHotkeyPreferences();
// Open User Preferences modal // Open User Preferences modal
cy.openPreferences(); cy.openPreferences();
}); });
it('checks displayed information on User Preferences modal', function() { it('checks displayed information on User Preferences modal', function() {
// Go go hotkeys tab
cy.selectPreferencesTab('@userPreferencesHotkeysTab');
cy.get('@restoreBtn').scrollIntoView(); cy.get('@restoreBtn').scrollIntoView();
// Visual comparison // Visual comparison
@ -74,9 +76,18 @@ describe('Visual Regression - OHIF User Preferences', () => {
cy.get('[data-cy="close-button"]').click(); //close User Preferences modal cy.get('[data-cy="close-button"]').click(); //close User Preferences modal
}); });
it('checks if W/L Preferences table is being displayed in the Window Level tab', function() {
//Navigate to Window Level tab
cy.selectPreferencesTab('@userPreferencesWindowLevelTab');
// Visual comparison
cy.percyCanvasSnapshot(
'User Preferences Modal - Window Level Presets Tab'
);
});
it('checks translation by selecting Spanish language', function() { it('checks translation by selecting Spanish language', function() {
cy.changePreferencesTab('@userPreferencesGeneralTab'); cy.selectPreferencesTab('@userPreferencesGeneralTab');
cy.get('@userPreferencesGeneralTab').should('have.class', 'active');
// Visual comparison // Visual comparison
cy.percyCanvasSnapshot( cy.percyCanvasSnapshot(
@ -100,8 +111,7 @@ describe('Visual Regression - OHIF User Preferences', () => {
}); });
it('checks if user can restore to default the language selection and application will be in English', function() { it('checks if user can restore to default the language selection and application will be in English', function() {
cy.changePreferencesTab('@userPreferencesGeneralTab'); cy.selectPreferencesTab('@userPreferencesGeneralTab');
cy.get('@userPreferencesGeneralTab').should('have.class', 'active');
// Set language to Spanish // Set language to Spanish
cy.setLanguage('Spanish'); cy.setLanguage('Spanish');
@ -110,7 +120,7 @@ describe('Visual Regression - OHIF User Preferences', () => {
cy.openPreferences(); cy.openPreferences();
// Go to general tab // Go to general tab
cy.changePreferencesTab('@userPreferencesGeneralTab'); cy.selectPreferencesTab('@userPreferencesGeneralTab');
cy.get('@restoreBtn') cy.get('@restoreBtn')
.scrollIntoView() .scrollIntoView()
@ -136,8 +146,7 @@ describe('Visual Regression - OHIF User Preferences', () => {
it('checks new hotkeys for "Next" and "Previous" Image on Viewport', function() { it('checks new hotkeys for "Next" and "Previous" Image on Viewport', function() {
// Go go hotkeys tab // Go go hotkeys tab
cy.changePreferencesTab('@userPreferencesHotkeysTab'); cy.selectPreferencesTab('@userPreferencesHotkeysTab');
cy.get('@userPreferencesHotkeysTab').should('have.class', 'active');
// Set new hotkey for 'Next Image Viewport' function // Set new hotkey for 'Next Image Viewport' function
cy.setNewHotkeyShortcutOnUserPreferencesModal( cy.setNewHotkeyShortcutOnUserPreferencesModal(

1
platform/viewer/cypress/support/aliases.js
View File

@ -84,6 +84,7 @@ export function initPreferencesModalAliases() {
cy.get('.OHIFModal').as('preferencesModal'); cy.get('.OHIFModal').as('preferencesModal');
cy.get('[data-cy="hotkeys"]').as('userPreferencesHotkeysTab'); cy.get('[data-cy="hotkeys"]').as('userPreferencesHotkeysTab');
cy.get('[data-cy="general"]').as('userPreferencesGeneralTab'); cy.get('[data-cy="general"]').as('userPreferencesGeneralTab');
cy.get('[data-cy="window-level"]').as('userPreferencesWindowLevelTab');
initPreferencesModalFooterBtnAliases(); initPreferencesModalFooterBtnAliases();
} }

106
platform/viewer/cypress/support/commands.js
View File

@ -121,7 +121,7 @@ Cypress.Commands.add('waitVTKReformatting', () => {
Cypress.Commands.add('waitViewportImageLoading', () => { Cypress.Commands.add('waitViewportImageLoading', () => {
// Wait for finish loading // Wait for finish loading
cy.get('[data-cy="viewprt-grid"]', { timeout: 20000 }).should($grid => { cy.get('[data-cy="viewprt-grid"]', { timeout: 30000 }).should($grid => {
expect($grid).not.to.contain.text('Load'); expect($grid).not.to.contain.text('Load');
}); });
}); });
@ -466,21 +466,54 @@ Cypress.Commands.add('openPreferences', () => {
}); });
}); });
Cypress.Commands.add('changePreferencesTab', tabAlias => { Cypress.Commands.add('selectPreferencesTab', tabAlias => {
cy.initPreferencesModalAliases(); cy.initPreferencesModalAliases();
cy.get(tabAlias).click(); cy.get(tabAlias)
.click()
.should('have.class', 'active');
initPreferencesModalFooterBtnAliases(); initPreferencesModalFooterBtnAliases();
}); });
Cypress.Commands.add('resetUserHoktkeyPreferences', () => { Cypress.Commands.add('resetUserHotkeyPreferences', () => {
// Open User Preferences modal // Open User Preferences modal
cy.openPreferences(); cy.openPreferences();
cy.initPreferencesModalAliases(); cy.selectPreferencesTab('@userPreferencesHotkeysTab').then(() => {
cy.log('Reset Hotkeys to Default Preferences');
cy.get('@restoreBtn').click();
});
cy.log('Reset to Default Preferences'); // Close Success Message overlay (if displayed)
cy.get('@restoreBtn').click(); cy.get('body').then(body => {
cy.get('@saveBtn').click(); if (body.find('.sb-closeIcon').length > 0) {
cy.get('.sb-closeIcon')
.first()
.click({ force: true });
}
// Click on Save Button
cy.get('@saveBtn').click();
});
});
Cypress.Commands.add('resetUserGeneralPreferences', () => {
// Open User Preferences modal
cy.openPreferences();
cy.selectPreferencesTab('@userPreferencesGeneralTab').then(() => {
cy.log('Reset Language to Default Preferences');
cy.get('@restoreBtn').click();
});
// Close Success Message overlay (if displayed)
cy.get('body').then(body => {
if (body.find('.sb-closeIcon').length > 0) {
cy.get('.sb-closeIcon')
.first()
.click({ force: true });
}
// Click on Save Button
cy.get('@saveBtn').click();
});
}); });
Cypress.Commands.add( Cypress.Commands.add(
@ -499,6 +532,37 @@ Cypress.Commands.add(
} }
); );
Cypress.Commands.add(
'setWindowLevelPreset',
(preset_index, description_value, window_value, level_value) => {
let index = parseInt(preset_index) + 1;
// Set new Description value
cy.get(':nth-child(' + index + ') > .description > .preferencesInput')
.clear()
.type(description_value, {
force: true,
})
.blur();
// Set new Window value
cy.get(':nth-child(' + index + ') > .window > .preferencesInput')
.clear()
.type(window_value, {
force: true,
})
.blur();
// Set new Level value
cy.get(':nth-child(' + index + ') > .level > .preferencesInput')
.clear()
.type(level_value, {
force: true,
})
.blur();
}
);
Cypress.Commands.add('openDownloadImageModal', () => { Cypress.Commands.add('openDownloadImageModal', () => {
// Click on More button // Click on More button
cy.get('[data-cy="more"]') cy.get('[data-cy="more"]')
@ -513,12 +577,8 @@ Cypress.Commands.add('openDownloadImageModal', () => {
Cypress.Commands.add('setLanguage', (language, save = true) => { Cypress.Commands.add('setLanguage', (language, save = true) => {
cy.openPreferences(); cy.openPreferences();
cy.initPreferencesModalAliases();
cy.get('@userPreferencesGeneralTab') cy.selectPreferencesTab('@userPreferencesGeneralTab');
.click()
.should('have.class', 'active');
initPreferencesModalFooterBtnAliases();
// Language dropdown should be displayed // Language dropdown should be displayed
cy.get('#language-select').should('be.visible'); cy.get('#language-select').should('be.visible');
@ -526,8 +586,18 @@ Cypress.Commands.add('setLanguage', (language, save = true) => {
// Select Language and Save/Cancel // Select Language and Save/Cancel
cy.get('#language-select').select(language); cy.get('#language-select').select(language);
const toClick = save ? '@saveBtn' : '@cancelBtn'; // Close Success Message overlay (if displayed)
cy.get(toClick) cy.get('body').then(body => {
.scrollIntoView() if (body.find('.sb-closeIcon').length > 0) {
.click(); cy.get('.sb-closeIcon')
.first()
.click({ force: true });
}
//Click on Save/Cancel button
const toClick = save ? '@saveBtn' : '@cancelBtn';
cy.get(toClick)
.scrollIntoView()
.click();
});
}); });