summaryrefslogtreecommitdiff
path: root/jest.config.js
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-18 11:18:50 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-18 11:18:50 +0000
commit8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch)
treea77e7fe7a93de11213032ed4ab1f33a3db51b738 /jest.config.js
parent00b35af3db1abfe813a778f643dad221aad51fca (diff)
downloadgitlab-ce-8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781.tar.gz
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'jest.config.js')
-rw-r--r--jest.config.js17
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);
+}