@opra/testing 1.27.1 → 1.27.4

package/api-expect/api-expect-base.js

@@ -1,4 +1,5 @@
 import '../expect-extend/index.js';
+import { HttpResponse } from '@opra/client';
 import { expect } from 'expect';
 export class ApiExpectBase {
     response;

package/api-expect/api-expect-error.js

@@ -1,5 +1,6 @@
 import '../expect-extend/index.js';
 import { omitNullish } from '@jsopen/objects';
+import {} from '@opra/common';
 import { expect } from 'expect';
 import { ApiExpectBase } from './api-expect-base.js';
 export class ApiExpectError extends ApiExpectBase {

package/api-expect/api-expect.d.ts

@@ -48,4 +48,5 @@ export declare class ApiExpect extends ApiExpectBase {
      * @throws {@link Error} if the assertion fails.
      */
     toReturnOperationResult(): ApiExpectOperationResult;
+    protected _parseBodyErrors(errors: any[]): string | undefined;
 }

package/api-expect/api-expect.js

@@ -36,22 +36,11 @@ export class ApiExpect extends ApiExpectBase {
         catch (e) {
             e.message =
                 "Request didn't succeeded as expected. " + msg + '\n\n' + e.message;
-            const issues = this.response.body?.errors;
-            if (issues) {
-                e.message += '\n\n';
-                issues.forEach((issue, i) => {
-                    const stack = Array.isArray(issue.stack)
-                        ? issue.stack.join('\n')
-                        : issue.stack;
-                    e.message +=
-                        colors.yellow(issues.length > 1 ? `Error [${i}]: ` : 'Error: ') +
-                            issue.message +
-                            '\n' +
-                            (stack
-                                ? '    ' + stack.substring(stack.indexOf('at ')) + '\n'
-                                : '');
-                });
-            }
+            const issues = this._parseBodyErrors(this.response.body?.errors);
+            if (issues)
+                e.message += '\n\n' + issues;
+            else
+                e.message += '\n\nbody: ' + this.response.body;
             if (typeof Error.captureStackTrace === 'function')
                 Error.captureStackTrace(e, this.toSuccess);
             else
@@ -81,23 +70,12 @@ export class ApiExpect extends ApiExpectBase {
         }
         catch (e) {
             e.message =
-                "Request didn't failed as expected. " + msg + '\n\n' + e.message;
-            const issues = this.response.body?.errors;
-            if (issues) {
-                e.message += '\n\n';
-                issues.forEach((issue, i) => {
-                    const stack = Array.isArray(issue.stack)
-                        ? issue.stack.join('\n')
-                        : issue.stack;
-                    e.message +=
-                        colors.yellow(issues.length > 1 ? `Error [${i}]: ` : 'Error: ') +
-                            issue.message +
-                            '\n' +
-                            (stack
-                                ? '    ' + stack.substring(stack.indexOf('at ')) + '\n'
-                                : '');
-                });
-            }
+                "Request didn't failed as expected. " +
+                    msg +
+                    '\n\n' +
+                    e.message +
+                    '\n\nbody: ' +
+                    this.response.body;
             if (typeof Error.captureStackTrace === 'function')
                 Error.captureStackTrace(e, this.toFail);
             else
@@ -125,9 +103,15 @@ export class ApiExpect extends ApiExpectBase {
         }
         catch (e) {
             e.message =
-                "Api didn't returned a Collection. " + msg + '\n\n' + e.message;
-            if (msg)
-                e.message = msg + '\n\n' + e.message;
+                "Api didn't returned a Collection. " +
+                    msg +
+                    '\n\n' +
+                    e.message +
+                    '\n\nbody: ' +
+                    this.response.body;
+            const issues = this._parseBodyErrors(this.response.body?.errors);
+            if (issues)
+                e.message += '\n\n' + issues;
             if (typeof Error.captureStackTrace === 'function')
                 Error.captureStackTrace(e, this.toReturnCollection);
             else
@@ -155,9 +139,13 @@ export class ApiExpect extends ApiExpectBase {
             expect(typeof payload).toEqual('object');
         }
         catch (e) {
-            e.message = "Api didn't returned an Object. " + msg + '\n\n' + e.message;
-            if (msg)
-                e.message = msg + '\n\n' + e.message;
+            e.message =
+                "Api didn't returned an Object. " +
+                    msg +
+                    '\n\n' +
+                    e.message +
+                    '\n\nbody: ' +
+                    this.response.body;
             if (typeof Error.captureStackTrace === 'function')
                 Error.captureStackTrace(e, this.toReturnObject);
             else
@@ -185,9 +173,17 @@ export class ApiExpect extends ApiExpectBase {
         }
         catch (e) {
             e.message =
-                "Api didn't returned a OperationResult. " + msg + '\n\n' + e.message;
+                "Api didn't returned a OperationResult. " +
+                    msg +
+                    '\n\n' +
+                    e.message +
+                    '\n\nbody: ' +
+                    this.response.body;
             if (msg)
                 e.message = msg + '\n\n' + e.message;
+            const issues = this._parseBodyErrors(this.response.body?.errors);
+            if (issues)
+                e.message += '\n\n' + issues;
             if (typeof Error.captureStackTrace === 'function')
                 Error.captureStackTrace(e, this.toReturnOperationResult);
             else
@@ -196,4 +192,20 @@ export class ApiExpect extends ApiExpectBase {
         }
         return new ApiExpectOperationResult(this.response);
     }
+    _parseBodyErrors(errors) {
+        if (Array.isArray(errors)) {
+            let out = '';
+            errors.forEach((issue, i) => {
+                const stack = Array.isArray(issue.stack)
+                    ? issue.stack.join('\n')
+                    : issue.stack;
+                out +=
+                    colors.yellow(errors.length > 1 ? `Error [${i}]: ` : 'Error: ') +
+                        issue.message +
+                        '\n' +
+                        (stack ? '    ' + stack.substring(stack.indexOf('at ')) + '\n' : '');
+            });
+            return out;
+        }
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/testing",
-  "version": "1.27.1",
+  "version": "1.27.4",
   "description": "Opra testing package",
   "author": "Panates",
   "license": "MIT",
@@ -12,8 +12,8 @@
     "tslib": "^2.8.1"
   },
   "peerDependencies": {
-    "@opra/client": "^1.27.1",
-    "@opra/common": "^1.27.1",
+    "@opra/client": "^1.27.4",
+    "@opra/common": "^1.27.4",
     "expect": "^29.0.0 || ^30.0.0",
     "jest-matcher-utils": "^29.0.0 || ^30.0.0"
   },

package/test-backend.js

@@ -1,4 +1,4 @@
-import { createServer, Server, } from 'node:http';
+import { createServer, IncomingMessage, Server, ServerResponse, } from 'node:http';
 import * as path from 'node:path';
 import { FetchBackend, HttpResponse } from '@opra/client';
 import { ApiExpect } from './api-expect/api-expect.js';

package/test-client.js

@@ -1,4 +1,6 @@
-import { HttpClientBase } from '@opra/client';
+import { FetchBackend, HttpClientBase, kBackend } from '@opra/client';
+import { IncomingMessage, Server, ServerResponse } from 'http';
+import { ApiExpect } from './api-expect/api-expect.js';
 import { TestBackend } from './test-backend.js';
 export const kContext = Symbol.for('kContext');
 /**