Merge branch 'master' into fiori-currency-format

sblessing · May 28, 2021 · 20bfb5c · 20bfb5c
2 parents ad417ec + be87f56
commit 20bfb5c
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 14 deletions.
diff --git a/bookshop/app/index.cds → bookshop/app/services.cds b/bookshop/app/index.cds → bookshop/app/services.cds
diff --git a/bookshop/app/vue/app.js b/bookshop/app/vue/app.js
@@ -35,7 +35,7 @@ const books = new Vue ({
             try {
                 const res = await POST(`/submitOrder`, { amount, book: book.ID })
                 book.stock = res.data.stock
-                books.order = { amount, succeeded: `Successfully orderd ${amount} item(s).` }
+                books.order = { amount, succeeded: `Successfully ordered ${amount} item(s).` }
             } catch (e) {
                 books.order = { amount, failed: e.response.data.error.message }
             }

diff --git a/fiori/app/admin/fiori-service.cds b/fiori/app/admin/fiori-service.cds
@@ -70,7 +70,7 @@ annotate AdminService.Authors with @(
 annotate sap.capire.bookshop.Books with @fiori.draft.enabled;
 annotate AdminService.Books with @odata.draft.enabled;
 
-annotate AdminService.Books_texts with @(
+annotate AdminService.Books.texts with @(
 	UI: {
 		Identification: [{Value:title}],
 		SelectionFields: [ locale, title ],
@@ -83,7 +83,7 @@ annotate AdminService.Books_texts with @(
 );
 
 // Add Value Help for Locales
-annotate AdminService.Books_texts {
+annotate AdminService.Books.texts {
 	locale @ValueList:{entity:'Languages',type:#fixed}
 }
 // In addition we need to expose Languages through AdminService

diff --git a/fiori/package.json b/fiori/package.json
@@ -6,7 +6,7 @@
     "@capire/reviews": "*",
     "@capire/orders": "*",
     "@capire/common": "*",
-    "@sap/cds": ">=4",
+    "@sap/cds": "^5",
     "express": "^4.17.1",
     "passport": "^0.4.1"
   },

diff --git a/orders/package.json b/orders/package.json
@@ -2,6 +2,6 @@
   "name": "@capire/orders",
   "version": "1.0.0",
   "dependencies": {
-    "@sap/cds": ">=4.3.0"
+    "@sap/cds": "^5"
   }
 }
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "fiori": "cds watch fiori",
     "media": "cds watch media",
     "mocha": "npx mocha || echo",
-    "jest": "npx jest",
+    "jest": "npx jest@^26",
     "test": "npm run jest --silent"
   },
   "mocha": {

diff --git a/reviews/package.json b/reviews/package.json
@@ -7,7 +7,7 @@
     "index.cds"
   ],
   "dependencies": {
-    "@sap/cds": ">=4",
+    "@sap/cds": "^5",
     "express": "^4.17.1"
   },
   "scripts": {

diff --git a/test/custom-handlers.test.js b/test/custom-handlers.test.js
@@ -6,13 +6,9 @@ else cds.User = cds.User.Privileged // hard core monkey patch for older cds rele
 describe('Custom Handlers', () => {
 
   it('should reject out-of-stock orders', async () => {
-    await expect(
-      Promise.all([
-        POST('/browse/submitOrder', { book: 201, amount: 5 }),
-        POST('/browse/submitOrder', { book: 201, amount: 5 }),
-        POST('/browse/submitOrder', { book: 201, amount: 5 }),
-      ])
-    ).to.be.rejectedWith(/409 - 5 exceeds stock for book #201/)
+    await POST('/browse/submitOrder', { book: 201, amount: 5 })
+    await POST('/browse/submitOrder', { book: 201, amount: 5 })
+    await expect(POST('/browse/submitOrder', { book: 201, amount: 5 })).to.be.rejectedWith(/409 - 5 exceeds stock for book #201/)
     const { data } = await GET`/admin/Books/201/stock/$value`
     expect(data).to.equal(2)
   })