@opra/testing 1.12.6 → 1.13.0

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

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiExpectBase = void 0;
 require("../jest-extend/index.js");
+const expect_1 = require("expect");
 class ApiExpectBase {
     constructor(response, isNot) {
         this.response = response;
         this.isNot = isNot;
     }
     _expect(expected) {
-        const out = expect(expected);
+        const out = (0, expect_1.expect)(expected);
         if (this.isNot)
             return out.not;
         return out;

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

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const type_is_1 = tslib_1.__importDefault(require("@browsery/type-is"));
 const objects_1 = require("@jsopen/objects");
 const common_1 = require("@opra/common");
+const expect_1 = require("expect");
 const api_expect_base_js_1 = require("./api-expect-base.js");
 class ApiExpectObject extends api_expect_base_js_1.ApiExpectBase {
     get not() {
@@ -22,7 +23,7 @@ class ApiExpectObject extends api_expect_base_js_1.ApiExpectBase {
             ])
                 ? this.response.body.payload
                 : this.response.body;
-            this._expect(data).toEqual(expect.objectContaining(expected));
+            this._expect(data).toEqual(expect_1.expect.objectContaining(expected));
         }
         catch (e) {
             Error.captureStackTrace(e, this.toMatch);
@@ -42,7 +43,7 @@ class ApiExpectObject extends api_expect_base_js_1.ApiExpectBase {
             ])
                 ? this.response.body.payload
                 : this.response.body;
-            this._expect(Object.keys(data)).toEqual(expect.arrayContaining(fields));
+            this._expect(Object.keys(data)).toEqual(expect_1.expect.arrayContaining(fields));
         }
         catch (e) {
             Error.captureStackTrace(e, this.toContainFields);

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

@@ -5,6 +5,7 @@ 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 expect_1 = require("expect");
 const api_expect_base_js_1 = require("./api-expect-base.js");
 const api_expect_collection_js_1 = require("./api-expect-collection.js");
 const api_expect_error_js_1 = require("./api-expect-error.js");
@@ -20,11 +21,11 @@ class ApiExpect extends api_expect_base_js_1.ApiExpectBase {
         try {
             msg += `Status code do not match. `;
             if (status) {
-                expect(this.response.status).toEqual(status);
+                (0, expect_1.expect)(this.response.status).toEqual(status);
             }
             else {
-                expect(this.response.status).toBeGreaterThanOrEqual(200);
-                expect(this.response.status).toBeLessThan(400);
+                (0, expect_1.expect)(this.response.status).toBeGreaterThanOrEqual(200);
+                (0, expect_1.expect)(this.response.status).toBeLessThan(400);
             }
         }
         catch (e) {
@@ -60,11 +61,11 @@ class ApiExpect extends api_expect_base_js_1.ApiExpectBase {
         try {
             msg += `Status code do not match. `;
             if (status) {
-                expect(this.response.status).toEqual(status);
+                (0, expect_1.expect)(this.response.status).toEqual(status);
             }
             else {
-                expect(this.response.status).toBeGreaterThanOrEqual(400);
-                expect(this.response.status).toBeLessThanOrEqual(599);
+                (0, expect_1.expect)(this.response.status).toBeGreaterThanOrEqual(400);
+                (0, expect_1.expect)(this.response.status).toBeLessThanOrEqual(599);
             }
         }
         catch (e) {
@@ -98,12 +99,12 @@ 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.response+json');
+            (0, expect_1.expect)(this.response.contentType).toEqual('application/opra.response+json');
             msg = 'Type of response "body" is not valid. ';
-            expect(typeof this.response.body).toEqual('object');
+            (0, expect_1.expect)(typeof this.response.body).toEqual('object');
             msg = 'Type of "payload" is not an Array. ';
             const payload = this.response.body.payload;
-            expect(Array.isArray(payload) ? 'array' : typeof payload).toEqual('array');
+            (0, expect_1.expect)(Array.isArray(payload) ? 'array' : typeof payload).toEqual('array');
         }
         catch (e) {
             e.message =
@@ -122,12 +123,12 @@ 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(contentType || common_1.MimeTypes.opra_response_json);
+            (0, expect_1.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');
+            (0, expect_1.expect)(typeof this.response.body).toEqual('object');
             msg = 'Type of "payload" is not an Object. ';
             const payload = this.response.body.payload;
-            expect(typeof payload).toEqual('object');
+            (0, expect_1.expect)(typeof payload).toEqual('object');
         }
         catch (e) {
             e.message = "Api didn't returned an Object. " + msg + '\n\n' + e.message;
@@ -145,12 +146,12 @@ 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(common_1.MimeTypes.opra_response_json);
+            (0, expect_1.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');
+            (0, expect_1.expect)(typeof this.response.body).toEqual('object');
             msg = 'The response has payload. ';
             const payload = this.response.body.payload;
-            expect(typeof payload).toEqual('undefined');
+            (0, expect_1.expect)(typeof payload).toEqual('undefined');
         }
         catch (e) {
             e.message =

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

@@ -1,19 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.objectMatches = objectMatches;
+const expect_1 = require("expect");
 function objectMatches(received, expected) {
     _objectMatches(received, expected, '');
 }
 function _objectMatches(received, expected, path) {
     if (typeof received !== typeof expected)
-        expect(typeof received).toStrictEqual('object');
+        (0, expect_1.expect)(typeof received).toStrictEqual('object');
     const keys = Object.keys(expected);
     for (const k of keys) {
         const rv = received[k];
         const ev = expected[k];
         if (ev instanceof RegExp) {
             try {
-                expect(rv).toMatch(ev);
+                (0, expect_1.expect)(rv).toMatch(ev);
             }
             catch {
                 throw new Error(`Property "${k}" does not match`);
@@ -24,7 +25,7 @@ function _objectMatches(received, expected, path) {
         }
         else {
             try {
-                expect(rv).toEqual(ev);
+                (0, expect_1.expect)(rv).toEqual(ev);
             }
             catch {
                 throw new Error(`Property "${k}" does not match`);

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

@@ -1,4 +1,5 @@
 import '../jest-extend/index.js';
+import { expect } from 'expect';
 export class ApiExpectBase {
     constructor(response, isNot) {
         this.response = response;

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

@@ -1,6 +1,7 @@
 import typeIs from '@browsery/type-is';
 import { omitNullish } from '@jsopen/objects';
 import { MimeTypes } from '@opra/common';
+import { expect } from 'expect';
 import { ApiExpectBase } from './api-expect-base.js';
 export class ApiExpectObject extends ApiExpectBase {
     get not() {

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

@@ -1,6 +1,7 @@
 import '../jest-extend/index.js';
 import { MimeTypes } from '@opra/common';
 import colors from 'ansi-colors';
+import { expect } from 'expect';
 import { ApiExpectBase } from './api-expect-base.js';
 import { ApiExpectCollection } from './api-expect-collection.js';
 import { ApiExpectError } from './api-expect-error.js';

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

@@ -1,3 +1,4 @@
+import { expect } from 'expect';
 export function objectMatches(received, expected) {
     _objectMatches(received, expected, '');
 }

package/package.json

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

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

@@ -4,5 +4,5 @@ export declare class ApiExpectBase {
     readonly response: HttpResponse;
     protected readonly isNot?: boolean;
     constructor(response: HttpResponse, isNot?: boolean);
-    protected _expect(expected: any): jest.Matchers<any>;
+    protected _expect(expected: any): import("expect").Matchers<void, any>;
 }

package/types/jest-extend/common.extend.d.ts

@@ -1,3 +1,18 @@
+declare module 'expect' {
+    interface Matchers<R> {
+        toBeArray(): any;
+        toBeGreaterThanAny(expected: number | bigint | string | Date): any;
+        toBeGreaterThanOrEqualAny(expected: number | bigint | string | Date): any;
+        toBeLessThanAny(expected: number | bigint | string | Date): any;
+        toBeLessThanOrEqualAny(expected: number | bigint | string | Date): any;
+    }
+    interface InverseAsymmetricMatchers {
+        toBeGreaterThanAny(expected: number | bigint | string | Date): any;
+        toBeGreaterThanOrEqualAny(expected: number | bigint | string | Date): any;
+        toBeLessThanAny(expected: number | bigint | string | Date): any;
+        toBeLessThanOrEqualAny(expected: number | bigint | string | Date): any;
+    }
+}
 declare global {
     namespace jest {
         interface Matchers<R> {