From e075a877502900515ff31b9471016b15d2298950 Mon Sep 17 00:00:00 2001
From: lukas <lukas.heiligenbrunner@gmail.com>
Date: Fri, 18 Dec 2020 19:55:47 +0100
Subject: [PATCH] rename gitlab jobs and use only one testing job

---
 .gitlab-ci.yml | 24 +++++++-----------------
 package.json   |  4 +---
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9964b88..bdb94fe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,12 +18,12 @@ include:
 variables:
   SAST_DISABLE_DIND: "true"
 
-prepare:
+Node_dependencies:
   stage: prepare
   script:
     - npm install --progress=false
 
-build:
+Minimize:
   stage: build
   script:
     - npm run build
@@ -33,10 +33,10 @@ build:
       - build/
   needs: ["prepare"]
 
-test:
+Frontend_Tests:
   stage: test
   script:
-    - CI=true npm run test
+    - npm run test
   artifacts:
     reports:
       junit:
@@ -47,17 +47,7 @@ code_quality:
   tags:
     - dind
 
-coverage:
-  stage: test
-  script:
-    - CI=true npm run coverage
-  artifacts:
-    reports:
-      cobertura:
-        - ./coverage/cobertura-coverage.xml
-  needs: ["prepare"]
-
-package_debian:
+Debian_Server:
   stage: packaging
   image: debian
   script:
@@ -77,7 +67,7 @@ package_debian:
       - deb/OpenMediaCenter-*.deb
   needs: ["build"]
 
-electron:
+Electron_Client:
   stage: packaging
   image: electronuserland/builder:wine
   script:
@@ -91,7 +81,7 @@ electron:
       - dist/*.exe
   needs: ["build"]
 
-deploy_test1:
+Test_Server:
   stage: deploy
   image: luki42/alpineopenssh:latest
   needs:
diff --git a/package.json b/package.json
index 1d0287a..f17f080 100644
--- a/package.json
+++ b/package.json
@@ -23,9 +23,7 @@
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",
-    "test": "react-scripts test --reporters=jest-junit --reporters=default",
-    "coverage": "react-scripts test --coverage --watchAll=false",
-    "eject": "react-scripts eject",
+    "test": "CI=true react-scripts test --reporters=jest-junit --verbose --silent --coverage --reporters=default --colors",
     "buildlinux": "node build.js --linux",
     "buildwin": "node build.js --win",
     "electron-dev": "electron ."