From c5fe9d6963dcb66aa9f6d8dce606a3a7bb822da4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= <oli_r@fg4f.de>
Date: Wed, 30 Dec 2020 22:41:55 +0100
Subject: [PATCH] Create explicit ci test task.

---
 .gitignore     |  3 +++
 .gitlab-ci.yml |  2 +-
 package.json   |  3 ++-
 results.xml    | 11 -----------
 4 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 100644 results.xml

diff --git a/.gitignore b/.gitignore
index e63e3301..f4078b46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,6 @@ dist
 
 # ESLint
 .eslintcache
+
+# Junit results
+results.xml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2d24f708..c9f148e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,7 @@ lint:
 test:
     stage: test
     script:
-        - npm test
+        - npm test:ci
     cache:
         <<: *global_cache
     artifacts:
diff --git a/package.json b/package.json
index f2dea27b..fa711656 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,8 @@
         "update": "npm install --save-dev git+https://git.f3l.de/dungeonslayers/foundry-pc-types.git#f3l-fixes",
         "lint": "eslint 'src/**/*.ts' --cache",
         "lint:fix": "eslint 'src/**/*.ts' --cache --fix",
-        "test": "ts-node ./node_modules/jasmine-xml-reporter/bin/jasmine --junitreport"
+        "test": "ts-node ./node_modules/jasmine/bin/jasmine",
+        "test:ci": "ts-node ./node_modules/jasmine-xml-reporter/bin/jasmine --junitreport"
     },
     "author": "",
     "license": "",
diff --git a/results.xml b/results.xml
deleted file mode 100644
index a94c300d..00000000
--- a/results.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuites disabled="0" errors="0" failures="0" tests="6" time="0.025">
- <testsuite name="DS4 Rolls" timestamp="2020-12-30T22:36:25" hostname="localhost" time="0.025" errors="0" tests="6" skipped="0" disabled="0" failures="0">
-  <testcase classname="DS4 Rolls" name="Should do a proper single failure roll, upper bound" time="0.012" />
-  <testcase classname="DS4 Rolls" name="Should do a proper single failure roll, lower bound" time="0.001" />
-  <testcase classname="DS4 Rolls" name="Should do a proper single success roll on success edge case." time="0.001" />
-  <testcase classname="DS4 Rolls" name="Should do a proper single success roll." time="0.002" />
-  <testcase classname="DS4 Rolls" name="Should do a proper single crit failure roll." time="0.002" />
-  <testcase classname="DS4 Rolls" name="Should do a proper single crit success roll." time="0.001" />
- </testsuite>
-</testsuites>
\ No newline at end of file