Resolve merge conflicts: prefer current branch (keep M2M and bot client changes)

2026-09-07 23:00:30 +07:00
parent 1bba2b518e 4401695e21
commit 06f4fd06ff
179 changed files with 11440 additions and 1786 deletions
@@ -1,6 +1,13 @@
 module.exports = {
  preset: 'ts-jest',
  testEnvironment: 'node',
-  testMatch: ['**/?(*.)+(spec|test).[tj]s?(x)'],
+  testMatch: ['**/tests/**/*.spec.ts', '**/?(*.)+(spec|test).[tj]s?(x)'],
+  testPathIgnorePatterns: ['/tests/api/', '/tests/integration/'],
  moduleFileExtensions: ['ts', 'js', 'json', 'node'],
+  globals: {
+    'ts-jest': {
+      tsconfig: 'tsconfig.json',
+    },
+  },
 };
+