diff --git a/e2e/src/navigating/navigateFromRegion.prod.e2e-spec.js b/e2e/src/navigating/navigateFromRegion.prod.e2e-spec.js index a209110224379a747282d33cdd33b85b34ef3e8e..480296e6e91c7aa143ffeac170f5f42776eaa700 100644 --- a/e2e/src/navigating/navigateFromRegion.prod.e2e-spec.js +++ b/e2e/src/navigating/navigateFromRegion.prod.e2e-spec.js @@ -161,14 +161,12 @@ describe('> explore same region in different templates', () => { it('> Tooltip visible if overflowed', async () => { const data2 = TEST_DATA[1] await getBeforeEachFn(iavPage)(data2)() - - const {expectedRegion, expectedTemplateLabels, position, url, templateName} = data2 - + const {expectedTemplateLabels} = data2 const desiredTemplateButton = await expectedTemplateLabels.find(el => el.name.length > 30) - if (desiredTemplateButton) { - const test = await iavPage.getAttribute(`[aria-label="${SHOW_IN_OTHER_REF_SPACE}: ${desiredTemplateButton.name}${desiredTemplateButton.hemisphere ? (' - ' + desiredTemplateButton.hemisphere) : ''}"]`, 'matTooltip') - console.log(test) + await iavPage.cursorMoveToElement(`[aria-label="${SHOW_IN_OTHER_REF_SPACE}: ${desiredTemplateButton.name}${desiredTemplateButton.hemisphere ? (' - ' + desiredTemplateButton.hemisphere) : ''}"]`) + const tooltipText = await iavPage.getText('mat-tooltip-component') + expect(tooltipText.trim()).toContain(desiredTemplateButton.name) } }) }) diff --git a/e2e/src/util.js b/e2e/src/util.js index 134ca978f603c656f3b11210ea8984e2615d1219..af0fbe0fed51cbac3e77f13c6f05c3ad0d6ebfa0 100644 --- a/e2e/src/util.js +++ b/e2e/src/util.js @@ -184,6 +184,18 @@ class WdBase{ .perform() } + async cursorMoveToElement(cssSelector) { + if (!cssSelector) throw new Error(`cursorMoveToElement needs to define css selector`) + const el = await this._browser.findElement( By.css(cssSelector) ) + await this._driver.actions() + .move() + .move({ + origin: el, + duration: 1000 + }) + .perform() + } + async scrollElementBy(cssSelector, options) { const { delta } = options await this._browser.executeScript(() => { diff --git a/src/ui/parcellationRegion/regionMenu/regionMenu.template.html b/src/ui/parcellationRegion/regionMenu/regionMenu.template.html index cd1e1acf561b81fee9011752df360d43d9442c34..3bfe35b1a8e0771f7f0ccf6fd91d9badf9b5dd90 100644 --- a/src/ui/parcellationRegion/regionMenu/regionMenu.template.html +++ b/src/ui/parcellationRegion/regionMenu/regionMenu.template.html @@ -192,7 +192,7 @@ <mat-icon fontSet="fas" fontIcon="fa-none" mat-list-icon></mat-icon> <div class="cursorPointer" #exploreTemplateButton mat-line> <span #exploreTemplateName class="overflow-x-hidden text-truncate" - [matTooltip]="exploreTemplateButton.offsetWidth < exploreTemplateName.offsetWidth? sameRegion.template.name + ' ' + sameRegion.hemisphere : null"> + [matTooltip]="sameRegion.template.name + ' ' + sameRegion.hemisphere"> {{ sameRegion.template.name + ' ' + sameRegion.hemisphere }} </span> </div>