Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot
2020-05-20 21:09:09 +00:00
parent f781b0b693
commit 1902e25626
35 changed files with 254 additions and 112 deletions

17
jest.config.js Normal file
View File

@ -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);
}