Add latest changes from gitlab-org/gitlab@master

1 files changed, 17 insertions, 0 deletions

diff --git a/jest.config.js b/jest.config.js
new file mode 100644
index 00000000000..4627462c730
--- /dev/null
+++ b/jest.config.js
@@ -0,0 +1,17 @@
+const baseConfig = require('./jest.config.base');
+
+module.exports = {
+  ...baseConfig('spec/frontend'),
+};
+
+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);
+}