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/ide | |
parent | e01e71a98f4c2d3492d99993d67e7277a2ead698 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/ide')
-rw-r--r-- | spec/frontend/ide/lib/editor_spec.js | 19 | ||||
-rw-r--r-- | spec/frontend/ide/utils_spec.js | 4 |
2 files changed, 12 insertions, 11 deletions
diff --git a/spec/frontend/ide/lib/editor_spec.js b/spec/frontend/ide/lib/editor_spec.js index cb2437b9db1..c21a7edb2da 100644 --- a/spec/frontend/ide/lib/editor_spec.js +++ b/spec/frontend/ide/lib/editor_spec.js @@ -16,6 +16,14 @@ describe('Multi-file editor library', () => { let holder; let store; + const setNodeOffsetWidth = (val) => { + Object.defineProperty(instance.instance.getDomNode(), 'offsetWidth', { + get() { + return val; + }, + }); + }; + beforeEach(() => { store = createStore(); el = document.createElement('div'); @@ -264,13 +272,6 @@ describe('Multi-file editor library', () => { }); describe('updateDiffView', () => { - const setDiffNodeOffsetWidth = (val) => { - Object.defineProperty(instance.instance.getContainerDomNode(), 'offsetWidth', { - get() { - return val; - }, - }); - }; describe('edit mode', () => { it('does not update options', () => { instance.createInstance(holder); @@ -291,7 +292,7 @@ describe('Multi-file editor library', () => { }); it('sets renderSideBySide to false if el is less than 700 pixels', () => { - setDiffNodeOffsetWidth(600); + setNodeOffsetWidth(600); expect(instance.instance.updateOptions).not.toHaveBeenCalledWith({ renderSideBySide: false, @@ -299,7 +300,7 @@ describe('Multi-file editor library', () => { }); it('sets renderSideBySide to false if el is more than 700 pixels', () => { - setDiffNodeOffsetWidth(800); + setNodeOffsetWidth(800); expect(instance.instance.updateOptions).not.toHaveBeenCalledWith({ renderSideBySide: true, diff --git a/spec/frontend/ide/utils_spec.js b/spec/frontend/ide/utils_spec.js index 4efc0ac6028..fd9d481251d 100644 --- a/spec/frontend/ide/utils_spec.js +++ b/spec/frontend/ide/utils_spec.js @@ -1,5 +1,4 @@ import { languages } from 'monaco-editor'; -import { setDiagnosticsOptions as yamlDiagnosticsOptions } from 'monaco-yaml'; import { isTextFile, registerLanguages, @@ -204,6 +203,7 @@ describe('WebIDE utils', () => { }; jest.spyOn(languages.json.jsonDefaults, 'setDiagnosticsOptions'); + jest.spyOn(languages.yaml.yamlDefaults, 'setDiagnosticsOptions'); }); it('registers the given schemas with monaco for both json and yaml languages', () => { @@ -212,7 +212,7 @@ describe('WebIDE utils', () => { expect(languages.json.jsonDefaults.setDiagnosticsOptions).toHaveBeenCalledWith( expect.objectContaining({ schemas: [schema] }), ); - expect(yamlDiagnosticsOptions).toHaveBeenCalledWith( + expect(languages.yaml.yamlDefaults.setDiagnosticsOptions).toHaveBeenCalledWith( expect.objectContaining({ schemas: [schema] }), ); }); |