From 2a6fd33878e1e8ec3d20320a4271b3f737aac88d Mon Sep 17 00:00:00 2001 From: joelchu Date: Sat, 23 Nov 2019 15:30:11 +0800 Subject: [PATCH 1/4] update deps before continue the final test --- packages/@jsonql/koa/package.json | 2 +- packages/@jsonql/koa/tests/ms.test.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/@jsonql/koa/package.json b/packages/@jsonql/koa/package.json index ed2be7fb..77212674 100644 --- a/packages/@jsonql/koa/package.json +++ b/packages/@jsonql/koa/package.json @@ -53,7 +53,7 @@ "debug": "^4.1.1", "fs-extra": "^8.1.0", "jsonql-constants": "^1.8.10", - "jsonql-koa": "^1.4.15", + "jsonql-koa": "^1.4.16", "jsonql-params-validator": "^1.4.11", "koa": "^2.11.0", "koa-bodyparser": "^4.2.1", diff --git a/packages/@jsonql/koa/tests/ms.test.js b/packages/@jsonql/koa/tests/ms.test.js index 7eb4bcbc..19462668 100644 --- a/packages/@jsonql/koa/tests/ms.test.js +++ b/packages/@jsonql/koa/tests/ms.test.js @@ -45,4 +45,6 @@ test(`It should able to connect to server B directly`, async t => { }) -test.todo(`It should able to connect to another service via the internal nodeClient`) +test.todo(`It should able to connect to another service via the internal nodeClient`, t => { + +}) -- Gitee From 069aed8f4d455a3c74c78a119afa40c7d520935e Mon Sep 17 00:00:00 2001 From: joelchu Date: Sat, 23 Nov 2019 15:47:33 +0800 Subject: [PATCH 2/4] update jsonql-resolvers before continue --- .../fixtures/resolvers/query/get-something.js | 4 ++-- packages/@jsonql/koa/tests/ms.test.js | 23 +++++++++++++++---- packages/resolver/package.json | 8 +++---- .../tests/fixtures/contract/es/contract.json | 2 +- 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/packages/@jsonql/koa/tests/fixtures/resolvers/query/get-something.js b/packages/@jsonql/koa/tests/fixtures/resolvers/query/get-something.js index b3fb1673..cbfa8b7d 100644 --- a/packages/@jsonql/koa/tests/fixtures/resolvers/query/get-something.js +++ b/packages/@jsonql/koa/tests/fixtures/resolvers/query/get-something.js @@ -1,8 +1,8 @@ /** * just a pass over method to get something from server b - * @return {object} an object contains two different time stamps + * @return {object} an object contains two different time stamps */ module.exports = function getSomething() { - + const client = getSomething.client() } diff --git a/packages/@jsonql/koa/tests/ms.test.js b/packages/@jsonql/koa/tests/ms.test.js index 19462668..4aa56eb6 100644 --- a/packages/@jsonql/koa/tests/ms.test.js +++ b/packages/@jsonql/koa/tests/ms.test.js @@ -12,6 +12,15 @@ const contractDirB = join(contractBaseDir, MS_B_DIR) const createMsTestServer = require('./fixtures/ms-test-servers') +const getClientA = async () => ( + await jsonqlNodeClient({ + hostname: `http://localhost:${PORT_A}`, + contractDir: join(__dirname, 'fixtures', 'contract', 'client1') + }) +) + + + test.before(t => { t.context.serverA = createMsTestServer('A') t.context.serverB = createMsTestServer('B') @@ -25,10 +34,7 @@ test.after(t => { }) test(`It should able to connect to service A directly`, async t => { - const client1 = await jsonqlNodeClient({ - hostname: `http://localhost:${PORT_A}`, - contractDir: join(__dirname, 'fixtures', 'contract', 'client1') - }) + const client1 = await getClientA() const res1 = await client1.query.helloWorld() @@ -45,6 +51,13 @@ test(`It should able to connect to server B directly`, async t => { }) -test.todo(`It should able to connect to another service via the internal nodeClient`, t => { +test(`It should able to connect to another service via the internal nodeClient`, async t => { + const client1 = await getClientA() + + + + }) + +test.todo(`It should able to connect to the another client via socket connection`) diff --git a/packages/resolver/package.json b/packages/resolver/package.json index 6860065a..5bfbea0d 100644 --- a/packages/resolver/package.json +++ b/packages/resolver/package.json @@ -1,6 +1,6 @@ { "name": "jsonql-resolver", - "version": "0.9.6", + "version": "0.9.7", "description": "This is NOT for general use, please do not install it directly. This module is part of the jsonql tools supporting modules.", "main": "index.js", "files": [ @@ -30,15 +30,15 @@ "jsonql-constants": "^1.8.10", "jsonql-errors": "^1.1.6", "jsonql-jwt": "^1.3.4", - "jsonql-node-client": "^1.2.2", + "jsonql-node-client": "^1.2.4", "jsonql-params-validator": "^1.4.11", - "jsonql-utils": "^0.8.3", + "jsonql-utils": "^0.8.5", "lodash.merge": "^4.6.2" }, "devDependencies": { "ava": "^2.4.0", "jsonql-contract": "^1.8.4", - "jsonql-koa": "^1.4.10", + "jsonql-koa": "^1.4.16", "server-io-core": "^1.2.0" }, "ava": { diff --git a/packages/resolver/tests/fixtures/contract/es/contract.json b/packages/resolver/tests/fixtures/contract/es/contract.json index 3f9854b7..30f88112 100644 --- a/packages/resolver/tests/fixtures/contract/es/contract.json +++ b/packages/resolver/tests/fixtures/contract/es/contract.json @@ -43,6 +43,6 @@ } }, "auth": {}, - "timestamp": 1573458006, + "timestamp": 1574495238, "sourceType": "module" } -- Gitee From 0b334129b860c241cce7330f4e0fdf51f25d9bda Mon Sep 17 00:00:00 2001 From: joelchu Date: Sat, 23 Nov 2019 15:54:47 +0800 Subject: [PATCH 3/4] jsonql-resolver to 0.9.7 --- packages/resolver/tests/fixtures/contract/es/contract.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/resolver/tests/fixtures/contract/es/contract.json b/packages/resolver/tests/fixtures/contract/es/contract.json index 30f88112..30e4846f 100644 --- a/packages/resolver/tests/fixtures/contract/es/contract.json +++ b/packages/resolver/tests/fixtures/contract/es/contract.json @@ -43,6 +43,6 @@ } }, "auth": {}, - "timestamp": 1574495238, + "timestamp": 1574495660, "sourceType": "module" } -- Gitee From e5e5bdd19d6f99543806b58452d73407fcd2801e Mon Sep 17 00:00:00 2001 From: joelchu Date: Sat, 23 Nov 2019 15:57:17 +0800 Subject: [PATCH 4/4] jsonql-koa to 1.4.17 --- packages/koa/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/koa/package.json b/packages/koa/package.json index cc70f958..c959c227 100644 --- a/packages/koa/package.json +++ b/packages/koa/package.json @@ -1,6 +1,6 @@ { "name": "jsonql-koa", - "version": "1.4.16", + "version": "1.4.17", "description": "jsonql Koa middleware", "main": "main.js", "module": "index.js", @@ -80,7 +80,7 @@ "jsonql-jwt": "^1.3.4", "jsonql-node-client": "^1.2.4", "jsonql-params-validator": "^1.4.11", - "jsonql-resolver": "^0.9.6", + "jsonql-resolver": "^0.9.7", "jsonql-utils": "^0.8.5", "jsonql-web-console": "^0.4.3", "koa-compose": "^4.1.0", -- Gitee