From a191c4fd50cd0b0d79e736d6d9120780ce59c072 Mon Sep 17 00:00:00 2001 From: Samuel Brucksch Date: Tue, 28 May 2024 18:22:45 +0200 Subject: [PATCH] Partially revert "fix: adjusted tests for new OData adapter" (#726) --- test/localized-data/services.test.js | 8 ++++---- test/odata.test.js | 10 ++++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/test/localized-data/services.test.js b/test/localized-data/services.test.js index 3e0267ca..3caa3823 100644 --- a/test/localized-data/services.test.js +++ b/test/localized-data/services.test.js @@ -8,8 +8,8 @@ describe('cap/samples - Localized Data', () => { }) - it('serves localized metadata documents', async () => { - const { data } = await GET(`/browse/$metadata?sap-language=de`, { headers: { 'accept-language': 'de', Accept: 'application/xml' }}) + it('serves localized $metadata documents', async () => { + const { data } = await GET(`/browse/$metadata?sap-language=de`, { headers: { 'accept-language': 'de', accept: 'application/xml' }}) expect(data).to.contain('') }) @@ -27,7 +27,7 @@ describe('cap/samples - Localized Data', () => { }) it('supports queries with $expand', async () => { - const { data } = await GET(`/browse/Books?$select=title,author&$expand=currency`, { + const { data } = await GET(`/browse/Books?&$select=title,author&$expand=currency`, { headers: { 'Accept-Language': 'de' }, }) expect(data.value).to.containSubset([ @@ -69,7 +69,7 @@ describe('cap/samples - Localized Data', () => { }) 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`, { + const { data } = await GET(`/browse/BooksSans?&$select=title,localized_title&$expand=currency&$filter=locale eq 'de' or locale eq null`, { headers: { 'Accept-Language': 'de' }, }) expect(data.value).to.containSubset([ diff --git a/test/odata.test.js b/test/odata.test.js index 2470f8fa..ab4cef16 100644 --- a/test/odata.test.js +++ b/test/odata.test.js @@ -5,14 +5,12 @@ describe('cap/samples - Bookshop APIs', () => { axios.defaults.auth = { username: 'alice', password: 'admin' } it('serves $metadata documents in v4', async () => { - const { headers, status, data } = await GET(`/browse/$metadata`, { headers: { Accept: 'application/xml' } }) + const { headers, status, data } = await GET(`/browse/$metadata`, { headers: { accept: 'application/xml' } }) expect(status).to.equal(200) - - // TODO - /*expect(headers).to.contain({ + expect(headers).to.contain({ + // 'content-type': 'application/xml', //> fails with 'application/xml;charset=utf-8' 'odata-version': '4.0', - })*/ - + }) expect(headers['content-type']).to.match(/application\/xml/) expect(data).to.contain('') expect(data).to.contain('')