fix: modify tests for query objects with spec deepObject to content

loopbackio · Dec 31, 2019 · 084cbcc · 084cbcc
1 parent 1ab2fd4
commit 084cbcc
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/packages/rest/src/__tests__/unit/coercion/paramObject.unit.ts b/packages/rest/src/__tests__/unit/coercion/paramObject.unit.ts
@@ -11,12 +11,14 @@ import {test} from './utils';
 const OPTIONAL_ANY_OBJECT: ParameterObject = {
   in: 'query',
   name: 'aparameter',
-  schema: {
-    type: 'object',
-    additionalProperties: true,
-  },
-  style: 'deepObject',
-  explode: true,
+  content: {
+    'application/json': {
+      schema: {
+        type: 'object',
+        additionalProperties: true,
+      },
+    }
+  }
 };
 
 const REQUIRED_ANY_OBJECT = {

diff --git a/packages/rest/src/__tests__/unit/parser.unit.ts b/packages/rest/src/__tests__/unit/parser.unit.ts
@@ -381,9 +381,11 @@ describe('operationArgsParser', () => {
         {
           name,
           in: 'query',
-          style: 'deepObject',
-          explode: true,
-          schema,
+          content: {
+            'application/json': {
+              schema,
+            },
+          }
         },
       ]);
     }

diff --git a/packages/rest/src/coercion/validator.ts b/packages/rest/src/coercion/validator.ts
@@ -65,9 +65,13 @@ export class Validator {
   isAbsent(value: any) {
     if (value === '' || value === undefined) return true;
 
+    const spec: ParameterObject = this.ctx.parameterSpec;
     const schema: SchemaObject = this.ctx.parameterSpec.schema ?? {};
     if (schema.type === 'object' && value === 'null') return true;
 
+    // if parameter is a query param and an object, validate for null values
+    if ((!spec.schema && spec.in === 'query' && spec.content) && (value === 'null' || value === null)) return true;
+
     return false;
   }
 }