From 83c982b4584b8fcbe75c670f15e562a3510a3804 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Thu, 8 Mar 2018 12:43:57 +0900
Subject: Run tests with npm-run-all (#6688)

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 5b9ea7d37..fc8e2425e 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "build:production": "cross-env RAILS_ENV=production ./bin/webpack",
     "manage:translations": "node ./config/webpack/translationRunner.js",
     "start": "node ./streaming/index.js",
-    "test": "yarn run test:lint && yarn run test:jest",
+    "test": "npm-run-all test:lint test:jest",
     "test:lint": "eslint -c .eslintrc.yml --ext=js app/javascript/ config/webpack/ streaming/",
     "test:jest": "cross-env NODE_ENV=test jest --coverage"
   },
@@ -67,6 +67,7 @@
     "marky": "^1.2.0",
     "mkdirp": "^0.5.1",
     "node-sass": "^4.7.2",
+    "npm-run-all": "^4.1.2",
     "npmlog": "^4.1.2",
     "object-assign": "^4.1.1",
     "object-fit-images": "^3.2.3",
-- 
cgit