fix: improve jest test setup

webiny · Oct 29, 2021 · 303f15e · 303f15e
1 parent aea68cc
commit 303f15e
Show file tree

Hide file tree

Showing 86 changed files with 451 additions and 718 deletions.
diff --git a/jest.config.base.js b/jest.config.base.js
@@ -1,13 +1,10 @@
+const findUp = require("find-up");
 const { basename } = require("path");
 const merge = require("merge");
 const tsPreset = require("ts-jest/presets/js-with-babel/jest-preset");
 const { version } = require("@webiny/cli/package.json");
 
-process.env.DB_TABLE = "DynamoDB";
-process.env.DB_TABLE_ELASTICSEARCH = "ElasticSearchStream";
-process.env.WEBINY_VERSION = version;
-
-module.exports = ({ path }, presets = []) => {
+module.exports = function ({ path }, presets = []) {
     const name = basename(path);
 
     // Enables us to run tests of only a specific type (for example "integration" or "e2e").
@@ -43,3 +40,59 @@ module.exports = ({ path }, presets = []) => {
         coverageReporters: ["html"]
     });
 };
+
+process.env.DB_TABLE = "DynamoDB";
+process.env.DB_TABLE_ELASTICSEARCH = "ElasticsearchStream";
+process.env.WEBINY_VERSION = version;
+
+const createDynaliteTables = () => {
+    return {
+        tables: [
+            {
+                TableName: process.env.DB_TABLE,
+                KeySchema: [
+                    { AttributeName: "PK", KeyType: "HASH" },
+                    { AttributeName: "SK", KeyType: "RANGE" }
+                ],
+                AttributeDefinitions: [
+                    { AttributeName: "PK", AttributeType: "S" },
+                    { AttributeName: "SK", AttributeType: "S" },
+                    { AttributeName: "GSI1_PK", AttributeType: "S" },
+                    { AttributeName: "GSI1_SK", AttributeType: "S" }
+                ],
+                ProvisionedThroughput: { ReadCapacityUnits: 1, WriteCapacityUnits: 1 },
+                GlobalSecondaryIndexes: [
+                    {
+                        IndexName: "GSI1",
+                        KeySchema: [
+                            { AttributeName: "GSI1_PK", KeyType: "HASH" },
+                            { AttributeName: "GSI1_SK", KeyType: "RANGE" }
+                        ],
+                        Projection: {
+                            ProjectionType: "ALL"
+                        },
+                        ProvisionedThroughput: {
+                            ReadCapacityUnits: 1,
+                            WriteCapacityUnits: 1
+                        }
+                    }
+                ]
+            },
+            {
+                TableName: process.env.DB_TABLE_ELASTICSEARCH,
+                KeySchema: [
+                    { AttributeName: "PK", KeyType: "HASH" },
+                    { AttributeName: "SK", KeyType: "RANGE" }
+                ],
+                AttributeDefinitions: [
+                    { AttributeName: "PK", AttributeType: "S" },
+                    { AttributeName: "SK", AttributeType: "S" }
+                ],
+                ProvisionedThroughput: { ReadCapacityUnits: 1, WriteCapacityUnits: 1 }
+            }
+        ],
+        basePort: 8000
+    };
+};
+
+module.exports.createDynaliteTables = createDynaliteTables;
diff --git a/packages/api-admin-users-cognito-so-ddb/__tests__/__api__/setupAfterEnv.js b/packages/api-admin-users-cognito-so-ddb/__tests__/__api__/setupAfterEnv.js
@@ -10,15 +10,27 @@ jestDynalite.setup(path.resolve(__dirname, "../../"));
  */
 beforeAll(async () => {
     await jestDynalite.startDb();
+    if (typeof __beforeAll === "function") {
+        await __beforeAll();
+    }
 });
 
 beforeEach(async () => {
     await jestDynalite.createTables();
+    if (typeof __beforeEach === "function") {
+        await __beforeEach();
+    }
 });
 afterEach(async () => {
     await jestDynalite.deleteTables();
+    if (typeof __afterEach === "function") {
+        await __afterEach();
+    }
 });
 
 afterAll(async () => {
     await jestDynalite.stopDb();
+    if (typeof __afterAll === "function") {
+        await __afterAll();
+    }
 });
