Merge branch 'update-monaco-loader-test' into 'master'

Fix monaco loader test

See merge request !13682

.eslintrc

@@ -6,6 +6,7 @@
   },
   "extends": "airbnb-base",
   "globals": {
+    "__webpack_public_path__": true,
     "_": false,
     "gl": false,
     "gon": false,

app/assets/javascripts/repo/monaco_loader.js

@@ -1,13 +1,11 @@
-/* eslint-disable no-underscore-dangle, camelcase */
-/* global __webpack_public_path__ */
-
 import monacoContext from 'monaco-editor/dev/vs/loader';
 
 monacoContext.require.config({
   paths: {
-    vs: `${__webpack_public_path__}monaco-editor/vs`,
+    vs: `${__webpack_public_path__}monaco-editor/vs`, // eslint-disable-line camelcase
   },
 });
 
+// eslint-disable-next-line no-underscore-dangle
 window.__monaco_context__ = monacoContext;
 export default monacoContext.require;

app/assets/javascripts/webpack.js

@@ -5,5 +5,5 @@
  */
 
 if (gon && gon.webpack_public_path) {
-  __webpack_public_path__ = gon.webpack_public_path; // eslint-disable-line
+  __webpack_public_path__ = gon.webpack_public_path; // eslint-disable-line camelcase
 }

spec/javascripts/repo/monaco_loader_spec.js

@@ -1,17 +1,13 @@
-/* global __webpack_public_path__ */
 import monacoContext from 'monaco-editor/dev/vs/loader';
+import monacoLoader from '~/repo/monaco_loader';
 
 describe('MonacoLoader', () => {
   it('calls require.config and exports require', () => {
-    spyOn(monacoContext.require, 'config');
-
-    const monacoLoader = require('~/repo/monaco_loader'); // eslint-disable-line global-require
-
-    expect(monacoContext.require.config).toHaveBeenCalledWith({
+    expect(monacoContext.require.getConfig()).toEqual(jasmine.objectContaining({
       paths: {
         vs: `${__webpack_public_path__}monaco-editor/vs`, // eslint-disable-line camelcase
       },
-    });
-    expect(monacoLoader.default).toBe(monacoContext.require);
+    }));
+    expect(monacoLoader).toBe(monacoContext.require);
   });
 });