Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/app/travel_analytics…
Browse files Browse the repository at this point in the history
…/puppeteer-22.10.0
  • Loading branch information
stewsk authored Jun 14, 2024
2 parents 995d9f4 + f27d4eb commit e56c8c8
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.2.5</version>
<version>3.2.6</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

Expand All @@ -22,7 +22,7 @@

<!-- DEPENDENCIES VERSION -->
<jdk.version>17</jdk.version>
<cds.services.version>2.9.1</cds.services.version>
<cds.services.version>2.10.0</cds.services.version>

<cdsdk.version>^7</cdsdk.version>
</properties>
Expand Down
6 changes: 5 additions & 1 deletion srv/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ management:
include: "*"

cds:
sql.hana.optimizationMode: hex
sql.hana:
optimizationMode: hex
search:
fuzzy: true
fuzzinessThreshold: 0.9
security.mock.users:
- name: rose
- name: martha
Expand Down
3 changes: 2 additions & 1 deletion test/odata.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@ describe('Basic OData', () => {
const { headers, status, data } = await GET `/processor/$metadata`
expect(status).to.equal(200)
expect(headers).to.contain({
'content-type': 'application/xml',
// 'content-type': 'application/xml', //> fails with 'application/xml;charset=utf-8', which is set by express
'odata-version': '4.0',
})
expect(headers['content-type']).to.match(/application\/xml/)
expect(data).to.contain('<EntitySet Name="Travel" EntityType="TravelService.Travel">')
expect(data).to.contain('<Annotation Term="Common.Label" String="Travel"/>')
})
Expand Down

0 comments on commit e56c8c8

Please sign in to comment.