@open-xchange/appsuite-codeceptjs 0.4.2 → 0.4.4

package/README.md

@@ -1,7 +1,3 @@
 # Open-Xchange App Suite: CodeceptJS
 
-This module contains appsuite specific configuration, helpers, page objects and actors for Open-Xchange App Suite.
-
-## Configuration
-
 TBD

package/index.js

@@ -124,7 +124,10 @@ module.exports = {
     async teardown () {
       const { contexts } = global.inject()
       // we need to run this sequentially, less stress on the MW
-      for (const ctx of contexts.filter(ctx => /e2e-context-/.test(String(ctx.loginMappings)))) {
+      const filterFunction = process.env.PROVISIONING_API === 'reseller' ?
+        ctx => ctx.name.includes('e2e_context') :
+        ctx => /e2e-context-/.test(String(ctx.loginMappings))
+      for (const ctx of contexts.filter(filterFunction)) {
         await ctx.remove().catch(e => console.error(e.message))
       }
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-xchange/appsuite-codeceptjs",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "OX App Suite CodeceptJS Configuration and Helpers",
   "main": "index.js",
   "bin": {
@@ -13,14 +13,14 @@
     "@axe-core/playwright": "^4.9.1",
     "@codeceptjs/helper": "^2.0.4",
     "@influxdata/influxdb-client": "^1.33.2",
-    "@open-xchange/codecept-horizontal-scaler": "^0.1.7",
-    "@playwright/test": "1.45.2",
+    "@open-xchange/codecept-horizontal-scaler": "^0.1.11",
+    "@playwright/test": "1.46.1",
     "allure-codeceptjs": "^2.15.1",
     "chai": "^5.1.1",
     "chai-subset": "^1.6.0",
     "chalk": "^4.1.0",
     "chalk-table": "^1.0.2",
-    "codeceptjs": "3.6.4",
+    "codeceptjs": "3.6.5",
     "dotenv": "^16.4.5",
     "mocha": "^10.4.0",
     "mocha-junit-reporter": "^2.2.1",
@@ -28,12 +28,12 @@
     "moment": "^2.30.1",
     "moment-timezone": "^0.5.45",
     "p-retry": "^6.2.0",
-    "playwright-core": "1.45.2",
+    "playwright-core": "1.46.1",
     "short-uuid": "^5.2.0",
     "soap": "^1.0.3"
   },
   "devDependencies": {
-    "@types/node": "^20.14.2",
+    "@types/node": "^22.4.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.5"
   }

package/src/contexts/reseller.js

@@ -159,13 +159,14 @@ class ResellerContext {
   }
 
   static async create (ctx = {}, adminUser = {}, auth = util.admin(), numberOfUsers = Number(process.env.PROVISIONING_USERS || 10)) {
-    ctx = Object.assign({ id: util.userContextId(), maxQuota: -1 }, ctx)
+    const randomId = crypto.randomUUID()
+    ctx = Object.assign({ maxQuota: -1 }, ctx)
     adminUser = Object.assign({
-      name: `${ctx.name || ctx.id}_admin`
+      name: `${ctx.name || randomId}_admin`
     }, this.defaultAdmin(), adminUser)
     let data; let neededPrefix = ctx._auto_prefix
     delete ctx._auto_prefix
-    ctx.name = (process.env.CONTEXT_PREFIX || '') + (ctx.name || `${ctx.id}`)
+    ctx.name = (process.env.CONTEXT_PREFIX || '') + (ctx.name || `e2e_context_${randomId}`)
     event.emit(event.provisioning.context.create, ctx, adminUser, auth)
     try {
       data = await resellerContextService.create({
@@ -211,11 +212,6 @@ class ResellerContext {
     return remoteCtx
   }
 
-  static async all () {
-    if (contexts.length === 0) await this.fetchContexts()
-    return created.concat(contexts)
-  }
-
   static async fetchContexts () {
     const list = await resellerContextService.listAll()
       .catch((err) => { throw new util.PropagatedError(err) })
@@ -226,7 +222,6 @@ class ResellerContext {
 
 // can't return the class directly, because codecept tries to execute functions
 module.exports = function () {
-  ResellerContext.fetchContexts()
   return new Proxy(created, {
     // act like an array if an index is being used
     get (target, prop) {

package/src/soap/services/util.js

@@ -20,7 +20,6 @@
 
 const { createClientAsync } = require('../soap.js')
 
-const OXUtilService = createClientAsync('OXUtilService').then(client => client)
 
 /**
  * This function retrieves the ID of the first filestorage.
@@ -29,6 +28,8 @@ const OXUtilService = createClientAsync('OXUtilService').then(client => client)
 let fileStoreId
 
 async function getFilestorageId () {
+const OXUtilService = createClientAsync('OXUtilService').then(client => client)
+
   if (fileStoreId) return fileStoreId
   fileStoreId = (await (await OXUtilService).listFilestoreAsync())[0]?.id
   return fileStoreId

package/src/soap/soap.js

@@ -87,7 +87,9 @@ function shouldAbortRetry (error) {
       /Shared Domain already in use/,
       /No such user/,
       /Mandatory fields in context not set/,
-      /A mapping with login info .* already exists/
+      /A mapping with login info .* already exists/,
+      /Id must not be set if pre-assembled context should be used/,
+      /Unmarshalling Error/
     ]
     const blockedExceptions = [
       'ContextExistsException',