diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-11 06:10:11 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-11 06:10:11 +0000 |
commit | 65a1175e466105fca1f40cb5a995fdb100ff334e (patch) | |
tree | 562573b4fc7a0cd748d07d6a1720b4b13d36386a /jest.config.js | |
parent | 3a52deac114dda8a1ee0da597c148b0dfc5dcf35 (diff) | |
download | gitlab-ce-65a1175e466105fca1f40cb5a995fdb100ff334e.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'jest.config.js')
-rw-r--r-- | jest.config.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/jest.config.js b/jest.config.js index 102d0fb8b4c..e9e1a598608 100644 --- a/jest.config.js +++ b/jest.config.js @@ -35,7 +35,7 @@ const moduleNameMapper = { '^ee_else_ce(/.*)$': '<rootDir>/app/assets/javascripts$1', '^helpers(/.*)$': '<rootDir>/spec/frontend/helpers$1', '^vendor(/.*)$': '<rootDir>/vendor/assets/javascripts$1', - '\\.(jpg|jpeg|png|svg)$': '<rootDir>/spec/frontend/__mocks__/file_mock.js', + '\\.(jpg|jpeg|png|svg|css)$': '<rootDir>/spec/frontend/__mocks__/file_mock.js', 'emojis(/.*).json': '<rootDir>/fixtures/emojis$1.json', '^spec/test_constants$': '<rootDir>/spec/frontend/helpers/test_constants', '^jest/(.*)$': '<rootDir>/spec/frontend/$1', @@ -82,7 +82,7 @@ module.exports = { '^.+\\.js$': 'babel-jest', '^.+\\.vue$': 'vue-jest', }, - transformIgnorePatterns: ['node_modules/(?!(@gitlab/ui|bootstrap-vue|three)/)'], + transformIgnorePatterns: ['node_modules/(?!(@gitlab/ui|bootstrap-vue|three|monaco-editor)/)'], timers: 'fake', testEnvironment: '<rootDir>/spec/frontend/environment.js', testEnvironmentOptions: { |