Add latest changes from gitlab-org/gitlab@12-3-stable

1 files changed, 0 insertions, 13 deletions

diff --git a/jest.config.js b/jest.config.js
index 34581c6532a..646648c6928 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -41,7 +41,6 @@ module.exports = {
     '^vendor(/.*)$': '<rootDir>/vendor/assets/javascripts$1',
     '\\.(jpg|jpeg|png|svg)$': '<rootDir>/spec/frontend/__mocks__/file_mock.js',
     'emojis(/.*).json': '<rootDir>/fixtures/emojis$1.json',
-    '^spec/test_constants$': '<rootDir>/spec/frontend/helpers/test_constants',
   },
   collectCoverageFrom: ['<rootDir>/app/assets/javascripts/**/*.{js,vue}'],
   coverageDirectory: '<rootDir>/coverage-frontend/',
@@ -63,15 +62,3 @@ module.exports = {
     IS_EE,
   },
 };
-
-const karmaTestFile = process.argv.find(arg => arg.includes('spec/javascripts/'));
-if (karmaTestFile) {
-  console.error(`
-Files in spec/javascripts/ and ee/spec/javascripts need to be run with Karma.
-Please use the following command instead:
-
-yarn karma -f ${karmaTestFile}
-
-`);
-  process.exit(1);
-}