From 78174bfe28f4820d31dd789a2e04ec199df1a6e5 Mon Sep 17 00:00:00 2001 From: Christian Georgi Date: Fri, 10 Nov 2023 15:01:20 +0530 Subject: [PATCH] Replace `sqlite3` by `@cap-js/sqlite` (#551) * Make tests run w/ cap-js/sqlite * Set cwd in test --- fiori/package.json | 3 ++ package-lock.json | 57 ++++++++------------------------ package.json | 1 + test/hierarchical-data.test.js | 2 +- test/localized-data/package.json | 5 +++ 5 files changed, 24 insertions(+), 44 deletions(-) create mode 100644 test/localized-data/package.json diff --git a/fiori/package.json b/fiori/package.json index ec032b3e..2555f883 100644 --- a/fiori/package.json +++ b/fiori/package.json @@ -8,6 +8,9 @@ "express": "^4.17.1", "passport": ">=0.4.1" }, + "devDependencies": { + "@cap-js/sqlite": "^1" + }, "scripts": { "start": "cds-serve", "watch": "cds watch" diff --git a/package-lock.json b/package-lock.json index f7b674bf..38c90fd3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,6 +24,7 @@ "@sap/cds": ">=7" }, "devDependencies": { + "@cap-js/sqlite": "^1", "@sap/eslint-plugin-cds": "^2.6.1", "axios": "^1", "chai": "^4.3.4", @@ -33,7 +34,6 @@ } }, "bookshop": { - "name": "@capire/bookshop", "version": "1.0.0", "dependencies": { "@sap/cds": "^7", @@ -45,7 +45,6 @@ } }, "bookstore": { - "name": "@capire/bookstore", "version": "1.0.0", "dependencies": { "@capire/bookshop": "*", @@ -58,21 +57,18 @@ } }, "common": { - "name": "@capire/common", "version": "1.0.0", "dependencies": { "@sap/cds": "*" } }, "data-viewer": { - "name": "@capire/data-viewer", "version": "0.1.0", "dependencies": { "@sap/cds": ">=5.0.4" } }, "fiori": { - "name": "@capire/fiori", "version": "1.0.0", "dependencies": { "@cap-js-community/odata-v2-adapter": "^1", @@ -80,10 +76,12 @@ "@sap/cds": ">=5", "express": "^4.17.1", "passport": ">=0.4.1" + }, + "devDependencies": { + "@cap-js/sqlite": "^1" } }, "hello": { - "name": "@capire/hello-world", "version": "1.0.0", "dependencies": { "@sap/cds": ">=5.0.4" @@ -95,7 +93,6 @@ } }, "loggers": { - "name": "@capire/loggers", "version": "1.0.0", "dependencies": { "@sap/cds": ">=5.9", @@ -103,7 +100,6 @@ } }, "media": { - "name": "@capire/media", "version": "1.0.0", "dependencies": { "lokijs": "^1.5.6" @@ -667,16 +663,16 @@ } }, "node_modules/@sap/eslint-plugin-cds": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/@sap/eslint-plugin-cds/-/eslint-plugin-cds-2.6.3.tgz", - "integrity": "sha512-FNuzH6ckkEUxOry7C/SKMfSBzpbLCTgm8F1AZPZH/uD1xDFxdtnLeuXL6Vd+oibi4vq0oEXeucgKwxECUC/dmw==", + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/@sap/eslint-plugin-cds/-/eslint-plugin-cds-2.6.4.tgz", + "integrity": "sha512-JOPv9UbqRYo0Ybl2bqrRWMr4VNlRb5RQZwAZzUB3vznpPZv9/YxpZLFqmqRIQntGXr+Ki1sRiwKIZjKpieh5Kw==", "dev": true, "dependencies": { "@sap/cds": ">=5.6.0", "semver": "^7.3.4" }, "engines": { - "node": ">=14" + "node": ">=18" }, "peerDependencies": { "eslint": ">=7" @@ -1181,6 +1177,12 @@ "node": "*" } }, + "node_modules/chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "dev": true + }, "node_modules/ci-info": { "version": "3.9.0", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", @@ -1424,29 +1426,6 @@ "node": ">= 0.8" } }, - "node_modules/encoding": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", - "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", - "optional": true, - "peer": true, - "dependencies": { - "iconv-lite": "^0.6.2" - } - }, - "node_modules/encoding/node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "optional": true, - "peer": true, - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", @@ -3401,12 +3380,6 @@ "tar-stream": "^2.1.4" } }, - "node_modules/tar-fs/node_modules/chownr": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", - "dev": true - }, "node_modules/tar-stream": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", @@ -3675,7 +3648,6 @@ } }, "orders": { - "name": "@capire/orders", "version": "1.0.0", "dependencies": { "@capire/common": "*", @@ -3683,7 +3655,6 @@ } }, "reviews": { - "name": "@capire/reviews", "version": "1.0.0", "dependencies": { "@sap/cds": ">=5", diff --git a/package.json b/package.json index e93fa93a..6a8fe5f7 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "./reviews" ], "devDependencies": { + "@cap-js/sqlite": "^1", "@sap/eslint-plugin-cds": "^2.6.1", "axios": "^1", "chai": "^4.3.4", diff --git a/test/hierarchical-data.test.js b/test/hierarchical-data.test.js index 9247045c..13d9309f 100644 --- a/test/hierarchical-data.test.js +++ b/test/hierarchical-data.test.js @@ -12,7 +12,7 @@ describe('cap/samples - Hierarchical Data', ()=>{ ` const model = cds.compile.for.nodejs(csn) const {Categories:Cats} = model.definitions - const {expect} = cds.test + const { expect } = cds.test.in(__dirname,'..') before ('bootstrap sqlite in-memory db...', async()=>{ await cds.deploy (csn) .to ('sqlite::memory:') // REVISIT: cds.compile.to.sql should accept cds.compiled.for.nodejs models diff --git a/test/localized-data/package.json b/test/localized-data/package.json new file mode 100644 index 00000000..83588190 --- /dev/null +++ b/test/localized-data/package.json @@ -0,0 +1,5 @@ +{ + "devDependencies": { + "@cap-js/sqlite": "^1" + } +} \ No newline at end of file