From 5c92816d0322f895f472d15647298013f74f6792 Mon Sep 17 00:00:00 2001
From: fsdavid <daviti1@mail.com>
Date: Thu, 28 May 2020 14:45:03 +0200
Subject: [PATCH] show toltip for all mat menu template explore buttons
---
.../navigating/navigateFromRegion.prod.e2e-spec.js | 10 ++++------
e2e/src/util.js | 12 ++++++++++++
.../regionMenu/regionMenu.template.html | 2 +-
3 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/e2e/src/navigating/navigateFromRegion.prod.e2e-spec.js b/e2e/src/navigating/navigateFromRegion.prod.e2e-spec.js
index a20911022..480296e6e 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 134ca978f..af0fbe0fe 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 cd1e1acf5..3bfe35b1a 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>
--
GitLab