From: Stas Vilchik <stas.vilchik@sonarsource.com>
Date: Mon, 2 Jul 2018 12:53:41 +0000 (+0200)
Subject: simplify test scripts
X-Git-Tag: 7.5~873
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8afd9b61a5652bb47a654ea7d8d15a0aa2c88e3c;p=sonarqube.git

simplify test scripts
---

diff --git a/server/sonar-web/package.json b/server/sonar-web/package.json
index 4dbeec54ff5..0d67511cec5 100644
--- a/server/sonar-web/package.json
+++ b/server/sonar-web/package.json
@@ -123,14 +123,13 @@
     "start": "node scripts/start.js",
     "build": "node scripts/build.js",
     "build-fast": "node scripts/build.js --fast",
-    "test": "node scripts/test.js",
-    "coverage": "npm test -- --coverage",
+    "test": "jest",
     "format": "prettier --write --list-different 'src/main/js/**/*.{js,ts,tsx,css}'",
     "lint": "eslint --ext js,ts,tsx --quiet src/main/js",
     "lint-report": "eslint --ext js,ts,tsx -f json -o eslint-report.json src/main/js",
     "flow-check": "flow check src/main/js",
     "ts-check": "tsc --noEmit",
-    "validate": "yarn lint && yarn flow-check && yarn ts-check && NODE_ENV=test jest",
+    "validate": "yarn lint && yarn flow-check && yarn ts-check && yarn test",
     "precommit": "yarn ts-check && lint-staged && yarn flow-check"
   },
   "engines": {
diff --git a/server/sonar-web/scripts/test.js b/server/sonar-web/scripts/test.js
deleted file mode 100644
index 77a6010face..00000000000
--- a/server/sonar-web/scripts/test.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2018 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-process.env.NODE_ENV = 'test';
-process.env.PUBLIC_URL = '';
-
-const jest = require('jest');
-
-const argv = process.argv.slice(2);
-
-// Watch unless on CI
-if (!process.env.CI) {
-  argv.push('--watch');
-} else {
-  argv.push('--ci');
-}
-
-jest.run(argv);