Compare commits

...

5 Commits

Author SHA1 Message Date
D051920
ae20e682be Change list object in tests 2020-08-12 11:18:21 +02:00
D051920
53527aac50 Change list object in tests 2020-08-12 10:39:20 +02:00
D051920
04f9f2a06f Change list object in tests 2020-08-12 10:18:12 +02:00
D051920
fff62e68f1 Merge branches 'enable-fixed-tests' and 'master' of https://github.com/SAP-samples/cloud-cap-samples into enable-fixed-tests 2020-08-12 09:56:11 +02:00
D051920
ade170367b Enable temporary disabled test 2020-07-30 16:33:28 +02:00
2 changed files with 28 additions and 10 deletions

View File

@@ -261,7 +261,7 @@ describe('cds.ql → cqn', () => {
// same for works distinct
})
test.skip('where ( ... cql | {x:y} )', () => {
test('where ( ... cql | {x:y} )', () => {
const args = [`foo`, "'bar'", 3]
const ID = 11
@@ -278,7 +278,6 @@ describe('cds.ql → cqn', () => {
from: { ref: ['Foo'] },
where: cdr
? [
// '(', //> this one is not required
{ ref: ['ID'] },
'=',
{ val: ID },
@@ -287,7 +286,7 @@ describe('cds.ql → cqn', () => {
'in',
{ val: args },
'and',
'(', //> this one is missing, and that's changing the logic -> that's a BUG
'(',
{ ref: ['x'] },
'like',
{ val: '%x%' },
@@ -298,7 +297,6 @@ describe('cds.ql → cqn', () => {
')',
]
: [
'(', //> this one is not required
{ ref: ['ID'] },
'=',
{ val: ID },
@@ -307,7 +305,7 @@ describe('cds.ql → cqn', () => {
'in',
{ val: args },
'and',
// '(', //> this one is missing, and that's changing the logic -> that's a BUG
'(',
{ ref: ['x'] },
'like',
{ val: '%x%' },
@@ -337,11 +335,31 @@ describe('cds.ql → cqn', () => {
{ val: 'bar' },
',',
{ val: 3 },
')',
],
},
')'
]
}
})
expect(SELECT.from(Foo).where(`ID=`, ID, `and x in`, args)).to.eql(cqn)
const cqnFluent = {
SELECT: {
from: { ref: ['Foo'] },
where: [
{ ref: ['ID'] },
'=',
{ val: ID },
'and',
{ ref: ['x'] },
'in',
{ list: [
{ val: 'foo' },
{ val: 'bar' },
{ val: 3 }
] }
]
}
}
expect(SELECT.from(Foo).where(`ID=`, ID, `and x in`, args)).to.eql(cqnFluent)
expect(SELECT.from(Foo).where(`ID=${ID} and x in (${args})`)).to.eql(cqn)
expect(

View File

@@ -72,7 +72,7 @@ describe('Localized Data', () => {
])
})
xit('supports @cds.localized:false', async ()=>{
it('supports @cds.localized:false', async ()=>{
const { data } = await GET(`/browse/BooksSans?&$select=title,localized_title&$expand=currency&$filter=locale eq 'de' or locale eq null`, {
headers: { 'Accept-Language': 'de' },
})