diff --git a/packages/api-admin-users-cognito-so-ddb/jest-dynalite-config.js b/packages/api-admin-users-cognito-so-ddb/jest-dynalite-config.js
@@ -1,35 +1,2 @@
-module.exports = {
-    tables: [
-        {
-            TableName: process.env.DB_TABLE,
-            KeySchema: [
-                { AttributeName: "PK", KeyType: "HASH" },
-                { AttributeName: "SK", KeyType: "RANGE" }
-            ],
-            AttributeDefinitions: [
-                { AttributeName: "PK", AttributeType: "S" },
-                { AttributeName: "SK", AttributeType: "S" },
-                { AttributeName: "GSI1_PK", AttributeType: "S" },
-                { AttributeName: "GSI1_SK", AttributeType: "S" }
-            ],
-            ProvisionedThroughput: { ReadCapacityUnits: 1, WriteCapacityUnits: 1 },
-            GlobalSecondaryIndexes: [
-                {
-                    IndexName: "GSI1",
-                    KeySchema: [
-                        { AttributeName: "GSI1_PK", KeyType: "HASH" },
-                        { AttributeName: "GSI1_SK", KeyType: "RANGE" }
-                    ],
-                    Projection: {
-                        ProjectionType: "ALL"
-                    },
-                    ProvisionedThroughput: {
-                        ReadCapacityUnits: 1,
-                        WriteCapacityUnits: 1
-                    }
-                }
-            ]
-        }
-    ],
-    basePort: 8000
-};
+const { createDynaliteTables } = require("../../jest.config.base");
+module.exports = createDynaliteTables();
diff --git a/packages/api-file-manager-ddb-es/__tests__/__api__/environment.js b/packages/api-file-manager-ddb-es/__tests__/__api__/environment.js
@@ -10,6 +10,9 @@ const NodeEnvironment = require("jest-environment-node");
 const elasticsearchDataGzipCompression =
     require("@webiny/api-elasticsearch/plugins/GzipCompression").default;
 const { ContextPlugin } = require("@webiny/handler/plugins/ContextPlugin");
+const {
+    elasticIndexManager
+} = require("@webiny/project-utils/testing/helpers/elasticIndexManager");
 /**
  * For this to work it must load plugins that have already been built
  */
@@ -21,24 +24,6 @@ if (typeof plugins !== "function") {
 
 const ELASTICSEARCH_PORT = process.env.ELASTICSEARCH_PORT || "9200";
 
-const getStorageOperationsPlugins = ({ documentClient, elasticsearchClientContext }) => {
-    return () => {
-        const pluginsValue = plugins();
-        const dbPluginsValue = dbPlugins({
-            table: process.env.DB_TABLE,
-            driver: new DynamoDbDriver({
-                documentClient
-            })
-        });
-        return [
-            elasticsearchDataGzipCompression(),
-            ...pluginsValue,
-            ...dbPluginsValue,
-            elasticsearchClientContext
-        ];
-    };
-};
-
 class FileManagerTestEnvironment extends NodeEnvironment {
     async setup() {
         await super.setup();
@@ -68,29 +53,28 @@ class FileManagerTestEnvironment extends NodeEnvironment {
         });
         simulateStream(documentClient, createHandler(simulationContext, dynamoToElastic()));
 
-        const clearEsIndices = async () => {
-            return elasticsearchClient.indices.delete({
-                index: "_all"
-            });
-        };
         /**
          * This is a global function that will be called inside the tests to get all relevant plugins, methods and objects.
          */
         this.global.__getStorageOperationsPlugins = () => {
-            return getStorageOperationsPlugins({
-                elasticsearchClientContext,
-                documentClient
-            });
+            return () => {
+                const pluginsValue = plugins();
+                const dbPluginsValue = dbPlugins({
+                    table: process.env.DB_TABLE,
+                    driver: new DynamoDbDriver({
+                        documentClient
+                    })
+                });
+                return [
+                    elasticsearchDataGzipCompression(),
+                    ...pluginsValue,
+                    ...dbPluginsValue,
+                    elasticsearchClientContext
+                ];
+            };
         };
-        this.global.__beforeEach = async () => {
-            await clearEsIndices();
-            return elasticsearchClient.indices.create({
-                index: "root-file-manager"
-            });
-        };
-        this.global.__afterEach = clearEsIndices;
-        this.global.__beforeAll = clearEsIndices;
-        this.global.__afterAll = clearEsIndices;
+
+        elasticIndexManager(this.global, elasticsearchClient);
     }
 }
 

diff --git a/packages/api-file-manager-ddb-es/__tests__/__api__/setupAfterEnv.js b/packages/api-file-manager-ddb-es/__tests__/__api__/setupAfterEnv.js
@@ -10,19 +10,27 @@ jestDynalite.setup(path.resolve(__dirname, "../../"));
  */
 beforeAll(async () => {
     await jestDynalite.startDb();
-    //await __beforeAll();
+    if (typeof __beforeAll === "function") {
+        await __beforeAll();
+    }
 });
 
 beforeEach(async () => {
     await jestDynalite.createTables();
-    await __beforeEach();
+    if (typeof __beforeEach === "function") {
+        await __beforeEach();
+    }
 });
 afterEach(async () => {
     await jestDynalite.deleteTables();
-    await __afterEach();
+    if (typeof __afterEach === "function") {
+        await __afterEach();
+    }
 });
 
 afterAll(async () => {
     await jestDynalite.stopDb();
-    //await __afterAll();
+    if (typeof __afterAll === "function") {
+        await __afterAll();
+    }
 });
