Update package.json

Author: Kent C. Dodds

package.json

@@ -10,17 +10,14 @@
     "add-contributor": "kcd-scripts contributors add",
     "build": "kcd-scripts build",
     "lint": "kcd-scripts lint",
-    "test": "kcd-scripts test && npm run -s test:cypress",
-    "test:update": "npm test -- --updateSnapshot --coverage",
-    "test:cypress:serve": "node_modules/.bin/serve --clipless --local --port 13370 ./cypress/fixtures/test-app",
-    "test:cypress:servestop": "node_modules/.bin/fkill :13370",
-    "test:cypress:run": "CYPRESS_videoRecording=false CYPRESS_screenshotOnHeadlessFailure=false node_modules/.bin/cypress run",
-    "test:cypress:runandservestop": "node_modules/.bin/npm-run-all --silent --serial --continue-on-error test:cypress:run test:cypress:servestop",
-    "test:cypress:open": "node_modules/.bin/cypress open",
-    "test:cypress:openandservestop": "node_modules/.bin/npm-run-all --silent --serial --continue-on-error test:cypress:open test:cypress:servestop",
-    "test:cypress:ci": "node_modules/.bin/npm-run-all --silent --parallel test:cypress:serve test:cypress:runandservestop",
-    "test:cypress:dev": "node_modules/.bin/npm-run-all --silent --parallel test:cypress:serve test:cypress:openandservestop",
-    "test:cypress": "( [ ${CI} ] && npm run -s test:cypress:ci ) || ( [ ! ${CI} ] && npm run -s test:cypress:dev )",
+    "test": "npm-run-all --parallel test:unit test:cypress:ci",
+    "test:unit": "kcd-scripts test --no-watch",
+    "test:unit:watch": "kcd-scripts test",
+    "test:cypress:serve": "serve --clipless --local --port 13370 ./cypress/fixtures/test-app",
+    "test:cypress:run": "cypress run",
+    "test:cypress:open": "cypress open",
+    "test:cypress": "npm-run-all --silent --parallel --race test:cypress:serve test:cypress:run",
+    "test:cypress:dev": "npm-run-all --silent --parallel --race test:cypress:serve test:cypress:open",
     "validate": "kcd-scripts validate build,lint,test",
     "setup": "npm install && npm run validate -s",
     "precommit": "kcd-scripts precommit"
@@ -46,7 +43,6 @@
   },
   "devDependencies": {
     "cypress": "^2.1.0",
-    "fkill-cli": "^4.1.0",
     "kcd-scripts": "^0.37.0",
     "npm-run-all": "^4.1.2",
     "serve": "^6.5.4"