Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: switch to sflight and bookshop sub modules #885

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
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: 2 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ jobs:

steps:
- uses: actions/checkout@v4
with:
submodules: 'recursive'
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
Expand Down
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "cap/samples"]
path = cap/samples
url = https://github.com/SAP-samples/cloud-cap-samples
[submodule "cap/sflight"]
path = cap/sflight
url = https://github.com/SAP-samples/cap-sflight
1 change: 1 addition & 0 deletions cap/samples
Submodule samples added at 33b769
1 change: 1 addition & 0 deletions cap/sflight
Submodule sflight added at 38d30d
2 changes: 1 addition & 1 deletion db-service/test/assocs/unmanaged-assocs.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable no-console */
const cds = require('@sap/cds')
const cds = require('../../../test/cds')
require('../../index') // to extend cds.ql query objects with .forSQL() and alike

describe('where exists assoc', () => {
Expand Down
7 changes: 6 additions & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
import cds from '@sap/cds/eslint.config.mjs'
export default [ ...cds.recommended ]
export default [
{
ignores: ["cap/*"]
},
...cds.recommended,
]
2 changes: 1 addition & 1 deletion hana/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"CHANGELOG.md"
],
"scripts": {
"test": "npm start && cds-test $(../test/find)",
"test": "npm start && cds-test",
"test:remote": "cds-test",
"start": "npm run start:hce || npm run start:hxe",
"start:hce": "cd ./tools/docker/hce/ && ./start.sh",
Expand Down
2 changes: 1 addition & 1 deletion hana/test/fuzzy.cds
Original file line number Diff line number Diff line change
@@ -1 +1 @@
using {sap.capire.bookshop.Books as Books} from '../../test/bookshop/db/schema.cds';
using {sap.capire.bookshop.Books as Books} from '../../../cap/samples/bookshop/db/schema.cds';
2 changes: 1 addition & 1 deletion hana/test/param-views.cds
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using {sap.capire.bookshop.Books as Books} from '../../test/bookshop/db/schema.cds';
using {sap.capire.bookshop.Books as Books} from '../../../cap/samples/bookshop/db/schema.cds';

namespace sap.capire.bookshop;

Expand Down
Loading
Loading