diff options
author | David Yip <yipdw@member.fsf.org> | 2017-10-22 22:57:41 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-10-22 22:57:41 -0500 |
commit | 4f01e6e8d538c293b8e976bc9a4aba5afa8f9f6a (patch) | |
tree | 4d7deddbe38ac95171c24d1409a68cd19fe30638 /package.json | |
parent | d589dd7cd0512b558412a38a935b1a9cdcbf0ce7 (diff) | |
parent | fdb0848e08f34ee967ae2d0ad24cd994e996169b (diff) |
Merge remote-tracking branch 'origin/master' into gs-master
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/package.json b/package.json index 5856b56db..8d24c7850 100644 --- a/package.json +++ b/package.json @@ -135,22 +135,5 @@ }, "optionalDependencies": { "fsevents": "*" - }, - "jest": { - "projects": [ - "<rootDir>/app/javascript/mastodon" - ], - "testPathIgnorePatterns": [ - "<rootDir>/node_modules/", - "<rootDir>/vendor/", - "<rootDir>/config/", - "<rootDir>/log/", - "<rootDir>/public/", - "<rootDir>/tmp/" - ], - "setupFiles": [ - "raf/polyfill" - ], - "setupTestFrameworkScriptFile": "<rootDir>/app/javascript/mastodon/test_setup.js" } } |