syncing up to 467560a3b0dcccfa7c7bf4302c939222366f9e77

Co-authored-by: Joey Greco <[email protected]>

workers/javascript/jest.config.js

@@ -1,21 +1,25 @@
 module.exports = {
-  roots : [ '<rootDir>/' ],
-  collectCoverageFrom : [ 'src/**/*.ts', '!src/gen/**' ],
-  collectCoverage : true,
-  coverageProvider : 'v8', // jest sometimes returns exit code 1 on coverage
-                           // after codegen files
-  coveragePathIgnorePatterns : [ 'local.test.ts' ],
-  setupFilesAfterEnv : [ '<rootDir>/.jest/setupEnv.ts' ],
-  transform : {'^.+\\.(png|ts|tsx)$' : 'ts-jest'},
-  testRegex : '(/__tests__/.*|(\\.)(test|spec))\\.tsx?$',
-  moduleFileExtensions : [ 'ts', 'tsx', 'js', 'jsx', 'json', 'node', 'css' ],
-  moduleDirectories : [ 'node_modules', 'src' ],
-  transformIgnorePatterns : [ '<rootDir>/node_modules/' ],
-  moduleNameMapper : {
-    '\\.(css|less)$' : '<rootDir>/test/__mocks__/styleMock.js',
-    '\\.svg$' : '<rootDir>/test/__mocks__/svgMock.js',
-    '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$' : '<rootDir>/test/__mocks__/fileMock.js'
+  roots: ['<rootDir>/'],
+  collectCoverageFrom: ['src/**/*.ts', '!src/gen/**'],
+  collectCoverage: true,
+  coverageProvider: 'v8', // jest sometimes returns exit code 1 on coverage
+  // after codegen files
+  coveragePathIgnorePatterns: ['local.test.ts'],
+  setupFilesAfterEnv: ['<rootDir>/.jest/setupEnv.ts'],
+  transform: { '^.+\\.(png|ts|tsx)$': 'ts-jest' },
+  testRegex: '(/__tests__/.*|(\\.)(test|spec))\\.tsx?$',
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node', 'css'],
+  moduleDirectories: ['node_modules', 'src'],
+  transformIgnorePatterns: ['<rootDir>/node_modules/'],
+  moduleNameMapper: {
+    '\\.(css|less)$': '<rootDir>/test/__mocks__/styleMock.js',
+    '\\.svg$': '<rootDir>/test/__mocks__/svgMock.js',
+    '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '<rootDir>/test/__mocks__/fileMock.js'
   },
-  passWithNoTests : true,
-  testPathIgnorePatterns : [ 'local.test.ts', 'test/apis' ]
+  passWithNoTests: true,
+  testPathIgnorePatterns: ['local.test.ts', 'test/apis'],
+  // https://jestjs.io/docs/configuration#testtimeout-number
+  // default timeout of test in milliseconds
+  // 10 seconds by default, can overwrite in test file
+  testTimeout: 10000
 };

workers/javascript/packages/plugins/mariadb/src/e2e.test.ts

@@ -18,9 +18,6 @@ import { cloneDeep } from 'lodash';
 import { Connection, createConnection } from 'mariadb';
 import MariaDBPlugin from '.';
 
-const SECOND = 1000;
-jest.setTimeout(10 * SECOND);
-
 const MARIADB_HOST = '127.0.0.1';
 const MARIADB_PORT = 23306;
 const MARIADB_USER = 'root';