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 @@ - - - - - - - - - - - \ No newline at end of file