@opra/testing 0.4.0 → 0.5.0

package/cjs/test-client.js

@@ -6,6 +6,11 @@ const axiosist = tslib_1.__importStar(require("axiosist"));
 const client_1 = require("@opra/client");
 const api_expect_js_1 = require("./api-expect/api-expect.js");
 class OpraTestClient extends client_1.OpraClient {
+    constructor(app, arg1, arg2) {
+        super('/', arg1, arg2);
+        this._axios.defaults.adapter = axiosist.createAdapter(app);
+        this._axios.defaults.validateStatus = () => true;
+    }
     // @ts-ignore
     collection(name) {
         return super.collection(name);
@@ -14,19 +19,16 @@ class OpraTestClient extends client_1.OpraClient {
     singleton(name) {
         return super.singleton(name);
     }
-    async _send(req, options) {
-        const resp = (await super._send(req, options));
+    // @ts-ignore
+    async _send(req) {
+        const resp = (await super._send(req));
         resp.expect = new api_expect_js_1.ApiExpect(resp);
         return resp;
     }
     static async create(app, options) {
-        const instance = await super.create('/', {
-            validateStatus: false,
-            ...options,
-            adapter: axiosist.createAdapter(app)
-        });
-        Object.setPrototypeOf(instance, OpraTestClient.prototype);
-        return instance;
+        const client = new this(app, options);
+        await client.init();
+        return client;
     }
 }
 exports.OpraTestClient = OpraTestClient;

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

@@ -1,9 +1,9 @@
-import { OpraResponse } from '@opra/client';
+import { ClientResponse } from '@opra/client';
 import { Expression } from '@opra/url';
 export declare class ApiExpectCollection {
-    readonly response: OpraResponse;
+    readonly response: ClientResponse;
     protected _isNot: boolean;
-    constructor(response: OpraResponse, _isNot?: boolean);
+    constructor(response: ClientResponse, _isNot?: boolean);
     get not(): ApiExpectCollection;
     forEach(callbackfn: (v: any) => void): this;
     toMatch<T extends {}>(expected: T): this;

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

@@ -1,8 +1,8 @@
-import { OpraResponse } from '@opra/client';
+import { ClientResponse } from '@opra/client';
 import { ApiExpectObject } from './api-expect-object.js';
 export declare class ApiExpectError extends ApiExpectObject {
-    readonly response: OpraResponse;
-    constructor(response: OpraResponse);
+    readonly response: ClientResponse;
+    constructor(response: ClientResponse);
     toContainDetail(...matching: any[]): void;
 }
 declare global {

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

@@ -1,8 +1,8 @@
-import { OpraResponse } from '@opra/client';
+import { ClientResponse } from '@opra/client';
 export declare class ApiExpectObject {
-    readonly response: OpraResponse;
+    readonly response: ClientResponse;
     protected _isNot: boolean;
-    constructor(response: OpraResponse, _isNot?: boolean);
+    constructor(response: ClientResponse, _isNot?: boolean);
     get not(): ApiExpectObject;
     toMatch<T extends {}>(expected: T): this;
     toHaveFields(fields: string[]): this;

package/esm/api-expect/api-expect-operation-result.d.ts

@@ -1,8 +1,8 @@
-import { OpraResponse } from '@opra/client';
+import { ClientResponse } from '@opra/client';
 export declare class ApiExpectOperationResult {
-    readonly response: OpraResponse;
+    readonly response: ClientResponse;
     protected _isNot: boolean;
-    constructor(response: OpraResponse, _isNot?: boolean);
+    constructor(response: ClientResponse, _isNot?: boolean);
     get not(): ApiExpectOperationResult;
     toBeAffectedExact(expected: number): this;
     toBeAffectedMin(expected: number): this;

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

@@ -1,12 +1,12 @@
-import { OpraResponse } from '@opra/client';
+import { ClientResponse } from '@opra/client';
 import { ApiExpectCollection } from './api-expect-collection.js';
 import { ApiExpectError } from './api-expect-error.js';
 import { ApiExpectObject } from './api-expect-object.js';
 import { ApiExpectOperationResult } from './api-expect-operation-result.js';
 export declare class ApiExpect {
-    readonly response: OpraResponse;
+    readonly response: ClientResponse;
     protected _isNot: boolean;
-    constructor(response: OpraResponse, _isNot?: boolean);
+    constructor(response: ClientResponse, _isNot?: boolean);
     get not(): ApiExpect;
     toSuccess(status?: number): this;
     toFail(status?: number): ApiExpectError;

package/esm/test-client.d.ts

@@ -1,18 +1,22 @@
 /// <reference types="node" />
 import { AxiosRequestConfig } from 'axios';
 import { IncomingMessage, Server, ServerResponse } from 'http';
-import { CollectionService, CommonRequestOptions, OpraClient, OpraClientOptions, OpraResponse } from '@opra/client';
-import { SingletonService } from '@opra/client/src/services/singleton-service';
+import { Type } from 'ts-gems';
+import { ClientResponse, CollectionNode, OpraClient, OpraClientOptions } from '@opra/client';
+import { SingletonNode } from '@opra/client/src/services/singleton-node';
+import { OpraDocument } from '@opra/schema/src/index';
 import { ApiExpect } from './api-expect/api-expect.js';
 declare type RequestListener = (req: IncomingMessage, res: ServerResponse) => void;
 declare type Handler = RequestListener | Server;
-declare type OpraTestResponse<T = any> = OpraResponse<T> & {
+declare type OpraTestResponse<T = any> = ClientResponse<T> & {
     expect: ApiExpect;
 };
 export declare class OpraTestClient extends OpraClient {
-    collection<T = any, TResponse extends OpraTestResponse<T> = OpraTestResponse<T>>(name: string): CollectionService<T, TResponse>;
-    singleton<T = any, TResponse extends OpraTestResponse<T> = OpraTestResponse<T>>(name: string): SingletonService<T, TResponse>;
-    protected _send(req: AxiosRequestConfig, options: CommonRequestOptions): Promise<OpraTestResponse>;
-    static create(app: Handler, options?: OpraClientOptions): Promise<OpraTestClient>;
+    constructor(app: Handler, options?: OpraClientOptions);
+    constructor(app: Handler, metadata: OpraDocument, options?: OpraClientOptions);
+    collection<T = any, TResponse extends OpraTestResponse<T> = OpraTestResponse<T>>(name: string): CollectionNode<T, TResponse>;
+    singleton<T = any, TResponse extends OpraTestResponse<T> = OpraTestResponse<T>>(name: string): SingletonNode<T, TResponse>;
+    protected _send<TResponse extends OpraTestResponse>(req: AxiosRequestConfig): Promise<TResponse>;
+    static create<T extends OpraTestClient>(this: Type<T>, app: Handler, options?: OpraClientOptions): Promise<T>;
 }
 export {};

package/esm/test-client.js

@@ -2,6 +2,11 @@ import * as axiosist from 'axiosist';
 import { OpraClient } from '@opra/client';
 import { ApiExpect } from './api-expect/api-expect.js';
 export class OpraTestClient extends OpraClient {
+    constructor(app, arg1, arg2) {
+        super('/', arg1, arg2);
+        this._axios.defaults.adapter = axiosist.createAdapter(app);
+        this._axios.defaults.validateStatus = () => true;
+    }
     // @ts-ignore
     collection(name) {
         return super.collection(name);
@@ -10,18 +15,15 @@ export class OpraTestClient extends OpraClient {
     singleton(name) {
         return super.singleton(name);
     }
-    async _send(req, options) {
-        const resp = (await super._send(req, options));
+    // @ts-ignore
+    async _send(req) {
+        const resp = (await super._send(req));
         resp.expect = new ApiExpect(resp);
         return resp;
     }
     static async create(app, options) {
-        const instance = await super.create('/', {
-            validateStatus: false,
-            ...options,
-            adapter: axiosist.createAdapter(app)
-        });
-        Object.setPrototypeOf(instance, OpraTestClient.prototype);
-        return instance;
+        const client = new this(app, options);
+        await client.init();
+        return client;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/testing",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Opra testing package",
   "author": "Panates",
   "license": "MIT",
@@ -25,9 +25,9 @@
     "clean:cover": "rimraf ../../coverage/testing"
   },
   "dependencies": {
-    "@opra/schema": "^0.4.0",
-    "@opra/url": "^0.4.0",
-    "@opra/client": "^0.4.0",
+    "@opra/schema": "^0.5.0",
+    "@opra/url": "^0.5.0",
+    "@opra/client": "^0.5.0",
     "ansi-colors": "^4.1.3",
     "lodash": "^4.17.21",
     "rule-judgment": "^1.1.5",