From b93b4e105d74124cd8a7445e2fa3e2024d99bfac Mon Sep 17 00:00:00 2001 From: Alexandre Bodin Date: Thu, 28 Mar 2019 15:08:00 +0100 Subject: [PATCH] Cleanup tests --- packages/strapi-admin/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- packages/strapi-plugin-email/package.json | 2 +- packages/strapi-plugin-graphql/package.json | 2 +- .../test/graphqlRelations.test.e2e.js | 50 +++++++++++-------- .../package.json | 2 +- packages/strapi-plugin-upload/package.json | 2 +- .../package.json | 2 +- test/e2e.js | 2 +- 10 files changed, 37 insertions(+), 31 deletions(-) diff --git a/packages/strapi-admin/package.json b/packages/strapi-admin/package.json index 828ab83fa9..d4d434105c 100644 --- a/packages/strapi-admin/package.json +++ b/packages/strapi-admin/package.json @@ -55,4 +55,4 @@ "npm": ">= 6.0.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-plugin-content-manager/package.json b/packages/strapi-plugin-content-manager/package.json index 9dc6e2db19..f437e1f774 100644 --- a/packages/strapi-plugin-content-manager/package.json +++ b/packages/strapi-plugin-content-manager/package.json @@ -53,4 +53,4 @@ "npm": ">= 6.0.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-plugin-content-type-builder/package.json b/packages/strapi-plugin-content-type-builder/package.json index d8945718e8..e3e83d4d28 100644 --- a/packages/strapi-plugin-content-type-builder/package.json +++ b/packages/strapi-plugin-content-type-builder/package.json @@ -51,4 +51,4 @@ "npm": ">= 6.0.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-plugin-email/package.json b/packages/strapi-plugin-email/package.json index 39f7b528fd..3794208763 100644 --- a/packages/strapi-plugin-email/package.json +++ b/packages/strapi-plugin-email/package.json @@ -51,4 +51,4 @@ "npm": ">= 6.0.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-plugin-graphql/package.json b/packages/strapi-plugin-graphql/package.json index 652920f3ce..648c88d399 100644 --- a/packages/strapi-plugin-graphql/package.json +++ b/packages/strapi-plugin-graphql/package.json @@ -54,4 +54,4 @@ "npm": ">= 6.0.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-plugin-graphql/test/graphqlRelations.test.e2e.js b/packages/strapi-plugin-graphql/test/graphqlRelations.test.e2e.js index 2959ea3d70..f1df53f016 100644 --- a/packages/strapi-plugin-graphql/test/graphqlRelations.test.e2e.js +++ b/packages/strapi-plugin-graphql/test/graphqlRelations.test.e2e.js @@ -13,7 +13,7 @@ const selectFields = doc => _.pick(doc, ['id', 'name']); const documentModel = { attributes: [ { - name: 'title', + name: 'name', params: { appearance: { WYSIWYG: false, @@ -126,7 +126,7 @@ describe('Test Graphql Relations API End to End', () => { documents: [], }; const labelsPayload = [{ name: 'label 1' }, { name: 'label 2' }]; - const documentsPayload = [{ title: 'document 1' }, { title: 'document 2' }]; + const documentsPayload = [{ name: 'document 1' }, { name: 'document 2' }]; test.each(labelsPayload)('Create label %o', async label => { const res = await graphqlQuery({ @@ -189,7 +189,7 @@ describe('Test Graphql Relations API End to End', () => { mutation createDocument($input: createDocumentInput) { createDocument(input: $input) { document { - title + name labels { id name @@ -230,7 +230,7 @@ describe('Test Graphql Relations API End to End', () => { { documents { id - title + name labels { id name @@ -245,10 +245,12 @@ describe('Test Graphql Relations API End to End', () => { expect(res.statusCode).toBe(200); expect(body).toMatchObject({ data: { - documents: documentsPayload.map(document => ({ - ...selectFields(document), - labels: data.labels.map(selectFields), - })), + documents: expect.arrayContaining( + documentsPayload.map(document => ({ + ...selectFields(document), + labels: expect.arrayContaining(data.labels.map(selectFields)), + })) + ), }, }); @@ -265,7 +267,7 @@ describe('Test Graphql Relations API End to End', () => { name documents { id - title + name } } } @@ -277,10 +279,12 @@ describe('Test Graphql Relations API End to End', () => { expect(res.statusCode).toBe(200); expect(body).toMatchObject({ data: { - labels: labelsPayload.map(label => ({ - ...selectFields(label), - documents: data.documents.map(selectFields), - })), + labels: expect.arrayContaining( + labelsPayload.map(label => ({ + ...selectFields(label), + documents: expect.arrayContaining(data.documents.map(selectFields)), + })) + ), }, }); @@ -294,7 +298,7 @@ describe('Test Graphql Relations API End to End', () => { { documents(where: { labels: { name_contains: "label 1" } }) { id - title + name labels { id name @@ -307,7 +311,7 @@ describe('Test Graphql Relations API End to End', () => { expect(res.statusCode).toBe(200); expect(res.body).toMatchObject({ data: { - documents: data.documents, + documents: expect.arrayContaining(data.documents), }, }); }); @@ -320,7 +324,7 @@ describe('Test Graphql Relations API End to End', () => { updateDocument(input: $input) { document { id - title + name labels { id name @@ -383,7 +387,7 @@ describe('Test Graphql Relations API End to End', () => { { documents { id - title + name labels { id name @@ -398,10 +402,12 @@ describe('Test Graphql Relations API End to End', () => { expect(res.statusCode).toBe(200); expect(body).toMatchObject({ data: { - documents: data.documents.map(document => ({ - ...selectFields(document), - labels: [], - })), + documents: expect.arrayContaining( + data.documents.map(document => ({ + ...selectFields(document), + labels: [], + })) + ), }, }); }); @@ -413,7 +419,7 @@ describe('Test Graphql Relations API End to End', () => { mutation deleteDocument($input: deleteDocumentInput) { deleteDocument(input: $input) { document { - title + name } } } diff --git a/packages/strapi-plugin-settings-manager/package.json b/packages/strapi-plugin-settings-manager/package.json index 14e6210081..e6ad03ef0d 100644 --- a/packages/strapi-plugin-settings-manager/package.json +++ b/packages/strapi-plugin-settings-manager/package.json @@ -53,4 +53,4 @@ "npm": ">= 6.0.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-plugin-upload/package.json b/packages/strapi-plugin-upload/package.json index bc62da0316..c64b3c697a 100644 --- a/packages/strapi-plugin-upload/package.json +++ b/packages/strapi-plugin-upload/package.json @@ -47,4 +47,4 @@ "npm": ">= 6.0.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-plugin-users-permissions/package.json b/packages/strapi-plugin-users-permissions/package.json index 8c80835e8f..fdf4ca0c25 100644 --- a/packages/strapi-plugin-users-permissions/package.json +++ b/packages/strapi-plugin-users-permissions/package.json @@ -56,4 +56,4 @@ "npm": ">= 6.0.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/test/e2e.js b/test/e2e.js index df48af6ca6..5f55099366 100644 --- a/test/e2e.js +++ b/test/e2e.js @@ -26,7 +26,7 @@ const test = async () => { }; const main = async () => { - const database = process.argv.length > 2 ? process.argv.slice(2).join(' ') : databases.mongo; + const database = process.argv.length > 2 ? process.argv.slice(2).join(' ') : databases.postgres; try { await cleanTestApp(appName);