kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'winh-eslint-import-resolver-jest-workaround' into 'master' 

Workaround ESLint only resolving paths in test files

Closes #64061

See merge request gitlab-org/gitlab-ce!30296
This commit is contained in:
Clement Ho 2019-07-10 13:27:40 +00:00
parent 863930cdfc a5d4c5879f
commit e787676b37
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jest.config.js
View File

@ -15,9 +15,18 @@ if (process.env.CI) {
]);
}
let testMatch = ['<rootDir>/spec/frontend/**/*_spec.js', '<rootDir>/ee/spec/frontend/**/*_spec.js'];
// workaround for eslint-import-resolver-jest only resolving in test files
// see https://github.com/JoinColony/eslint-import-resolver-jest#note
const isESLint = module.parent.path.includes('/eslint-import-resolver-jest/');
if (isESLint) {
testMatch = testMatch.map(path => path.replace('_spec.js', ''));
}
// eslint-disable-next-line import/no-commonjs
module.exports = {
testMatch: ['<rootDir>/spec/frontend/**/*_spec.js', '<rootDir>/ee/spec/frontend/**/*_spec.js'],
testMatch,
moduleFileExtensions: ['js', 'json', 'vue'],
moduleNameMapper: {
'^~(/.*)$': '<rootDir>/app/assets/javascripts$1',

2
spec/frontend/error_tracking_settings/mock.js
View File

@ -1,5 +1,5 @@
import createStore from '~/error_tracking_settings/store';
import { TEST_HOST } from '../helpers/test_constants';
import { TEST_HOST } from 'helpers/test_constants';
const defaultStore = createStore();