diff --git a/packages/nuxeo-web-ui-ftest/features/step_definitions/search.js b/packages/nuxeo-web-ui-ftest/features/step_definitions/search.js index 3ebd75fe2e..a2ad950670 100644 --- a/packages/nuxeo-web-ui-ftest/features/step_definitions/search.js +++ b/packages/nuxeo-web-ui-ftest/features/step_definitions/search.js @@ -168,6 +168,7 @@ Then(/^I can see (\d+) search results$/, async function(numberOfResults) { Then(/^I can see more than (\d+) search results$/, async function(minNumberOfResults) { await driver.pause(1000); const results = await this.ui.results; + await driver.pause(2000); const displayMode = await results.displayMode; const output = await results.resultsCount(displayMode); if (output > minNumberOfResults) { diff --git a/packages/nuxeo-web-ui-ftest/features/step_definitions/ui.js b/packages/nuxeo-web-ui-ftest/features/step_definitions/ui.js index 3d0572cb9e..0b7c7bd589 100644 --- a/packages/nuxeo-web-ui-ftest/features/step_definitions/ui.js +++ b/packages/nuxeo-web-ui-ftest/features/step_definitions/ui.js @@ -4,8 +4,8 @@ import { Then, When } from '@cucumber/cucumber'; When('I click the {string} button', async function(button) { await driver.pause(1000); const drawer = await this.ui.drawer; - const buttonToclick = await drawer.open(button); - return buttonToclick; + const output = await drawer.open(button); + output.should.be.true; }); When('I select {string} from the View menu', async function(option) { @@ -31,4 +31,5 @@ Then('I click the blob download button', async function() { const page = await this.ui.browser.documentPage(this.doc.type); const button = await page.downloadButton; await button.click(); + await driver.pause(2000); }); diff --git a/packages/nuxeo-web-ui-ftest/pages/ui/drawer.js b/packages/nuxeo-web-ui-ftest/pages/ui/drawer.js index ba44254ed9..b7472190aa 100644 --- a/packages/nuxeo-web-ui-ftest/pages/ui/drawer.js +++ b/packages/nuxeo-web-ui-ftest/pages/ui/drawer.js @@ -68,16 +68,18 @@ export default class Drawer extends BasePage { } async open(name) { - const currentMenu = await this.menu; - await currentMenu.waitForVisible(); - const section = await this._section(name); - const isVisible = await section.isVisible(); - if (!isVisible) { - const menu = await this.menu; + const menu = await this.menu; + let isDrawerVisible = await this.isDrawerOpened(menu); + if (isDrawerVisible) { const buttonToclick = await menu.$(`nuxeo-menu-icon[name='${name}']`); await buttonToclick.click(); + isDrawerVisible = await this.isDrawerOpened(menu); } - return section; + return isDrawerVisible; + } + + async isDrawerOpened(menu) { + return Boolean(await menu.$(`paper-listbox[id='menu']`).getAttribute('aria-expanded')); } async _section(name) { diff --git a/packages/nuxeo-web-ui-ftest/wdio.conf.js b/packages/nuxeo-web-ui-ftest/wdio.conf.js index 269288e3e3..fbf09ee20a 100644 --- a/packages/nuxeo-web-ui-ftest/wdio.conf.js +++ b/packages/nuxeo-web-ui-ftest/wdio.conf.js @@ -27,7 +27,7 @@ const capability = { maxInstances: 1, browserName: process.env.BROWSER, acceptInsecureCerts: true, - browserVersion: '130.0.6723.116', + browserVersion: 'stable', }; const options = {}; @@ -35,7 +35,6 @@ const options = {}; switch (capability.browserName) { case 'chrome': options.args = ['--no-sandbox']; - options.w3c = false; if (process.env.HEADLESS) { options.args.push('--window-size=1920,1080');