diff --git a/packages/api-file-manager-ddb-es/jest-dynalite-config.js b/packages/api-file-manager-ddb-es/jest-dynalite-config.js
@@ -1,29 +1,3 @@
-module.exports = {
-    tables: [
-        {
-            TableName: process.env.DB_TABLE,
-            KeySchema: [
-                { AttributeName: "PK", KeyType: "HASH" },
-                { AttributeName: "SK", KeyType: "RANGE" }
-            ],
-            AttributeDefinitions: [
-                { AttributeName: "PK", AttributeType: "S" },
-                { AttributeName: "SK", AttributeType: "S" }
-            ],
-            ProvisionedThroughput: { ReadCapacityUnits: 1, WriteCapacityUnits: 1 }
-        },
-        {
-            TableName: process.env.DB_TABLE_ELASTICSEARCH,
-            KeySchema: [
-                { AttributeName: "PK", KeyType: "HASH" },
-                { AttributeName: "SK", KeyType: "RANGE" }
-            ],
-            AttributeDefinitions: [
-                { AttributeName: "PK", AttributeType: "S" },
-                { AttributeName: "SK", AttributeType: "S" }
-            ],
-            ProvisionedThroughput: { ReadCapacityUnits: 1, WriteCapacityUnits: 1 }
-        }
-    ],
-    basePort: 8000
-};
+const { createDynaliteTables } = require("../../jest.config.base");
+
+module.exports = createDynaliteTables();
diff --git a/packages/api-file-manager-ddb-es/src/definitions/table.ts b/packages/api-file-manager-ddb-es/src/definitions/table.ts
@@ -1,12 +1,11 @@
 import { Table } from "dynamodb-toolbox";
-import configurations from "~/operations/configurations";
 import { getDocumentClient, getTable } from "~/operations/utils";
 import { FileManagerContext } from "@webiny/api-file-manager/types";
 
 export default (params: { context: FileManagerContext }): Table => {
     const { context } = params;
     return new Table({
-        name: configurations.db().table || getTable(context),
+        name: process.env.DB_TABLE || getTable(context),
         partitionKey: "PK",
         sortKey: "SK",
         DocumentClient: getDocumentClient(context)

diff --git a/packages/api-file-manager-ddb-es/src/operations/configurations.ts b/packages/api-file-manager-ddb-es/src/operations/configurations.ts
@@ -2,7 +2,7 @@ import { FileManagerContext } from "@webiny/api-file-manager/types";
 
 export default {
     db: () => ({
-        table: process.env.DB_TABLE_FILE_MANGER || process.env.DB_TABLE,
+        table: process.env.DB_TABLE,
         keys: [
             {
                 primary: true,

diff --git a/packages/api-file-manager-ddb/__tests__/__api__/environment.js b/packages/api-file-manager-ddb/__tests__/__api__/environment.js
@@ -3,6 +3,7 @@ const { DynamoDbDriver } = require("@webiny/db-dynamodb");
 const dynamoDbPlugins = require("@webiny/db-dynamodb/plugins").default;
 const { DocumentClient } = require("aws-sdk/clients/dynamodb");
 const NodeEnvironment = require("jest-environment-node");
+
 /**
  * For this to work it must load plugins that have already been built
  */
@@ -12,21 +13,6 @@ if (typeof plugins !== "function") {
     throw new Error(`Loaded plugins file must export a function that returns an array of plugins.`);
 }
 
-const getStorageOperationsPlugins = ({ documentClient }) => {
-    return () => {
-        return [
-            ...dynamoDbPlugins(),
-            ...plugins(),
-            ...dbPlugins({
-                table: process.env.DB_TABLE,
-                driver: new DynamoDbDriver({
-                    documentClient
-                })
-            })
-        ];
-    };
-};
-
 class FileManagerTestEnvironment extends NodeEnvironment {
     async setup() {
         await super.setup();
@@ -43,9 +29,18 @@ class FileManagerTestEnvironment extends NodeEnvironment {
          * This is a global function that will be called inside the tests to get all relevant plugins, methods and objects.
          */
         this.global.__getStorageOperationsPlugins = () => {
-            return getStorageOperationsPlugins({
-                documentClient
-            });
+            return () => {
+                return [
+                    ...dynamoDbPlugins(),
+                    ...plugins(),
+                    ...dbPlugins({
+                        table: process.env.DB_TABLE,
+                        driver: new DynamoDbDriver({
+                            documentClient
+                        })
+                    })
+                ];
+            };
         };
     }
 }

diff --git a/packages/api-file-manager-ddb/__tests__/__api__/setupAfterEnv.js b/packages/api-file-manager-ddb/__tests__/__api__/setupAfterEnv.js
@@ -10,15 +10,27 @@ jestDynalite.setup(path.resolve(__dirname, "../../"));
  */
 beforeAll(async () => {
     await jestDynalite.startDb();
+    if (typeof __beforeAll === "function") {
+        await __beforeAll();
+    }
 });
 
 beforeEach(async () => {
     await jestDynalite.createTables();
+    if (typeof __beforeEach === "function") {
+        await __beforeEach();
+    }
 });
 afterEach(async () => {
     await jestDynalite.deleteTables();
+    if (typeof __afterEach === "function") {
+        await __afterEach();
+    }
 });
 
 afterAll(async () => {
     await jestDynalite.stopDb();
+    if (typeof __afterAll === "function") {
+        await __afterAll();
+    }
 });