1 files changed, 47 insertions, 5 deletions
diff --git a/webapp/package.json b/webapp/package.json
index f0b1b8bb2..9f53c848f 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -1,6 +1,8 @@
 {
   "name": "mattermost-webapp",
-  "browser": {"./client/web_client.jsx": "./client/browser_web_client.jsx"},
+  "browser": {
+    "./client/web_client.jsx": "./client/browser_web_client.jsx"
+  },
   "version": "0.0.1",
   "private": true,
   "dependencies": {
@@ -39,6 +41,7 @@
   "devDependencies": {
     "babel-core": "6.24.0",
     "babel-eslint": "7.1.1",
+    "babel-jest": "19.0.0",
     "babel-loader": "6.4.0",
     "babel-plugin-transform-runtime": "6.23.0",
     "babel-polyfill": "6.23.0",
@@ -48,6 +51,8 @@
     "copy-webpack-plugin": "4.0.1",
     "cross-env": "3.2.3",
     "css-loader": "0.27.3",
+    "enzyme": "2.7.1",
+    "enzyme-to-json": "1.5.0",
     "eslint": "3.17.1",
     "eslint-plugin-react": "6.10.0",
     "exports-loader": "0.6.4",
@@ -55,29 +60,66 @@
     "file-loader": "0.10.1",
     "html-loader": "0.4.5",
     "html-webpack-plugin": "2.28.0",
+    "identity-obj-proxy": "3.0.0",
     "image-webpack-loader": "3.2.0",
     "imports-loader": "0.7.1",
+    "jest": "19.0.2",
+    "jest-cli": "19.0.2",
     "jquery-deferred": "0.3.1",
     "jsdom": "9.12.0",
     "jsdom-global": "2.1.1",
     "json-loader": "0.5.4",
-    "mocha": "3.2.0",
-    "mocha-jsdom": "1.1.0",
-    "mocha-webpack": "0.7.0",
     "node-sass": "4.5.0",
     "raw-loader": "0.5.1",
     "react-addons-test-utils": "15.4.2",
+    "react-dom": "15.4.2",
     "sass-loader": "6.0.3",
     "style-loader": "0.13.2",
     "url-loader": "0.5.8",
     "webpack": "2.2.1",
     "webpack-node-externals": "1.5.4"
   },
+  "jest": {
+    "snapshotSerializers": [
+      "<rootDir>/node_modules/enzyme-to-json/serializer"
+    ],
+    "testPathIgnorePatterns": [
+      "/node_modules/",
+      "/non_npm_dependencies/"
+    ],
+    "collectCoverageFrom": [
+      "actions/**/*.{js,jsx}",
+      "client/**/*.{js,jsx}",
+      "components/**/*.{js,jsx}",
+      "routes/**/*.{js,jsx}",
+      "stores/**/*.{js,jsx}",
+      "utils/**/*.{js,jsx}"
+    ],
+    "coverageReporters": [
+      "lcov",
+      "text-summary"
+    ],
+    "moduleNameMapper": {
+      "^.+\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "identity-obj-proxy",
+      "^.+\\.(css|less|scss)$": "identity-obj-proxy",
+      "^.+\\.(json)$": "identity-obj-proxy"
+    },
+    "moduleDirectories": [
+      "",
+      "node_modules",
+      "non_npm_dependencies"
+    ],
+    "transformIgnorePatterns": [
+      "node_modules/(?!react-native|react-router)"
+    ]
+  },
   "scripts": {
     "check": "eslint --ext \".jsx\" --ignore-pattern node_modules --quiet .",
     "build": "cross-env NODE_ENV=production webpack",
     "run": "cross-env NODE_ENV=production webpack --progress --watch",
     "run-fullmap": "webpack --progress --watch",
-    "test": "mocha-webpack --webpack-config webpack.config.js \"**/*.test.jsx\""
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:coverage": "jest --coverage"
   }
 }