Add latest changes from gitlab-org/gitlab@master

2 files changed, 11 insertions, 12 deletions

diff --git a/spec/frontend/ide/lib/editor_spec.js b/spec/frontend/ide/lib/editor_spec.js
index c21a7edb2da..cb2437b9db1 100644
--- a/spec/frontend/ide/lib/editor_spec.js
+++ b/spec/frontend/ide/lib/editor_spec.js
@@ -16,14 +16,6 @@ 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');
@@ -272,6 +264,13 @@ 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);
@@ -292,7 +291,7 @@ describe('Multi-file editor library', () => {
       });
 
       it('sets renderSideBySide to false if el is less than 700 pixels', () => {
-        setNodeOffsetWidth(600);
+        setDiffNodeOffsetWidth(600);
 
         expect(instance.instance.updateOptions).not.toHaveBeenCalledWith({
           renderSideBySide: false,
@@ -300,7 +299,7 @@ describe('Multi-file editor library', () => {
       });
 
       it('sets renderSideBySide to false if el is more than 700 pixels', () => {
-        setNodeOffsetWidth(800);
+        setDiffNodeOffsetWidth(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 fd9d481251d..4efc0ac6028 100644
--- a/spec/frontend/ide/utils_spec.js
+++ b/spec/frontend/ide/utils_spec.js
@@ -1,4 +1,5 @@
 import { languages } from 'monaco-editor';
+import { setDiagnosticsOptions as yamlDiagnosticsOptions } from 'monaco-yaml';
 import {
   isTextFile,
   registerLanguages,
@@ -203,7 +204,6 @@ 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(languages.yaml.yamlDefaults.setDiagnosticsOptions).toHaveBeenCalledWith(
+      expect(yamlDiagnosticsOptions).toHaveBeenCalledWith(
         expect.objectContaining({ schemas: [schema] }),
       );
     });