diff --git a/bigbluebutton-html5/imports/ui/components/about/component.jsx b/bigbluebutton-html5/imports/ui/components/about/component.jsx index 03f576cc72..935344eeac 100644 --- a/bigbluebutton-html5/imports/ui/components/about/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/about/component.jsx @@ -55,6 +55,7 @@ const AboutComponent = ({ intl, settings }) => { return ( mountModal(), diff --git a/bigbluebutton-tests/playwright/core/elements.js b/bigbluebutton-tests/playwright/core/elements.js index 436ad580d3..b557b47a10 100644 --- a/bigbluebutton-tests/playwright/core/elements.js +++ b/bigbluebutton-tests/playwright/core/elements.js @@ -307,3 +307,7 @@ exports.pencil = 'button[data-test="pencilTool"]'; exports.showMoreSharedNotesButton = 'span[class="show-more-icon-btn"]' exports.exportSharedNotesButton = 'button[aria-label="Import/Export from/to different file formats"]'; exports.exportPlainButton = 'span[id="exportplain"]'; + +// About modal +exports.showAboutModalButton = 'li[data-test="aboutModal"]'; +exports.aboutModal = 'div[data-test="aboutModalTitleLabel"]'; \ No newline at end of file diff --git a/bigbluebutton-tests/playwright/settings/language.js b/bigbluebutton-tests/playwright/options/options.js similarity index 85% rename from bigbluebutton-tests/playwright/settings/language.js rename to bigbluebutton-tests/playwright/options/options.js index 5d11f17c58..49441ddbe7 100644 --- a/bigbluebutton-tests/playwright/settings/language.js +++ b/bigbluebutton-tests/playwright/options/options.js @@ -1,13 +1,19 @@ const Page = require('../core/page'); -const { openSettings, getLocaleValues } = require('./util'); +const { openAboutModal, openSettings, getLocaleValues } = require('./util'); const e = require('../core/elements'); -class Language extends Page { + +class Options extends Page { constructor(browser, page) { super(browser, page); } - async test() { + async openedAboutModal() { + await openAboutModal(this); + await this.hasElement(e.closeModal); + } + + async localesTest() { const selectedKeysBySelector = { [e.messageTitle]: 'app.userList.messagesTitle', [e.notesTitle]: 'app.userList.notesTitle', @@ -42,4 +48,4 @@ class Language extends Page { } } -exports.Language = Language; +exports.Options = Options; \ No newline at end of file diff --git a/bigbluebutton-tests/playwright/options/options.spec.js b/bigbluebutton-tests/playwright/options/options.spec.js new file mode 100644 index 0000000000..4c44c81ea5 --- /dev/null +++ b/bigbluebutton-tests/playwright/options/options.spec.js @@ -0,0 +1,20 @@ +const { test } = require('@playwright/test'); +const { Options } = require('./options'); + +test.describe.parallel('Options', () => { + test('Open about modal', async ({ browser, page }) => { + const about = new Options(browser, page); + await about.init(true, true); + await about.openedAboutModal(); + }); +}); + +test.describe.parallel('Settings', () => { + // https://docs.bigbluebutton.org/2.6/release-tests.html#application-settings + test(`Locales`, async ({ browser, page }) => { + test.slow(); + const language = new Options(browser, page); + await language.init(true, true); + await language.localesTest(); + }); +}); \ No newline at end of file diff --git a/bigbluebutton-tests/playwright/settings/util.js b/bigbluebutton-tests/playwright/options/util.js similarity index 86% rename from bigbluebutton-tests/playwright/settings/util.js rename to bigbluebutton-tests/playwright/options/util.js index 7075d96a84..af8193b23c 100644 --- a/bigbluebutton-tests/playwright/settings/util.js +++ b/bigbluebutton-tests/playwright/options/util.js @@ -29,5 +29,11 @@ async function getLocaleValues(elements, locale) { return currentValues; } +async function openAboutModal(test) { + await test.waitAndClick(e.optionsButton); + await test.waitAndClick(e.showAboutModalButton); +} + +exports.openAboutModal = openAboutModal; exports.openSettings = openSettings; exports.getLocaleValues = getLocaleValues; diff --git a/bigbluebutton-tests/playwright/settings/settings.spec.js b/bigbluebutton-tests/playwright/settings/settings.spec.js deleted file mode 100644 index dd93262ff9..0000000000 --- a/bigbluebutton-tests/playwright/settings/settings.spec.js +++ /dev/null @@ -1,12 +0,0 @@ -const { test } = require('@playwright/test'); -const { Language } = require('./language'); - -test.describe.parallel('Settings', () => { - // https://docs.bigbluebutton.org/2.6/release-tests.html#application-settings - test(`Locales`, async ({ browser, page }) => { - test.slow(); - const language = new Language(browser, page); - await language.init(true, true); - await language.test(); - }); -});