Refactor integration tests

CraftTurf · May 20, 2020 · bcab67f · bcab67f
1 parent 7189083
commit bcab67f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/scaffold/endpoint/{{{scaffold_entities}}}/{{{scaffold_entities}}}.test.ts b/scaffold/endpoint/{{{scaffold_entities}}}/{{{scaffold_entities}}}.test.ts
@@ -6,6 +6,8 @@ import application, {
 } from '../../test/utils/requestHelper';
 
 import '../../test/factories/{{{scaffold_factory}}}';
+import { verify{{{scaffold_entity_capitalise}}}, verifyResponse } from '../../test/helpers/{{{scaffold_entities}}}';
+
 import { ROUTE_NAME } from './routes';
 
 const { response: { CREATED, JSON_TYPE , BAD_REQUEST} } = http;

diff --git a/scaffold/service/src/utils/schemas.ts b/scaffold/service/src/utils/schemas.ts
@@ -48,17 +48,21 @@ export const arraySchema = (template: object): object => ({
   },
 });
 
-export const responseDocumentSchema = (template: object): object => ({
+export const responseDocumentSchema = (template): object => ({
   type: 'object',
   properties: {
     data: {
       type: 'array',
       items: {
-        ...template,
-        id: {
-          type: 'string',
+        type: 'object',
+        required: template.required,
+        properties: {
+          ...template.properties,
+          id: {
+            type: 'string',
+          },
+          ...metaResponseSchema,
         },
-        ...metaResponseSchema,
       },
     },
     ...errorResponseSchema,

diff --git a/scaffold/test/helpers/{{{scaffold_entities}}}.ts b/scaffold/test/helpers/{{{scaffold_entities}}}.ts
@@ -0,0 +1,13 @@
+const attrs = ['name' 'meta.active'];
+
+export const verify{{{scaffold_entity_capitalise}}} = (resource): void => {
+  attrs.forEach(attr => {
+    expect(resource).toHaveProperty(attr);
+  });
+};
+
+export const verifyResponse = ({ resource, payload }): void => {
+  attrs.forEach(attr => {
+    expect(resource[attr]).toEqual(payload[attr]);
+  });
+};