@opra/testing 0.33.13 → 1.0.0-alpha.10

package/cjs/api-expect/api-expect-collection.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertFilter = exports.ApiExpectCollection = void 0;
 const tslib_1 = require("tslib");
-const rule_judgment_1 = tslib_1.__importDefault(require("rule-judgment"));
+const type_is_1 = tslib_1.__importDefault(require("@browsery/type-is"));
 const common_1 = require("@opra/common");
+const rule_judgment_1 = tslib_1.__importDefault(require("rule-judgment"));
 const api_expect_base_js_1 = require("./api-expect-base.js");
 // @ts-ignore
 const ruleJudgment = typeof rule_judgment_1.default === 'object' ? rule_judgment_1.default.default : rule_judgment_1.default;
@@ -19,8 +20,13 @@ class ApiExpectCollection extends api_expect_base_js_1.ApiExpectBase {
     toReturnItems(min, max) {
         let msg = '';
         try {
+            const data = type_is_1.default.is(this.response.contentType, [common_1.MimeTypes.opra_response_json])
+                ? this.response.body.payload
+                : this.response.body;
+            msg += `Payload should be array.`;
+            this._expect(Array.isArray(data)).toBeTruthy();
             msg += `The length of payload array do not match. `;
-            const l = this.response.body.payload.length;
+            const l = data.length;
             this._expect(l).toBeGreaterThanOrEqual(min || 1);
             if (max)
                 this._expect(l).toBeLessThanOrEqual(max);
@@ -57,7 +63,12 @@ class ApiExpectCollection extends api_expect_base_js_1.ApiExpectBase {
     toMatch(expected) {
         try {
             expected = (0, common_1.omitNullish)(expected);
-            this._expect(this.response.body.payload).toEqual(expect.arrayContaining([expect.objectContaining(expected)]));
+            const data = type_is_1.default.is(this.response.contentType, [common_1.MimeTypes.opra_response_json])
+                ? this.response.body.payload
+                : this.response.body;
+            for (const x of data) {
+                this._expect(x).toMatchObject(expected);
+            }
         }
         catch (e) {
             Error.captureStackTrace(e, this.toMatch);
@@ -72,7 +83,10 @@ class ApiExpectCollection extends api_expect_base_js_1.ApiExpectBase {
     toContainFields(fields) {
         try {
             fields = Array.isArray(fields) ? fields : [fields];
-            for (const item of this.response.body.payload) {
+            const data = type_is_1.default.is(this.response.contentType, [common_1.MimeTypes.opra_response_json])
+                ? this.response.body.payload
+                : this.response.body;
+            for (const item of data) {
                 this._expect(Object.keys(item)).toEqual(expect.arrayContaining(fields));
             }
         }
@@ -89,7 +103,10 @@ class ApiExpectCollection extends api_expect_base_js_1.ApiExpectBase {
     toContainAllFields(fields) {
         try {
             fields = Array.isArray(fields) ? fields : [fields];
-            for (const item of this.response.body.payload) {
+            const data = type_is_1.default.is(this.response.contentType, [common_1.MimeTypes.opra_response_json])
+                ? this.response.body.payload
+                : this.response.body;
+            for (const item of data) {
                 this._expect(Object.keys(item)).toEqual(fields);
             }
         }
@@ -106,8 +123,10 @@ class ApiExpectCollection extends api_expect_base_js_1.ApiExpectBase {
     toBeSortedBy(fields) {
         try {
             fields = Array.isArray(fields) ? fields : [fields];
-            this._expect(this.response.body.payload)
-                .opraCollectionToBeSortedBy(fields);
+            const data = type_is_1.default.is(this.response.contentType, [common_1.MimeTypes.opra_response_json])
+                ? this.response.body.payload
+                : this.response.body;
+            this._expect(data).opraCollectionToBeSortedBy(fields);
         }
         catch (e) {
             Error.captureStackTrace(e, this.toBeSortedBy);
@@ -123,9 +142,12 @@ class ApiExpectCollection extends api_expect_base_js_1.ApiExpectBase {
         const f = convertFilter(filter);
         if (f) {
             const j = ruleJudgment(f);
-            const filtered = this.response.body.payload.filter(j);
+            const data = type_is_1.default.is(this.response.contentType, [common_1.MimeTypes.opra_response_json])
+                ? this.response.body.payload
+                : this.response.body;
+            const filtered = data.filter(j);
             try {
-                this._expect(this.response.body.payload).toStrictEqual(filtered);
+                this._expect(data).toStrictEqual(filtered);
             }
             catch (e) {
                 Error.captureStackTrace(e, this.toBeFilteredBy);
@@ -173,7 +195,7 @@ expect.extend({
         return {
             actual: received,
             message,
-            pass
+            pass,
         };
     },
 });

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

@@ -9,8 +9,9 @@ class ApiExpectError extends api_expect_base_js_1.ApiExpectBase {
         try {
             if (typeof expected === 'string')
                 expected = { message: expected };
-            else if (expected instanceof RegExp)
+            else if (expected instanceof RegExp) {
                 expected = { message: expect.stringMatching(expected) };
+            }
             else
                 expected = (0, common_1.omitNullish)(expected);
             this._expect(this.response.body.errors).toEqual(expect.arrayContaining([expect.objectContaining(expected)]));

package/cjs/api-expect/api-expect-object.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiExpectObject = void 0;
+const tslib_1 = require("tslib");
+const type_is_1 = tslib_1.__importDefault(require("@browsery/type-is"));
 const common_1 = require("@opra/common");
 const api_expect_base_js_1 = require("./api-expect-base.js");
 class ApiExpectObject extends api_expect_base_js_1.ApiExpectBase {
@@ -14,7 +16,10 @@ class ApiExpectObject extends api_expect_base_js_1.ApiExpectBase {
     toMatch(expected) {
         try {
             expected = (0, common_1.omitNullish)(expected);
-            this._expect(this.response.body.payload).toEqual(expect.objectContaining(expected));
+            const data = type_is_1.default.is(this.response.contentType, [common_1.MimeTypes.opra_response_json])
+                ? this.response.body.payload
+                : this.response.body;
+            this._expect(data).toEqual(expect.objectContaining(expected));
         }
         catch (e) {
             Error.captureStackTrace(e, this.toMatch);
@@ -29,8 +34,10 @@ class ApiExpectObject extends api_expect_base_js_1.ApiExpectBase {
     toContainFields(fields) {
         try {
             fields = Array.isArray(fields) ? fields : [fields];
-            this._expect(Object.keys(this.response.body.payload))
-                .toEqual(expect.arrayContaining(fields));
+            const data = type_is_1.default.is(this.response.contentType, [common_1.MimeTypes.opra_response_json])
+                ? this.response.body.payload
+                : this.response.body;
+            this._expect(Object.keys(data)).toEqual(expect.arrayContaining(fields));
         }
         catch (e) {
             Error.captureStackTrace(e, this.toContainFields);
@@ -45,8 +52,10 @@ class ApiExpectObject extends api_expect_base_js_1.ApiExpectBase {
     toContainAllFields(fields) {
         try {
             fields = Array.isArray(fields) ? fields : [fields];
-            this._expect(Object.keys(this.response.body.payload))
-                .toEqual(fields);
+            const data = type_is_1.default.is(this.response.contentType, [common_1.MimeTypes.opra_response_json])
+                ? this.response.body.payload
+                : this.response.body;
+            this._expect(Object.keys(data)).toEqual(fields);
         }
         catch (e) {
             Error.captureStackTrace(e, this.toContainAllFields);

package/cjs/api-expect/api-expect.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiExpect = void 0;
 const tslib_1 = require("tslib");
 require("../jest-extend/index.js");
+const common_1 = require("@opra/common");
 const ansi_colors_1 = tslib_1.__importDefault(require("ansi-colors"));
 const api_expect_base_js_1 = require("./api-expect-base.js");
 const api_expect_collection_js_1 = require("./api-expect-collection.js");
@@ -27,16 +28,17 @@ class ApiExpect extends api_expect_base_js_1.ApiExpectBase {
             }
         }
         catch (e) {
-            e.message = 'Request didn\'t succeeded as expected. ' + msg + '\n\n' + e.message;
+            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 += ansi_colors_1.default.yellow(issues.length > 1 ? `Error [${i}]: ` : 'Error: ') +
-                        issue.message + '\n' +
-                        (stack ? '    ' + stack.substring(stack.indexOf('at ')) + '\n' : '');
+                    const stack = Array.isArray(issue.stack) ? issue.stack.join('\n') : issue.stack;
+                    e.message +=
+                        ansi_colors_1.default.yellow(issues.length > 1 ? `Error [${i}]: ` : 'Error: ') +
+                            issue.message +
+                            '\n' +
+                            (stack ? '    ' + stack.substring(stack.indexOf('at ')) + '\n' : '');
                 });
             }
             Error.captureStackTrace(e, this.toSuccess);
@@ -61,16 +63,17 @@ class ApiExpect extends api_expect_base_js_1.ApiExpectBase {
             }
         }
         catch (e) {
-            e.message = 'Request didn\'t failed as expected. ' + msg + '\n\n' + e.message;
+            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 += ansi_colors_1.default.yellow(issues.length > 1 ? `Error [${i}]: ` : 'Error: ') +
-                        issue.message + '\n' +
-                        (stack ? '    ' + stack.substring(stack.indexOf('at ')) + '\n' : '');
+                    const stack = Array.isArray(issue.stack) ? issue.stack.join('\n') : issue.stack;
+                    e.message +=
+                        ansi_colors_1.default.yellow(issues.length > 1 ? `Error [${i}]: ` : 'Error: ') +
+                            issue.message +
+                            '\n' +
+                            (stack ? '    ' + stack.substring(stack.indexOf('at ')) + '\n' : '');
                 });
             }
             Error.captureStackTrace(e, this.toSuccess);
@@ -85,7 +88,7 @@ class ApiExpect extends api_expect_base_js_1.ApiExpectBase {
         let msg = '';
         try {
             msg = 'Content-Type header value is not valid. ';
-            expect(this.response.contentType).toEqual('application/opra+json');
+            expect(this.response.contentType).toEqual('application/opra.response+json');
             msg = 'Type of response "body" is not valid. ';
             expect(typeof this.response.body).toEqual('object');
             msg = 'Type of "payload" is not an Array. ';
@@ -93,7 +96,7 @@ class ApiExpect extends api_expect_base_js_1.ApiExpectBase {
             expect(Array.isArray(payload) ? 'array' : typeof payload).toEqual('array');
         }
         catch (e) {
-            e.message = 'Api didn\'t returned a Collection. ' + msg + '\n\n' + e.message;
+            e.message = "Api didn't returned a Collection. " + msg + '\n\n' + e.message;
             if (msg)
                 e.message = msg + '\n\n' + e.message;
             Error.captureStackTrace(e, this.toReturnCollection);
@@ -104,11 +107,11 @@ class ApiExpect extends api_expect_base_js_1.ApiExpectBase {
     /**
      * Tests if API returns an Object
      */
-    toReturnObject() {
+    toReturnObject(contentType) {
         let msg = '';
         try {
             msg = 'Content-Type header value is not valid. ';
-            expect(this.response.contentType).toEqual('application/opra+json');
+            expect(this.response.contentType).toEqual(contentType || common_1.MimeTypes.opra_response_json);
             msg = 'Type of response "body" is not valid. ';
             expect(typeof this.response.body).toEqual('object');
             msg = 'Type of "payload" is not an Object. ';
@@ -116,7 +119,7 @@ class ApiExpect extends api_expect_base_js_1.ApiExpectBase {
             expect(typeof payload).toEqual('object');
         }
         catch (e) {
-            e.message = 'Api didn\'t returned an Object. ' + msg + '\n\n' + e.message;
+            e.message = "Api didn't returned an Object. " + msg + '\n\n' + e.message;
             if (msg)
                 e.message = msg + '\n\n' + e.message;
             Error.captureStackTrace(e, this.toReturnCollection);
@@ -131,7 +134,7 @@ class ApiExpect extends api_expect_base_js_1.ApiExpectBase {
         let msg = '';
         try {
             msg = 'Content-Type header value is not valid. ';
-            expect(this.response.contentType).toEqual('application/opra+json');
+            expect(this.response.contentType).toEqual(common_1.MimeTypes.opra_response_json);
             msg = 'Type of response "body" is not valid. ';
             expect(typeof this.response.body).toEqual('object');
             msg = 'The response has payload. ';
@@ -139,7 +142,7 @@ class ApiExpect extends api_expect_base_js_1.ApiExpectBase {
             expect(typeof payload).toEqual('undefined');
         }
         catch (e) {
-            e.message = 'Api didn\'t returned a OperationResult. ' + msg + '\n\n' + e.message;
+            e.message = "Api didn't returned a OperationResult. " + msg + '\n\n' + e.message;
             if (msg)
                 e.message = msg + '\n\n' + e.message;
             Error.captureStackTrace(e, this.toReturnCollection);

package/cjs/jest-extend/common.extend.js

@@ -23,8 +23,9 @@ expect.extend({
         const pass = !filteredKeys.length === !this.isNot;
         if (!pass) {
             const message = () => `${!this.isNot ? 'Do not expects' : 'Expects'} additional keys other than: ${ansi_colors_1.default.yellow('' + expectedKeys)}\n` +
-                (filteredKeys ? `Additional keys received: ${ansi_colors_1.default.yellow('' + filteredKeys)}\n` :
-                    'No additional keys received\n');
+                (filteredKeys
+                    ? `Additional keys received: ${ansi_colors_1.default.yellow('' + filteredKeys)}\n`
+                    : 'No additional keys received\n');
             return { message, pass };
         }
         return { actual: received, pass: !this.isNot, message: () => '' };
@@ -35,33 +36,33 @@ expect.extend({
         }
         return {
             pass: false,
-            message: () => 'Value is not an array'
+            message: () => 'Value is not an array',
         };
     },
     toBeGreaterThanAny(received, expected) {
         return compare('toBeGreaterThan', {
             isNot: this.isNot,
-            promise: this.promise
+            promise: this.promise,
         }, received, expected, '>', () => received > expected);
     },
     toBeGreaterThanOrEqualAny(received, expected) {
         return compare('toBeGreaterThanOrEqual', {
             isNot: this.isNot,
-            promise: this.promise
+            promise: this.promise,
         }, received, expected, '>=', () => received >= expected);
     },
     toBeLessThanAny(received, expected) {
         return compare('toBeLessThan', {
             isNot: this.isNot,
-            promise: this.promise
+            promise: this.promise,
         }, received, expected, '<', () => received < expected);
     },
     toBeLessThanOrEqualAny(received, expected) {
         return compare('toBeLessThanOrEqual', {
             isNot: this.isNot,
-            promise: this.promise
+            promise: this.promise,
         }, received, expected, '<=', () => received <= expected);
-    }
+    },
 });
 function compare(matcherName, options, received, expected, operator, fn) {
     const pass = fn(received, expected);

package/cjs/test-backend.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TestBackend = void 0;
-const http_1 = require("http");
+const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("node:path"));
 const client_1 = require("@opra/client");
-const common_1 = require("@opra/common");
+const http_1 = require("http");
 const api_expect_js_1 = require("./api-expect/api-expect.js");
 /**
  *
@@ -11,34 +12,37 @@ const api_expect_js_1 = require("./api-expect/api-expect.js");
  */
 class TestBackend extends client_1.FetchBackend {
     constructor(app, options) {
-        super('http://tempuri.org', options);
+        super(options?.basePath ? path.join('http://tempuri.org', options.basePath) : 'http://tempuri.org', options);
         this._server = app instanceof http_1.Server ? app : (0, http_1.createServer)(app);
     }
     send(req) {
         return new Promise((resolve, reject) => {
-            const url = new common_1.OpraURL(req.url);
+            const url = new URL(req.url);
             // Set protocol to HTTP
             url.protocol = 'http';
             // Apply original host to request header
             if (url.host !== 'opra.test' && req.headers.get('host') == null)
                 req.headers.set('host', url.host);
-            new Promise((subResolve) => {
+            new Promise(subResolve => {
                 if (this._server.listening)
                     subResolve();
                 else
                     this._server.listen(0, '127.0.0.1', () => subResolve());
-            }).then(() => {
+            })
+                .then(() => {
                 const address = this._server.address();
                 url.host = '127.0.0.1';
                 url.port = address.port.toString();
                 return fetch(url.toString(), req);
-            }).then(res => {
+            })
+                .then(res => {
                 if (!this._server.listening)
                     return resolve(res);
                 this._server.once('close', () => resolve(res));
                 this._server.close();
                 this._server.unref();
-            }).then()
+            })
+                .then()
                 .catch(error => {
                 if (!this._server.listening)
                     return reject(error);

package/cjs/utils/object-matches.util.js

@@ -23,12 +23,13 @@ function _objectMatches(received, expected, path) {
         else if (ev && typeof ev === 'object') {
             _objectMatches(rv, ev, path ? path + '.' + k : k);
         }
-        else
+        else {
             try {
                 expect(rv).toEqual(ev);
             }
             catch {
                 throw new Error(`Property "${k}" does not match`);
             }
+        }
     }
 }

package/esm/api-expect/api-expect-collection.js

@@ -1,5 +1,6 @@
+import typeIs from '@browsery/type-is';
+import { MimeTypes, omitNullish, OpraFilter } from '@opra/common';
 import ruleJudgmentLib from 'rule-judgment';
-import { omitNullish, OpraFilter } from '@opra/common';
 import { ApiExpectBase } from './api-expect-base.js';
 // @ts-ignore
 const ruleJudgment = typeof ruleJudgmentLib === 'object' ? ruleJudgmentLib.default : ruleJudgmentLib;
@@ -15,8 +16,13 @@ export class ApiExpectCollection extends ApiExpectBase {
     toReturnItems(min, max) {
         let msg = '';
         try {
+            const data = typeIs.is(this.response.contentType, [MimeTypes.opra_response_json])
+                ? this.response.body.payload
+                : this.response.body;
+            msg += `Payload should be array.`;
+            this._expect(Array.isArray(data)).toBeTruthy();
             msg += `The length of payload array do not match. `;
-            const l = this.response.body.payload.length;
+            const l = data.length;
             this._expect(l).toBeGreaterThanOrEqual(min || 1);
             if (max)
                 this._expect(l).toBeLessThanOrEqual(max);
@@ -53,7 +59,12 @@ export class ApiExpectCollection extends ApiExpectBase {
     toMatch(expected) {
         try {
             expected = omitNullish(expected);
-            this._expect(this.response.body.payload).toEqual(expect.arrayContaining([expect.objectContaining(expected)]));
+            const data = typeIs.is(this.response.contentType, [MimeTypes.opra_response_json])
+                ? this.response.body.payload
+                : this.response.body;
+            for (const x of data) {
+                this._expect(x).toMatchObject(expected);
+            }
         }
         catch (e) {
             Error.captureStackTrace(e, this.toMatch);
@@ -68,7 +79,10 @@ export class ApiExpectCollection extends ApiExpectBase {
     toContainFields(fields) {
         try {
             fields = Array.isArray(fields) ? fields : [fields];
-            for (const item of this.response.body.payload) {
+            const data = typeIs.is(this.response.contentType, [MimeTypes.opra_response_json])
+                ? this.response.body.payload
+                : this.response.body;
+            for (const item of data) {
                 this._expect(Object.keys(item)).toEqual(expect.arrayContaining(fields));
             }
         }
@@ -85,7 +99,10 @@ export class ApiExpectCollection extends ApiExpectBase {
     toContainAllFields(fields) {
         try {
             fields = Array.isArray(fields) ? fields : [fields];
-            for (const item of this.response.body.payload) {
+            const data = typeIs.is(this.response.contentType, [MimeTypes.opra_response_json])
+                ? this.response.body.payload
+                : this.response.body;
+            for (const item of data) {
                 this._expect(Object.keys(item)).toEqual(fields);
             }
         }
@@ -102,8 +119,10 @@ export class ApiExpectCollection extends ApiExpectBase {
     toBeSortedBy(fields) {
         try {
             fields = Array.isArray(fields) ? fields : [fields];
-            this._expect(this.response.body.payload)
-                .opraCollectionToBeSortedBy(fields);
+            const data = typeIs.is(this.response.contentType, [MimeTypes.opra_response_json])
+                ? this.response.body.payload
+                : this.response.body;
+            this._expect(data).opraCollectionToBeSortedBy(fields);
         }
         catch (e) {
             Error.captureStackTrace(e, this.toBeSortedBy);
@@ -119,9 +138,12 @@ export class ApiExpectCollection extends ApiExpectBase {
         const f = convertFilter(filter);
         if (f) {
             const j = ruleJudgment(f);
-            const filtered = this.response.body.payload.filter(j);
+            const data = typeIs.is(this.response.contentType, [MimeTypes.opra_response_json])
+                ? this.response.body.payload
+                : this.response.body;
+            const filtered = data.filter(j);
             try {
-                this._expect(this.response.body.payload).toStrictEqual(filtered);
+                this._expect(data).toStrictEqual(filtered);
             }
             catch (e) {
                 Error.captureStackTrace(e, this.toBeFilteredBy);
@@ -168,7 +190,7 @@ expect.extend({
         return {
             actual: received,
             message,
-            pass
+            pass,
         };
     },
 });

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

@@ -6,8 +6,9 @@ export class ApiExpectError extends ApiExpectBase {
         try {
             if (typeof expected === 'string')
                 expected = { message: expected };
-            else if (expected instanceof RegExp)
+            else if (expected instanceof RegExp) {
                 expected = { message: expect.stringMatching(expected) };
+            }
             else
                 expected = omitNullish(expected);
             this._expect(this.response.body.errors).toEqual(expect.arrayContaining([expect.objectContaining(expected)]));

package/esm/api-expect/api-expect-object.js

@@ -1,4 +1,5 @@
-import { omitNullish } from '@opra/common';
+import typeIs from '@browsery/type-is';
+import { MimeTypes, omitNullish } from '@opra/common';
 import { ApiExpectBase } from './api-expect-base.js';
 export class ApiExpectObject extends ApiExpectBase {
     get not() {
@@ -11,7 +12,10 @@ export class ApiExpectObject extends ApiExpectBase {
     toMatch(expected) {
         try {
             expected = omitNullish(expected);
-            this._expect(this.response.body.payload).toEqual(expect.objectContaining(expected));
+            const data = typeIs.is(this.response.contentType, [MimeTypes.opra_response_json])
+                ? this.response.body.payload
+                : this.response.body;
+            this._expect(data).toEqual(expect.objectContaining(expected));
         }
         catch (e) {
             Error.captureStackTrace(e, this.toMatch);
@@ -26,8 +30,10 @@ export class ApiExpectObject extends ApiExpectBase {
     toContainFields(fields) {
         try {
             fields = Array.isArray(fields) ? fields : [fields];
-            this._expect(Object.keys(this.response.body.payload))
-                .toEqual(expect.arrayContaining(fields));
+            const data = typeIs.is(this.response.contentType, [MimeTypes.opra_response_json])
+                ? this.response.body.payload
+                : this.response.body;
+            this._expect(Object.keys(data)).toEqual(expect.arrayContaining(fields));
         }
         catch (e) {
             Error.captureStackTrace(e, this.toContainFields);
@@ -42,8 +48,10 @@ export class ApiExpectObject extends ApiExpectBase {
     toContainAllFields(fields) {
         try {
             fields = Array.isArray(fields) ? fields : [fields];
-            this._expect(Object.keys(this.response.body.payload))
-                .toEqual(fields);
+            const data = typeIs.is(this.response.contentType, [MimeTypes.opra_response_json])
+                ? this.response.body.payload
+                : this.response.body;
+            this._expect(Object.keys(data)).toEqual(fields);
         }
         catch (e) {
             Error.captureStackTrace(e, this.toContainAllFields);

package/esm/api-expect/api-expect.js

@@ -1,4 +1,5 @@
 import '../jest-extend/index.js';
+import { MimeTypes } from '@opra/common';
 import colors from 'ansi-colors';
 import { ApiExpectBase } from './api-expect-base.js';
 import { ApiExpectCollection } from './api-expect-collection.js';
@@ -23,16 +24,17 @@ export class ApiExpect extends ApiExpectBase {
             }
         }
         catch (e) {
-            e.message = 'Request didn\'t succeeded as expected. ' + msg + '\n\n' + e.message;
+            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 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' : '');
                 });
             }
             Error.captureStackTrace(e, this.toSuccess);
@@ -57,16 +59,17 @@ export class ApiExpect extends ApiExpectBase {
             }
         }
         catch (e) {
-            e.message = 'Request didn\'t failed as expected. ' + msg + '\n\n' + e.message;
+            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' : '');
+                    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' : '');
                 });
             }
             Error.captureStackTrace(e, this.toSuccess);
@@ -81,7 +84,7 @@ export class ApiExpect extends ApiExpectBase {
         let msg = '';
         try {
             msg = 'Content-Type header value is not valid. ';
-            expect(this.response.contentType).toEqual('application/opra+json');
+            expect(this.response.contentType).toEqual('application/opra.response+json');
             msg = 'Type of response "body" is not valid. ';
             expect(typeof this.response.body).toEqual('object');
             msg = 'Type of "payload" is not an Array. ';
@@ -89,7 +92,7 @@ export class ApiExpect extends ApiExpectBase {
             expect(Array.isArray(payload) ? 'array' : typeof payload).toEqual('array');
         }
         catch (e) {
-            e.message = 'Api didn\'t returned a Collection. ' + msg + '\n\n' + e.message;
+            e.message = "Api didn't returned a Collection. " + msg + '\n\n' + e.message;
             if (msg)
                 e.message = msg + '\n\n' + e.message;
             Error.captureStackTrace(e, this.toReturnCollection);
@@ -100,11 +103,11 @@ export class ApiExpect extends ApiExpectBase {
     /**
      * Tests if API returns an Object
      */
-    toReturnObject() {
+    toReturnObject(contentType) {
         let msg = '';
         try {
             msg = 'Content-Type header value is not valid. ';
-            expect(this.response.contentType).toEqual('application/opra+json');
+            expect(this.response.contentType).toEqual(contentType || MimeTypes.opra_response_json);
             msg = 'Type of response "body" is not valid. ';
             expect(typeof this.response.body).toEqual('object');
             msg = 'Type of "payload" is not an Object. ';
@@ -112,7 +115,7 @@ 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;
+            e.message = "Api didn't returned an Object. " + msg + '\n\n' + e.message;
             if (msg)
                 e.message = msg + '\n\n' + e.message;
             Error.captureStackTrace(e, this.toReturnCollection);
@@ -127,7 +130,7 @@ export class ApiExpect extends ApiExpectBase {
         let msg = '';
         try {
             msg = 'Content-Type header value is not valid. ';
-            expect(this.response.contentType).toEqual('application/opra+json');
+            expect(this.response.contentType).toEqual(MimeTypes.opra_response_json);
             msg = 'Type of response "body" is not valid. ';
             expect(typeof this.response.body).toEqual('object');
             msg = 'The response has payload. ';
@@ -135,7 +138,7 @@ export class ApiExpect extends ApiExpectBase {
             expect(typeof payload).toEqual('undefined');
         }
         catch (e) {
-            e.message = 'Api didn\'t returned a OperationResult. ' + msg + '\n\n' + e.message;
+            e.message = "Api didn't returned a OperationResult. " + msg + '\n\n' + e.message;
             if (msg)
                 e.message = msg + '\n\n' + e.message;
             Error.captureStackTrace(e, this.toReturnCollection);

package/esm/jest-extend/common.extend.js

@@ -1,4 +1,4 @@
-import colors from "ansi-colors";
+import colors from 'ansi-colors';
 import { matcherHint, printExpected, printReceived } from 'jest-matcher-utils';
 expect.extend({
     toHaveFields(received, expected) {
@@ -20,8 +20,9 @@ expect.extend({
         const pass = !filteredKeys.length === !this.isNot;
         if (!pass) {
             const message = () => `${!this.isNot ? 'Do not expects' : 'Expects'} additional keys other than: ${colors.yellow('' + expectedKeys)}\n` +
-                (filteredKeys ? `Additional keys received: ${colors.yellow('' + filteredKeys)}\n` :
-                    'No additional keys received\n');
+                (filteredKeys
+                    ? `Additional keys received: ${colors.yellow('' + filteredKeys)}\n`
+                    : 'No additional keys received\n');
             return { message, pass };
         }
         return { actual: received, pass: !this.isNot, message: () => '' };
@@ -32,33 +33,33 @@ expect.extend({
         }
         return {
             pass: false,
-            message: () => 'Value is not an array'
+            message: () => 'Value is not an array',
         };
     },
     toBeGreaterThanAny(received, expected) {
         return compare('toBeGreaterThan', {
             isNot: this.isNot,
-            promise: this.promise
+            promise: this.promise,
         }, received, expected, '>', () => received > expected);
     },
     toBeGreaterThanOrEqualAny(received, expected) {
         return compare('toBeGreaterThanOrEqual', {
             isNot: this.isNot,
-            promise: this.promise
+            promise: this.promise,
         }, received, expected, '>=', () => received >= expected);
     },
     toBeLessThanAny(received, expected) {
         return compare('toBeLessThan', {
             isNot: this.isNot,
-            promise: this.promise
+            promise: this.promise,
         }, received, expected, '<', () => received < expected);
     },
     toBeLessThanOrEqualAny(received, expected) {
         return compare('toBeLessThanOrEqual', {
             isNot: this.isNot,
-            promise: this.promise
+            promise: this.promise,
         }, received, expected, '<=', () => received <= expected);
-    }
+    },
 });
 function compare(matcherName, options, received, expected, operator, fn) {
     const pass = fn(received, expected);

package/esm/test-backend.js

@@ -1,6 +1,6 @@
-import { createServer, Server } from 'http';
+import * as path from 'node:path';
 import { FetchBackend, HttpResponse } from '@opra/client';
-import { OpraURL } from '@opra/common';
+import { createServer, Server } from 'http';
 import { ApiExpect } from './api-expect/api-expect.js';
 /**
  *
@@ -8,34 +8,37 @@ import { ApiExpect } from './api-expect/api-expect.js';
  */
 export class TestBackend extends FetchBackend {
     constructor(app, options) {
-        super('http://tempuri.org', options);
+        super(options?.basePath ? path.join('http://tempuri.org', options.basePath) : 'http://tempuri.org', options);
         this._server = app instanceof Server ? app : createServer(app);
     }
     send(req) {
         return new Promise((resolve, reject) => {
-            const url = new OpraURL(req.url);
+            const url = new URL(req.url);
             // Set protocol to HTTP
             url.protocol = 'http';
             // Apply original host to request header
             if (url.host !== 'opra.test' && req.headers.get('host') == null)
                 req.headers.set('host', url.host);
-            new Promise((subResolve) => {
+            new Promise(subResolve => {
                 if (this._server.listening)
                     subResolve();
                 else
                     this._server.listen(0, '127.0.0.1', () => subResolve());
-            }).then(() => {
+            })
+                .then(() => {
                 const address = this._server.address();
                 url.host = '127.0.0.1';
                 url.port = address.port.toString();
                 return fetch(url.toString(), req);
-            }).then(res => {
+            })
+                .then(res => {
                 if (!this._server.listening)
                     return resolve(res);
                 this._server.once('close', () => resolve(res));
                 this._server.close();
                 this._server.unref();
-            }).then()
+            })
+                .then()
                 .catch(error => {
                 if (!this._server.listening)
                     return reject(error);

package/esm/utils/object-matches.util.js

@@ -19,12 +19,13 @@ function _objectMatches(received, expected, path) {
         else if (ev && typeof ev === 'object') {
             _objectMatches(rv, ev, path ? path + '.' + k : k);
         }
-        else
+        else {
             try {
                 expect(rv).toEqual(ev);
             }
             catch {
                 throw new Error(`Property "${k}" does not match`);
             }
+        }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/testing",
-  "version": "0.33.13",
+  "version": "1.0.0-alpha.10",
   "description": "Opra testing package",
   "author": "Panates",
   "license": "MIT",
@@ -17,8 +17,10 @@
     "build:esm": "tsc -b tsconfig-build-esm.json",
     "postbuild": "cp README.md package.json ../../LICENSE ../../build/testing && cp ../../package.cjs.json ../../build/testing/cjs/package.json",
     "lint": "eslint . --max-warnings=0",
-    "test": "jest",
-    "cover": "jest --collect-coverage",
+    "lint:fix": "eslint . --max-warnings=0 --fix",
+    "format": "prettier . --write --log-level=warn",
+    "test": "jest --passWithNoTests",
+    "cover": "jest --passWithNoTests --collect-coverage",
     "clean": "npm run clean:src && npm run clean:test && npm run clean:dist && npm run clean:cover",
     "clean:src": "ts-cleanup -s src --all",
     "clean:test": "ts-cleanup -s test --all",
@@ -26,9 +28,11 @@
     "clean:cover": "rimraf ../../coverage/testing"
   },
   "dependencies": {
-    "@opra/client": "^0.33.13",
-    "@opra/common": "^0.33.13",
+    "@browsery/type-is": "^1.6.18-r3",
+    "@opra/client": "^1.0.0-alpha.10",
+    "@opra/common": "^1.0.0-alpha.10",
     "ansi-colors": "^4.1.3",
+    "jest-matcher-utils": "^29.7.0",
     "rule-judgment": "^1.1.5"
   },
   "type": "module",
@@ -51,4 +55,4 @@
     "opra",
     "testing"
   ]
-}
+}

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

@@ -10,5 +10,5 @@ export interface MatchingErrorIssue {
     [index: string]: any;
 }
 export declare class ApiExpectError extends ApiExpectBase {
-    toMatch(expected: (string | RegExp | MatchingErrorIssue)): this;
+    toMatch(expected: string | RegExp | MatchingErrorIssue): this;
 }

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

@@ -22,7 +22,7 @@ export declare class ApiExpect extends ApiExpectBase {
     /**
      * Tests if API returns an Object
      */
-    toReturnObject(): ApiExpectObject;
+    toReturnObject(contentType?: string): ApiExpectObject;
     /**
      * Tests if API returns an OperationResult
      */

package/types/test-backend.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="node" />
-import { IncomingMessage, Server, ServerResponse } from 'http';
 import { FetchBackend, HttpResponse } from '@opra/client';
+import { IncomingMessage, Server, ServerResponse } from 'http';
 import { ApiExpect } from './api-expect/api-expect.js';
+import type { OpraTestClient } from './test-client.js';
 declare type RequestListener = (req: IncomingMessage, res: ServerResponse) => void;
 export type ResponseExt = {
     expect: ApiExpect;
@@ -12,7 +13,7 @@ export type ResponseExt = {
  */
 export declare class TestBackend extends FetchBackend {
     protected _server: Server;
-    constructor(app: Server | RequestListener, options?: TestBackend.Options);
+    constructor(app: Server | RequestListener, options?: OpraTestClient.Options);
     protected send(req: Request): Promise<Response>;
     protected createResponse(init: HttpResponse.Initiator): HttpResponse<any> & ResponseExt;
 }

package/types/test-client.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
-import { IncomingMessage, Server, ServerResponse } from 'http';
 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';
 declare type RequestListener = (req: IncomingMessage, res: ServerResponse) => void;
@@ -8,9 +8,13 @@ export declare const kContext: unique symbol;
 export type ResponseExt = {
     expect: ApiExpect;
 };
+export declare namespace OpraTestClient {
+    interface Options extends FetchBackend.Options {
+        basePath?: string;
+    }
+}
 export declare class OpraTestClient extends HttpClientBase<FetchBackend.RequestOptions, ResponseExt> {
-    protected _server: Server;
     [kBackend]: TestBackend;
-    constructor(app: Server | RequestListener, options?: FetchBackend.Options);
+    constructor(app: Server | RequestListener, options?: OpraTestClient.Options);
 }
 export {};