diff options
author | ThibG <thib@sitedethib.com> | 2019-02-01 18:24:36 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-01 18:24:36 +0100 |
commit | 1cd7b15532f0cbfeec42460be434bbc9a117764d (patch) | |
tree | c579bf0580d7b027c810ca2abc86dc885c5b5b12 /jest.config.js | |
parent | f611da489929d2592b61b0c0f7c870ae33782343 (diff) | |
parent | 663593b508e419cb1a4f9f93ce75e0065e0833d4 (diff) |
Merge pull request #904 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'jest.config.js')
-rw-r--r-- | jest.config.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/jest.config.js b/jest.config.js index dc61b9a9d..ae6c96f33 100644 --- a/jest.config.js +++ b/jest.config.js @@ -23,4 +23,8 @@ module.exports = { '!app/javascript/mastodon/test_setup.js', ], coverageDirectory: '<rootDir>/coverage', + moduleDirectories: [ + '<rootDir>/node_modules', + '<rootDir>/app/javascript', + ], }; |