From 997d3b3cdc52e21e3d740778feea309a4973a67f Mon Sep 17 00:00:00 2001 From: joelchu Date: Fri, 21 Feb 2020 15:32:01 +0800 Subject: [PATCH] add todo and test passed with new deps --- packages/node-client/TODO.md | 3 +++ packages/node-client/package.json | 23 +++++++++++-------- .../node-client/src/base/request-client.js | 6 +++-- packages/node-client/tests/validation.test.js | 5 +++- 4 files changed, 24 insertions(+), 13 deletions(-) create mode 100644 packages/node-client/TODO.md diff --git a/packages/node-client/TODO.md b/packages/node-client/TODO.md new file mode 100644 index 00000000..f7d3b83f --- /dev/null +++ b/packages/node-client/TODO.md @@ -0,0 +1,3 @@ +# TODOs + +- replace request with flyio diff --git a/packages/node-client/package.json b/packages/node-client/package.json index 546c3ebb..3edf2cad 100755 --- a/packages/node-client/package.json +++ b/packages/node-client/package.json @@ -1,13 +1,13 @@ { "name": "jsonql-node-client", - "version": "1.2.11", + "version": "1.2.12", "description": "jsonql node.js client with ws clients", "main": "index.js", "scripts": { "prepare": "npm run test", - "test": "ava --verbose", - "test:debug": "DEBUG=jsonql-node-client*,jsonql-contract* ava --verbose", - "test:nyc": "nyc ava --verbose", + "test": "ava", + "test:debug": "DEBUG=jsonql-node-client*,jsonql-contract* ava", + "test:nyc": "nyc ava", "test:main": "DEBUG=jsonql-* ava tests/main.test.js", "test:auth": "DEBUG=jsonql-* ava tests/auth.test.js", "test:valid": "DEBUG=jsonql-node-client* ava tests/validation.test.js", @@ -42,6 +42,7 @@ "license": "MIT", "dependencies": { "debug": "^4.1.1", + "flyio": "^0.6.14", "fs-extra": "^8.1.0", "jsonql-constants": "^1.8.14", "jsonql-errors": "^1.1.10", @@ -50,14 +51,14 @@ "jsonql-utils": "^0.9.7", "lodash.merge": "^4.6.2", "node-cache": "^5.1.0", - "request": "^2.88.0" + "request": "^2.88.2" }, "optionalDependencies": { "@jsonql/ws": "^1.0.11" }, "devDependencies": { - "ava": "^2.4.0", - "jsonql-contract": "^1.8.6", + "ava": "^3.3.0", + "jsonql-contract": "^1.8.7", "jsonql-koa": "^1.5.6", "jsonql-ws-server": "^1.5.3", "nyc": "^15.0.0", @@ -66,15 +67,17 @@ }, "ava": { "files": [ - "tests/*.test.js", - "!tests/fixtures/*.*" + "tests/*.test.js" + ], + "ignoredByWatcher": [ + "tests/fixtures/*.*" ], "cache": false, "concurrency": 5, "failFast": true, "failWithoutAssertions": false, "tap": false, - "compileEnhancements": false + "verbose": true }, "engine": { "node": ">=8" diff --git a/packages/node-client/src/base/request-client.js b/packages/node-client/src/base/request-client.js index 37661460..9c373a35 100755 --- a/packages/node-client/src/base/request-client.js +++ b/packages/node-client/src/base/request-client.js @@ -1,7 +1,8 @@ /** - * Fetch version without superagent + * @1.3.0 replace request with flyio because request is deprecated */ -const request = require('request') +// const Fly = require("flyio/src/node") +const request = require('request') // too much work for now const fsx = require('fs-extra') const { createQuery, createMutation } = require('jsonql-utils') const { clientErrorsHandler } = require('jsonql-errors') @@ -17,6 +18,7 @@ class JsonqlRequestClient extends JsonqlClient { constructor(config = {}) { super(config) + // this.request = new Fly() } // just a wrapper diff --git a/packages/node-client/tests/validation.test.js b/packages/node-client/tests/validation.test.js index f6bb3a34..384980ae 100644 --- a/packages/node-client/tests/validation.test.js +++ b/packages/node-client/tests/validation.test.js @@ -28,10 +28,13 @@ test.after(t => { t.context.stop() }) // we don't test the valid one because it require a backend to set up -test('Should able to pass with correct params', async t => { +test.only('Should able to pass with correct params', async t => { const c = t.context.client; const user = await c.query.getUser(1) t.is('Davide', user) + + debug(typeof JsonqlValidationError) + }) test('Should failed and throw JsonqlValidationError', async t => { -- Gitee