Merge remote-tracking branch 'origin/master' into gs-master

2017-10-22 22:57:41 -05:00
parent d589dd7cd0 fdb0848e08
commit 4f01e6e8d5
6 changed files with 12 additions and 29 deletions
--- 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"
  }
 }