Merge branch 'master' into bulk-approve-reject-actions

.snyk

@@ -1,6 +1,25 @@
 # Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
 version: v1.7.1
-ignore: {}
+# ignores vulnerabilities until expiry date; change duration by modifying expiry date
+ignore:
+  'npm:marked:20170907':
+    - marked:
+        reason: None given
+        expires: '2017-11-17T15:49:54.237Z'
+    - graphql-docs > marked:
+        reason: None given
+        expires: '2017-11-17T15:49:54.237Z'
+    - simplemde > marked:
+        reason: None given
+        expires: '2017-11-17T15:49:54.237Z'
+  'npm:shelljs:20140723':
+    - react-mdl-selectfield > @kadira/storybook-deployer > shelljs:
+        reason: None given
+        expires: '2017-11-17T15:49:54.237Z'
+  'npm:tunnel-agent:20170305':
+    - selenium-standalone > request > tunnel-agent:
+        reason: None given
+        expires: '2017-11-17T16:36:11.559Z'
 # patches apply the minimum changes required to fix a vulnerability
 patch:
   'npm:marked:20170112':

package.json

@@ -15,6 +15,10 @@
     "lint": "yamllint locales/*.yml && eslint --ext=.js --ext=.json bin/* .",
     "lint-fix": "yarn lint --fix",
     "jest-watch": "TEST_MODE=unit NODE_ENV=test jest --watch",
+    "e2e-ci": "./scripts/e2e-ci.sh",
+    "e2e-browserstack": "NODE_ENV=test ./scripts/e2e-browserstack.js --config nightwatch-browserstack.conf.js",
+    "pree2e": "selenium-standalone install",
+    "e2e": "NODE_ENV=test nightwatch",
     "test": "TEST_MODE=unit NODE_ENV=test jest && TEST_MODE=unit NODE_ENV=test mocha -R ${MOCHA_REPORTER:-spec}",
     "test-cover": "TEST_MODE=unit NODE_ENV=test istanbul cover _mocha --report text --check-coverage -- -R spec",
     "heroku-postbuild": "./bin/cli plugins reconcile && yarn build",
@@ -169,10 +173,12 @@
     "redux": "^3.6.0",
     "redux-thunk": "^2.1.0",
     "resolve": "^1.4.0",
+    "selenium-standalone": "^6.9.0",
     "semver": "^5.4.1",
     "simplemde": "^1.11.2",
     "smoothscroll-polyfill": "^0.3.5",
     "snake-case": "^2.1.0",
+    "snyk": "^1.43.0",
     "style-loader": "^0.16.0",
     "subscriptions-transport-ws": "^0.7.2",
     "timeago.js": "^2.0.3",
@@ -185,14 +191,14 @@
     "webpack": "^2.3.1",
     "webpack-sources": "^1.0.1",
     "yaml-loader": "^0.4.0",
-    "yamljs": "^0.2.10",
-    "snyk": "^1.42.5"
+    "yamljs": "^0.2.10"
   },
   "devDependencies": {
     "@coralproject/eslint-config-talk": "^0.0.4",
     "babel-jest": "^21.2.0",
     "babel-plugin-dynamic-import-node": "^1.1.0",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
+    "browserstack-local": "^1.3.0",
     "chai": "^3.5.0",
     "chai-as-promised": "^6.0.0",
     "chai-http": "^3.0.0",
@@ -204,6 +210,7 @@
     "jest": "^21.2.1",
     "mocha": "^3.1.2",
     "mocha-junit-reporter": "^1.12.1",
+    "nightwatch": "^0.9.16",
     "nodemon": "^1.11.0",
     "pre-git": "^3.15.3",
     "sinon": "^3.2.1",