fixed REST tests

Author: DavertMik

lib/helper/ApiDataFactory.js

@@ -265,8 +265,8 @@ class ApiDataFactory extends Helper {
    * @param {*} [options] options for programmatically generate the attributes
    * @returns {Promise<*>}
    */
-  have(factory, params, options) {
-    const item = this._createItem(factory, params, options)
+  async have(factory, params, options) {
+    const item = await this._createItem(factory, params, options)
     this.debug(`Creating ${factory} ${JSON.stringify(item)}`)
     return this._requestCreate(factory, item)
   }
@@ -298,19 +298,22 @@ class ApiDataFactory extends Helper {
     return Promise.all(promises)
   }
 
-  _createItem(model, data, options) {
+  async _createItem(model, data, options) {
     if (!this.factories[model]) {
       throw new Error(`Factory ${model} is not defined in config`)
     }
     let modulePath = this.factories[model].factory
     try {
       try {
-        require.resolve(modulePath)
+        // Try to resolve the path as-is first
+        await import.meta.resolve(modulePath)
       } catch (e) {
+        // If not found, try relative to codecept_dir
         modulePath = path.join(global.codecept_dir, modulePath)
       }
       // check if the new syntax `export default new Factory()` is used and loads the builder, otherwise loads the module that used old syntax `module.exports = new Factory()`.
-      const builder = require(modulePath).default || require(modulePath)
+      const module = await import(modulePath)
+      const builder = module.default || module
       return builder.build(data, options)
     } catch (err) {
       throw new Error(`Couldn't load factory file from ${modulePath}, check that

package.json

@@ -43,7 +43,7 @@
   },
   "repository": "Codeception/codeceptjs",
   "scripts": {
-    "json-server": "json-server test/data/rest/db.json --host 0.0.0.0 -p 8010 --watch -m test/data/rest/headers.js",
+    "json-server": "json-server test/data/rest/db.json --host 0.0.0.0 -p 8010 --watch -m test/data/rest/headers.cjs",
     "json-server:graphql": "node test/data/graphql/index.js",
     "lint": "eslint bin/ examples/ lib/ test/ translations/ runok.cjs",
     "lint-fix": "eslint bin/ examples/ lib/ test/ translations/ runok.cjs --fix",

test/data/rest/db.json

@@ -1,13 +1,10 @@
 {
+  "comments": [],
   "posts": [
     {
       "id": 1,
       "title": "json-server",
       "author": "davert"
     }
-  ],
-  "user": {
-    "name": "john",
-    "password": "123456"
-  }
-}
+  ]
+}

test/data/rest/headers.cjs

@@ -0,0 +1,4 @@
+module.exports = (req, res, next) => {
+  if (req.path !== '/headers') return next()
+  res.json(req.headers)
+}

test/data/rest/headers.js

@@ -1,5 +1,9 @@
 import path from 'path'
 import fs from 'fs'
+import { fileURLToPath } from 'url'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
 
 import '../support/setup.js'
 import TestHelper from '../support/TestHelper.js'

test/rest/ApiDataFactory_test.js

@@ -0,0 +1,2 @@
+import chai from 'chai'
+chai.should()