Automatic merge of gitlab-org/gitlab-ce master

package.json

@@ -146,6 +146,7 @@
     "babel-plugin-rewire": "^1.2.0",
     "chalk": "^2.4.1",
     "commander": "^2.18.0",
+    "custom-jquery-matchers": "^2.1.0",
     "docdash": "^1.0.2",
     "eslint": "~5.9.0",
     "eslint-import-resolver-jest": "^2.1.1",

spec/javascripts/reports/components/report_section_spec.js → spec/frontend/reports/components/report_section_spec.js

 import Vue from 'vue';
 import reportSection from '~/reports/components/report_section.vue';
-import mountComponent, { mountComponentWithSlots } from 'spec/helpers/vue_mount_component_helper';
+import mountComponent, { mountComponentWithSlots } from 'helpers/vue_mount_component_helper';
 
 describe('Report section', () => {
   let vm;

spec/frontend/test_setup.js

 import Vue from 'vue';
+import * as jqueryMatchers from 'custom-jquery-matchers';
 import Translate from '~/vue_shared/translate';
 import axios from '~/lib/utils/axios_utils';
 import { initializeTestTimeout } from './helpers/timeout';
@@ -44,3 +45,10 @@ Object.assign(global, {
   preloadFixtures() {},
   setFixtures: setHTMLFixture,
 });
+
+// custom-jquery-matchers was written for an old Jest version, we need to make it compatible
+Object.entries(jqueryMatchers).forEach(([matcherName, matcherFactory]) => {
+  expect.extend({
+    [matcherName]: matcherFactory().compare,
+  });
+});

yarn.lock

@@ -2742,6 +2742,11 @@ custom-event@~1.0.0:
   resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
   integrity sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=
 
+custom-jquery-matchers@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/custom-jquery-matchers/-/custom-jquery-matchers-2.1.0.tgz#e5988fa9715c416b0986b372563f872d9e91e024"
+  integrity sha512-f2vQrncnwqbeDne9ag/BRjrmG9BxIEKnZ9Z8TyG5l9B8wwyINWd7LvuHDlTkMPqLTd3ghcvqFoTsxjhOP371JQ==
+
 cyclist@~0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"