reworked comments

Author: mariayord

lib/logger.js

@@ -13,13 +13,12 @@ InvalidJSON.prototype.name = 'Invalid JSON body'
 InvalidJSON.prototype.status = 400
 
 router.use(function jsonBodyParser(req, res, next) {
-  express.json({ ...cds.env.server.body_parser }) (req, res, function http_body_parser_next(err) {
+  express.json({ ...cds.env.server.body_parser })(req, res, function http_body_parser_next(err) {
     // Need to wrap, as CAP server deliberately crashes on SyntaxErrors
-    if (err) return next(new InvalidJSON(err.message)
-    next()
+    if (err) return next(new InvalidJSON(err.message))
   })
 })
-      
+
 router.use(function queryLogger(req, _, next) {
   let query = req.body?.query || (req.query.query && decodeURIComponent(req.query.query))
   // Only log requests that contain a query

test/tests/concurrency.test.js

@@ -8,7 +8,6 @@ describe('graphql - resolver concurrency', () => {
   axios.defaults.validateStatus = false
 
   describe('execution order of query and mutation resolvers', () => {
-
     let _log = []
 
     beforeEach(() => {

test/tests/error-handling-prod.test.js

@@ -21,7 +21,6 @@ describe('graphql - error handling in production', () => {
     _error = []
   })
 
-
   describe('Errors thrown by CDS', () => {
     test('Single @mandatory validation error', async () => {
       const query = gql`
@@ -39,7 +38,7 @@ describe('graphql - error handling in production', () => {
         {
           message: expect.any(String),
           extensions: {
-            code: expect.stringMatching(/ASSERT_MANDATORY|ASSERT_NOT_NULL/) ,
+            code: expect.stringMatching(/ASSERT_MANDATORY|ASSERT_NOT_NULL/),
             target: 'notEmptyI'
           }
         }
@@ -48,7 +47,10 @@ describe('graphql - error handling in production', () => {
       expect(response.data).toMatchObject({ errors })
       expect(response.data.errors[0].extensions).not.toHaveProperty('stacktrace') // No stacktrace in production
       const log = _warn[0][1] || JSON.parse(_warn[0][0])
-      expect(log).toMatchObject({ code: expect.stringMatching(/ASSERT_MANDATORY|ASSERT_NOT_NULL/) , target: 'notEmptyI' })
+      expect(log).toMatchObject({
+        code: expect.stringMatching(/ASSERT_MANDATORY|ASSERT_NOT_NULL/),
+        target: 'notEmptyI'
+      })
     })
 
     test('Multiple @mandatory validation errors', async () => {
@@ -70,12 +72,12 @@ describe('graphql - error handling in production', () => {
             code: 'MULTIPLE_ERRORS',
             details: [
               {
-                code: expect.stringMatching(/ASSERT_MANDATORY|ASSERT_NOT_NULL/) ,
+                code: expect.stringMatching(/ASSERT_MANDATORY|ASSERT_NOT_NULL/),
                 message: expect.any(String),
                 target: 'notEmptyI'
               },
               {
-                code: expect.stringMatching(/ASSERT_MANDATORY|ASSERT_NOT_NULL/) ,
+                code: expect.stringMatching(/ASSERT_MANDATORY|ASSERT_NOT_NULL/),
                 message: expect.any(String),
                 target: 'notEmptyS'
               }
@@ -135,7 +137,7 @@ describe('graphql - error handling in production', () => {
             code: 'MULTIPLE_ERRORS',
             details: [
               {
-                code: expect.stringMatching(/ASSERT_MANDATORY|ASSERT_NOT_NULL/) ,
+                code: expect.stringMatching(/ASSERT_MANDATORY|ASSERT_NOT_NULL/),
                 message: 'Wert ist erforderlich',
                 target: 'inRange'
               },
@@ -158,7 +160,7 @@ describe('graphql - error handling in production', () => {
       expect(log).toMatchObject({
         code: 'MULTIPLE_ERRORS',
         details: [
-          { code: expect.stringMatching(/ASSERT_MANDATORY|ASSERT_NOT_NULL/) , target: 'inRange' },
+          { code: expect.stringMatching(/ASSERT_MANDATORY|ASSERT_NOT_NULL/), target: 'inRange' },
           {
             code: 'ASSERT_ENUM',
             target: 'oneOfEnumValues'

test/tests/http.test.js

@@ -2,11 +2,11 @@ const cds = require('@sap/cds')
 const path = require('path')
 const util = require('util')
 const { axios } = cds
-    .test('serve', 'srv/empty-service.cds')
-    .in(path.join(__dirname, '../resources/empty-csn-definitions'))
+  .test('serve', 'srv/empty-service.cds')
+  .in(path.join(__dirname, '../resources/empty-csn-definitions'))
 const _format = e => util.formatWithOptions({ colors: false, depth: null }, ...(Array.isArray(e) ? e : [e]))
 
-let _error = []    
+let _error = []
 
 describe('GraphQL express json parser error scenario', () => {
   beforeEach(() => {
@@ -17,16 +17,17 @@ describe('GraphQL express json parser error scenario', () => {
     _error = []
   })
   test('should trigger InvalidJSON for malformed JSON', async () => {
+    expect.hasAssertions()
     try {
-     response = await axios.request({
-          method: 'POST',
-          url: `/graphql`,
-          data: '{ some_value'
-    })
+      response = await axios.request({
+        method: 'POST',
+        url: `/graphql`,
+        data: '{ some_value'
+      })
     } catch (err) {
-       expect(err.status).toBe(400)
-       expect(err.response.data.error.message).toBe(`Unexpected token '"', ""{ some_value"" is not valid JSON`)
-       expect(_format(_error[0])).toContain('InvalidJSON')
+      expect(err.status).toBe(400)
+      expect(err.response.data.error.message).toMatch(/not valid JSON/)
+      expect(_format(_error[0])).toContain('InvalidJSON')
     }
   })
 })

test/tests/schema.test.js

@@ -3,7 +3,7 @@ const path = require('path')
 // Load @cap-js/graphql plugin to ensure .to.gql and .to.graphql compile targets are registered
 require('../../cds-plugin')
 
-const  { models } = require('../resources')
+const { models } = require('../resources')
 const { SCHEMAS_DIR } = require('../util')
 const { printSchema, validateSchema } = require('graphql')