From 5de217733adc1b19c7c703054ef2d595716ea8c8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Gr=C3=A9goire=20Aubert?= <gregoire.aubert@sonarsource.com>
Date: Thu, 16 Aug 2018 16:41:54 +0200
Subject: [PATCH] Update Jest config for extensions

---
 server/sonar-vsts/package.json    | 31 +++++++++++++++++-----------
 server/sonar-vsts/scripts/test.js | 34 -------------------------------
 2 files changed, 19 insertions(+), 46 deletions(-)
 delete mode 100644 server/sonar-vsts/scripts/test.js

diff --git a/server/sonar-vsts/package.json b/server/sonar-vsts/package.json
index 6a31b77bbd8..1675be0ffa2 100644
--- a/server/sonar-vsts/package.json
+++ b/server/sonar-vsts/package.json
@@ -70,15 +70,13 @@
   "scripts": {
     "start": "node scripts/start.js",
     "build": "node scripts/build.js",
-    "test": "node scripts/test.js",
-    "coverage": "npm test -- --coverage",
+    "test": "jest --passWithNoTests",
     "format": "prettier --write --list-different 'src/main/js/!(libs)/**/*.{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",
-    "prettier-check": "prettier --list-different 'src/main/js/!(libs)/**/*.{js,ts,tsx,css}'",
     "ts-check": "tsc --noEmit",
-    "validate":
-      "yarn lint && yarn ts-check && yarn prettier-check && NODE_ENV=test jest --passWithNoTests"
+    "prettier-check": "prettier --list-different 'src/main/js/!(libs)/**/*.{js,ts,tsx,css}'",
+    "validate": "yarn lint && yarn ts-check && yarn prettier-check && yarn test"
   },
   "engines": {
     "node": ">=6"
@@ -92,11 +90,18 @@
   ],
   "jest": {
     "coverageDirectory": "<rootDir>/target/coverage",
-    "coveragePathIgnorePatterns": ["<rootDir>/node_modules", "<rootDir>/tests"],
-    "moduleFileExtensions": ["ts", "tsx", "js", "json"],
+    "coveragePathIgnorePatterns": [
+      "<rootDir>/node_modules",
+      "<rootDir>/tests"
+    ],
+    "moduleFileExtensions": [
+      "ts",
+      "tsx",
+      "js",
+      "json"
+    ],
     "moduleNameMapper": {
-      "^.+\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$":
-        "<rootDir>/config/jest/FileStub.js",
+      "^.+\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/config/jest/FileStub.js",
       "^.+\\.css$": "<rootDir>/config/jest/CSSStub.js"
     },
     "setupFiles": [
@@ -104,7 +109,9 @@
       "<rootDir>/config/jest/SetupTestEnvironment.js",
       "<rootDir>/config/jest/SetupEnzyme.js"
     ],
-    "snapshotSerializers": ["enzyme-to-json/serializer"],
+    "snapshotSerializers": [
+      "enzyme-to-json/serializer"
+    ],
     "testPathIgnorePatterns": [
       "<rootDir>/node_modules",
       "<rootDir>/src/main/webapp",
@@ -112,8 +119,8 @@
     ],
     "testRegex": "(/__tests__/.*|\\-test)\\.(ts|tsx|js)$",
     "transform": {
-      "^.+\\.js$": "<rootDir>/node_modules/babel-jest",
-      ".(ts|tsx)$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
+      "\\.js$": "babel-jest",
+      "\\.(ts|tsx)$": "ts-jest"
     }
   },
   "prettier": {
diff --git a/server/sonar-vsts/scripts/test.js b/server/sonar-vsts/scripts/test.js
deleted file mode 100644
index 77a6010face..00000000000
--- a/server/sonar-vsts/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);
-- 
2.39.5