Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

1 files changed, 6 insertions, 2 deletions

diff --git a/jest.config.base.js b/jest.config.base.js
index d4b1ace3b2c..d90a3b9825e 100644
--- a/jest.config.base.js
+++ b/jest.config.base.js
@@ -146,9 +146,11 @@ module.exports = (path, options = {}) => {
     'monaco-yaml',
     'fast-mersenne-twister',
     'prosemirror-markdown',
+    'marked',
     'fault',
     'dateformat',
     'lowlight',
+    'vscode-languageserver-types',
     ...gfmParserDependencies,
   ];
 
@@ -168,21 +170,23 @@ module.exports = (path, options = {}) => {
     resolver: './jest_resolver.js',
     setupFilesAfterEnv: [`<rootDir>/${path}/test_setup.js`, 'jest-canvas-mock'],
     restoreMocks: true,
+    slowTestThreshold: process.env.CI ? 6000 : 500,
     transform: {
       '^.+\\.(gql|graphql)$': 'jest-transform-graphql',
       '^.+_worker\\.js$': './spec/frontend/__helpers__/web_worker_transformer.js',
       '^.+\\.js$': 'babel-jest',
-      '^.+\\.vue$': 'vue-jest',
+      '^.+\\.vue$': '@vue/vue2-jest',
       'spec/frontend/editor/schema/ci/yaml_tests/.+\\.(yml|yaml)$':
         './spec/frontend/__helpers__/yaml_transformer.js',
       '^.+\\.(md|zip|png|yml|yaml)$': 'jest-raw-loader',
     },
     transformIgnorePatterns: [`node_modules/(?!(${transformIgnoreNodeModules.join('|')}))`],
-    timers: 'fake',
+    timers: 'legacy',
     testEnvironment: '<rootDir>/spec/frontend/environment.js',
     testEnvironmentOptions: {
       IS_EE,
       IS_JH,
     },
+    testRunner: 'jest-jasmine2',
   };
 };