Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test-packages/e2e-tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ For testing if two versions works together do the following in the e2e folder:

```bash
rm -r node_modules/ && yarn install --ignore-engines //contains state of pm2
rm sqlite.db && yarn deploy && yarn stop && yarn start //recreate DB
rm sqlite.db && yarn deploy && yarn pretest:e2e && yarn posttest:e2e //recreate DB
//execute your tests
```

Expand Down
4 changes: 2 additions & 2 deletions test-packages/e2e-tests/cap.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ const cds = require('@sap/cds');
const express = require('express');

module.exports = {
createCapApp() {
async createCapApp() {
const app = express();
cds
await cds
.serve('all')
.to('odata') // Use odata format (default is 'fiori')
.in(app);
Expand Down
4 changes: 2 additions & 2 deletions test-packages/e2e-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"stop:service-server": "pm2 stop server.js",
"start:proxy-server": "pm2 start test/proxy/proxy-server.js || pm2 restart test/proxy/proxy-server.js",
"stop:proxy-server": "pm2 stop test/proxy/proxy-server.js",
"deploy": "cds deploy --to sqlite --no-save",
"deploy": "cds deploy --to sqlite",
"test": "yarn test:e2e",
"test:e2e": "yarn node --experimental-vm-modules ../../node_modules/jest/bin/jest.js",
"lint": "eslint --ext .ts . && prettier . --config ../../.prettierrc --ignore-path ../../.prettierignore -c",
Expand All @@ -31,7 +31,7 @@
"@sap-cloud-sdk/test-services-e2e": "^4.2.0",
"@sap-cloud-sdk/test-services-openapi": "^4.2.0",
"@sap-cloud-sdk/util": "^4.2.0",
"@sap/cds": "^9.2.1",
"@sap/cds": "^9.6.1",
"@sap/cds-dk": "9.6.0",
"axios": "^1.13.2",
"execa": "^5.0.0",
Expand Down
2 changes: 1 addition & 1 deletion test-packages/e2e-tests/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const { createOpenApiApp } = require('./openapi');

async function startServer() {
const app = express();
const odataApp = createCapApp();
const odataApp = await createCapApp();
const restApp = await createOpenApiApp();

app.use('/odata', odataApp);
Expand Down
20 changes: 10 additions & 10 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1423,10 +1423,10 @@
resolved "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==

"@sap/cds-compiler@^6":
version "6.1.0"
resolved "https://registry.npmjs.org/@sap/cds-compiler/-/cds-compiler-6.1.0.tgz#6e010591111e3c45b39b8035ae0e360532ecb6f5"
integrity sha512-s71fsxDZKqHn2xvoqoNst54K/BkBzCpiU+8xc0t3nMDXmsLzSC3VfygZGwGAZD8fkxUnXh8oL2XLHWKWcvcdNg==
"@sap/cds-compiler@^6.3":
version "6.6.0"
resolved "https://registry.npmjs.org/@sap/cds-compiler/-/cds-compiler-6.6.0.tgz#84cc9ec3ef2434f249a2b504da903a8392ad3b14"
integrity sha512-cttVQhuzobLsnaGjmCz6gOXdUdHRawTbUK8UsUPnOIOboAOJRvLbrX4RF/iY6VxewpupDcx+FhfDCbAupO3EwQ==

"@sap/cds-dk@9.6.0":
version "9.6.0"
Expand Down Expand Up @@ -1462,14 +1462,14 @@
dependencies:
"@sap/hdi-deploy" "^5"

"@sap/cds@>=8.3", "@sap/cds@^9.2.1":
version "9.2.1"
resolved "https://registry.npmjs.org/@sap/cds/-/cds-9.2.1.tgz#c3d830663394f2d0226486e33389c87636b864f4"
integrity sha512-0zjjZGlBvcJMyVj48hTs6Q22/w9hNnJR6O88rGoEj4R87uaP4uM5gFLf3PDnPDUwkAeveVHgJRnWPqDGqIMgvA==
"@sap/cds@>=8.3", "@sap/cds@^9.6.1":
version "9.6.1"
resolved "https://registry.npmjs.org/@sap/cds/-/cds-9.6.1.tgz#670de33b5c383f632591de828b3e45d350346965"
integrity sha512-Bx6asOBhYXBE+jB6FtmyHmAjoPi11MYb/v/AYpnp0jqL/+kAXXWo6YOxJHqpx1k5Um5FS1r6gM/5tVAo/ta7bw==
dependencies:
"@sap/cds-compiler" "^6"
"@sap/cds-compiler" "^6.3"
"@sap/cds-fiori" "^2"
js-yaml "^4.1.0"
js-yaml "^4.1.1"

"@sap/hdi-deploy@^5":
version "5.4.2"
Expand Down
Loading