diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-23 21:11:55 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-23 21:11:55 +0300 |
commit | 0eb05ee0ea5d4e88a1cae604f7ff92507f16d4b0 (patch) | |
tree | d63a079b11cb16c6a196de48858e299ffbabd12d /spec/frontend/__mocks__ | |
parent | e01e71a98f4c2d3492d99993d67e7277a2ead698 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/__mocks__')
-rw-r--r-- | spec/frontend/__mocks__/monaco-editor/index.js | 2 | ||||
-rw-r--r-- | spec/frontend/__mocks__/monaco-yaml/index.js | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/spec/frontend/__mocks__/monaco-editor/index.js b/spec/frontend/__mocks__/monaco-editor/index.js index d09672a4ecf..384f9993150 100644 --- a/spec/frontend/__mocks__/monaco-editor/index.js +++ b/spec/frontend/__mocks__/monaco-editor/index.js @@ -8,8 +8,10 @@ import 'monaco-editor/esm/vs/language/css/monaco.contribution'; import 'monaco-editor/esm/vs/language/json/monaco.contribution'; import 'monaco-editor/esm/vs/language/html/monaco.contribution'; import 'monaco-editor/esm/vs/basic-languages/monaco.contribution'; +import 'monaco-yaml/lib/esm/monaco.contribution'; // This language starts trying to spin up web workers which obviously breaks in Jest environment jest.mock('monaco-editor/esm/vs/language/typescript/tsMode'); +jest.mock('monaco-yaml/lib/esm/yamlMode'); export * from 'monaco-editor/esm/vs/editor/editor.api'; diff --git a/spec/frontend/__mocks__/monaco-yaml/index.js b/spec/frontend/__mocks__/monaco-yaml/index.js deleted file mode 100644 index 36681854d0b..00000000000 --- a/spec/frontend/__mocks__/monaco-yaml/index.js +++ /dev/null @@ -1,4 +0,0 @@ -const setDiagnosticsOptions = jest.fn(); -const yamlDefaults = {}; - -export { setDiagnosticsOptions, yamlDefaults }; |