@open-xchange/appsuite-codeceptjs 0.6.17 → 0.6.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-xchange/appsuite-codeceptjs",
-  "version": "0.6.17",
+  "version": "0.6.18",
   "description": "OX App Suite CodeceptJS Configuration and Helpers",
   "main": "index.js",
   "bin": {
@@ -33,8 +33,8 @@
     "p-retry": "^7.1.1",
     "playwright-core": "1.58.2",
     "short-uuid": "^6.0.3",
-    "@open-xchange/codecept-horizontal-scaler": "0.1.14",
-    "@open-xchange/soap-client": "0.0.10"
+    "@open-xchange/soap-client": "0.0.10",
+    "@open-xchange/codecept-horizontal-scaler": "0.1.14"
   },
   "devDependencies": {
     "@types/node": "^24.10.3",

package/src/actor.js

@@ -32,9 +32,16 @@ module.exports = function (customSteps) {
       this.amOnPage(baseURL)
     },
 
-    openApp (appName) {
+    waitForApp () {
+      this.waitForInvisible('#background-loader.busy', 30)
+      this.waitForVisible({ css: 'html.complete' }, 10)
+    },
+
+    openApp (appName, options) {
       this.click('~Navigate to:')
       this.click(appName, '.apps')
+      options = { wait: true, ...options }
+      if (options.wait) this.waitForApp()
     },
 
     /**
@@ -62,36 +69,33 @@ module.exports = function (customSteps) {
      * After successful login, the page will be navigated to the specified URL with the URL parameters.
      * If the 'isDeepLink' option is true, the URL will be constructed with a '#' prefix.
      * The login process also includes waiting for the page to load and checking for the presence of the app.
-     * @param {string[]|object} urlParams - The URL parameters as an array or object.
+     * @param {string[]|string} urlParams - The URL parameters as an array or string.
      * @param {object} options - The login options.
-     * @returns {Promise<void>} - A promise that resolves when the login process is complete.
      */
-    async login (urlParams, options) {
+    login (urlParams, options) {
       if (urlParams && !urlParams.length) {
         // looks like an object, not string or array
         options = urlParams
-        urlParams = []
+        urlParams = undefined
       }
+      options = { wait: true, ...options }
       urlParams = [].concat(urlParams || [])
-      options = Object.assign({ wait: true }, options)
+      if (!options.isDeepLink) urlParams.unshift('!!')
       let user = util.resolveUser(options.user)
       if (user.toJSON) user = user.toJSON()
       const loginName = process.env.PROVISIONING_API === 'reseller' ? user.name : `${user.name}${user.context.id ? '@' + user.context.id : ''}`
-      await this.makeApiRequest('POST', `${baseURL}/api/login`, {
+      this.makeApiRequest('POST', `${baseURL}/api/login`, {
         params: { action: 'login', client: 'open-xchange-appsuite' },
-        form: {
-          name: loginName,
-          password: user.password
-        }
+        form: { name: loginName, password: user.password }
       })
       this.wait(0.5)
-      this.amOnPage(`${baseURL}/` + (options.isDeepLink ? '#' : '#!!') + (urlParams.length === 0 ? '' : '&' + urlParams.join('&')))
+      this.amOnPage(`${baseURL}/#${urlParams.join('&')}`)
       this.waitForInvisible('#background-loader.busy', util.getLoginTimeout())
-      if (options.wait) await this.waitForApp()
+      if (options.wait) this.waitForVisible({ css: 'html.complete' }, 10)
     },
 
-    async logout () {
-      await this.makeApiRequest('POST', `${baseURL}/api/login`, { params: { action: 'logout' } })
+    logout () {
+      this.makeApiRequest('POST', `${baseURL}/api/login`, { params: { action: 'logout' } })
       this.amOnPage('about:blank')
     },
 
@@ -105,10 +109,9 @@ module.exports = function (customSteps) {
      *
      * @param {string} locator - The locator of the element. Only accepts css selectors.
      */
-    async waitForFocus (locator) {
-      this.waitForElement(locator)
+    waitForFocus (locator) {
       this.waitForVisible(locator)
-      return this.usePlaywrightTo('wait for focus', async ({ page }) => {
+      this.usePlaywrightTo('wait for focus', async ({ page }) => {
         await expect(page.locator(locator)).toBeFocused()
         this.wait(0.5)
       })
@@ -131,7 +134,7 @@ module.exports = function (customSteps) {
     clickDropdown (text) {
       this.waitForVisible('.dropdown.open .dropdown-menu, .primary-action > .open .dropdown-menu')
       this.waitForText(text, 10, '.dropdown.open .dropdown-menu, .primary-action > .open .dropdown-menu')
-      return this.click(text, '.dropdown.open .dropdown-menu, .primary-action > .open .dropdown-menu')
+      this.click(text, '.dropdown.open .dropdown-menu, .primary-action > .open .dropdown-menu')
     },
 
     clickToolbar (selector, timeout = 5) {

package/src/helper.js

@@ -919,13 +919,6 @@ class AppSuiteHelper extends Helper {
     )
   }
 
-  async waitForApp () {
-    const { Playwright } = this.helpers
-
-    await Playwright.waitForInvisible('#background-loader.busy', 30)
-    await Playwright.waitForVisible({ css: 'html.complete' }, 10)
-  }
-
   async copyToClipboard () {
     const helper = this.helpers.Playwright
     const { page } = helper