Merge branch '2024.11'

tine-groupware · Feb 10, 2025 · 7e27b64 · 7e27b64
2 parents d3d78d9 + ed8883c
commit 7e27b64
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/tests/e2etests/src/lib/browser.js b/tests/e2etests/src/lib/browser.js
@@ -63,16 +63,16 @@ const priorities = {
 
     getEditDialog: async function (btnText, win) {
         await expect(win || page).toMatchElement('.x-btn-text', {text: btnText, visible: true});
-        await page.waitForTimeout(500); // wait for btn to get active
+        await page.waitForTimeout(1000); // wait for btn to get active
         let popupWindow = this.getNewWindow();
         await expect(win || page).toClick('.x-btn-text', {text: btnText});
         popupWindow = await popupWindow;
         this.proxyConsole(popupWindow);
         try {
-            await popupWindow.waitForSelector('.ext-el-mask', {timeout: 5000});
+            await popupWindow.waitForSelector('.ext-el-mask', {timeout: 10000});
         } catch {}
         await popupWindow.waitForFunction(() => !document.querySelector('.ext-el-mask'));
-        await popupWindow.screenshot({path: 'screenshots/test.png'});
+        await popupWindow.waitForTimeout(2000);
         return popupWindow;
     },
 
@@ -263,7 +263,7 @@ const priorities = {
             })
             .on('requestfailed', request => {
                 const url = request.url();
-                    if(process.env.LOGLEVEL >= priorities['ERR'] && !url.match('sockjs-node')) {
+                    if(process.env.LOGLEVEL >= ['ERR'] && !url.match('sockjs-node')) {
                         simpleConsole.log(magenta(`${request.failure().errorText} ${url}`))
                     }
             })

diff --git a/tests/e2etests/src/test/HumanResources/employee.test.js b/tests/e2etests/src/test/HumanResources/employee.test.js
@@ -223,6 +223,7 @@ describe('employee', () => {
 
             describe('book sickness as vacation', () => {
                 test('can book sickness as vacation', async () => {
+                    await employeeEditDialog.waitForTimeout(2000);
                     await expectPuppeteer(employeeEditDialog).toClick('.tine-hr-freetimegrid-type-SICKNESS .x-grid3-cell-inner.x-grid3-col-type_status', {button: 'right'});
                     await employeeEditDialog.waitForTimeout(2000);
                     await expectPuppeteer(employeeEditDialog).toClick('.x-menu-item-text', {text: 'Als Urlaub buchen'});