Skip to content

Commit

Permalink
Showing 6 changed files with 14 additions and 23 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -18,8 +18,7 @@ speed-measure-plugin*.json
**/*/documentation/generated/

# karma generated junit test results
**/karma-test-results
**/coverage
/reports

# backstop
/tests
3 changes: 1 addition & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -18,8 +18,7 @@ speed-measure-plugin*.json
**/*/documentation/generated/

# karma generated junit test results
**/karma-test-results
**/coverage
/reports

# backstop
/tests
18 changes: 6 additions & 12 deletions ci/Jenkinsfile
Original file line number Diff line number Diff line change
@@ -66,16 +66,13 @@ node('nodejs-with-browsers-v12') {
echo 'Testing ngx-docs-ui'

sh 'COMPACT_TEST_RESULTS=true npm run test -- ngx-docs-ui --watch=false --code-coverage'
/*
The unit test will generate some report files
which we want to save in the jenkins job (junit log & coverage)
*/
junit 'karma-test-results/ngx-docs-ui/*.xml'
// The unit test will generate some report files which we want to save in the jenkins job (junit log & coverage)
junit 'reports/ngx-docs-ui/junit/*.xml'
publishHTML target: [
allowMissing: false,
alwaysLinkToLastBuild: false,
keepAll: true,
reportDir: 'projects/ngx-docs-ui/coverage',
reportDir: 'reports/ngx-docs-ui/coverage',
reportFiles: 'index.html',
reportName: 'Coverage Report ngx-docs-ui (Istanbul)'
]
@@ -87,16 +84,13 @@ node('nodejs-with-browsers-v12') {
echo 'Testing ng-aquila'

sh 'COMPACT_TEST_RESULTS=true npm run test:lib -- --watch=false --code-coverage'
/*
The unit test will generate some report files
which we want to save in the jenkins job (junit log & coverage)
*/
junit 'karma-test-results/ng-aquila/*.xml'
// The unit test will generate some report files which we want to save in the jenkins job (junit log & coverage)
junit 'reports/ng-aquila/junit/*.xml'
publishHTML target: [
allowMissing: false,
alwaysLinkToLastBuild: false,
keepAll: true,
reportDir: 'projects/ng-aquila/coverage',
reportDir: 'reports/ng-aquila/coverage',
reportFiles: 'index.html',
reportName: 'Coverage Report Aquila (Istanbul)'
]
1 change: 0 additions & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
@@ -17,7 +17,6 @@ module.exports = function (config) {
clearContext: false, // leave Jasmine Spec Runner output visible in browser
},
coverageReporter: {
dir: require('path').join(__dirname, 'coverage'),
subdir: '.',
reporters: ['html', 'lcovonly'],
fixWebpackSourcePaths: true,
6 changes: 3 additions & 3 deletions projects/ng-aquila/karma.conf.js
Original file line number Diff line number Diff line change
@@ -8,11 +8,11 @@ module.exports = function (config) {
config.set({
...baseConfig,
coverageReporter: {
...baseConfig.coverageReporter,
dir: require('path').join(__dirname, 'coverage'),
...baseConfig.coverageIstanbulReporter,
dir: '../../reports/ng-aquila/coverage',
},
junitReporter: {
outputDir: '../../karma-test-results/ng-aquila',
outputDir: '../../reports/ng-aquila/junit',
},
files: [
{ pattern: '../../node_modules/@angular/cdk/overlay-prebuilt.css', watched: true, included: true, served: true },
6 changes: 3 additions & 3 deletions projects/ngx-docs-ui/karma.conf.js
Original file line number Diff line number Diff line change
@@ -8,11 +8,11 @@ module.exports = function (config) {
config.set({
...baseConfig,
coverageReporter: {
...baseConfig.coverageReporter,
dir: require('path').join(__dirname, 'coverage'),
...baseConfig.coverageIstanbulReporter,
dir: '../../reports/ngx-docs-ui/coverage',
},
junitReporter: {
outputDir: '../../karma-test-results/ngx-docs-ui',
outputDir: '../../reports/ngx-docs-ui/junit',
},
files: [
{ pattern: '../../node_modules/@angular/cdk/overlay-prebuilt.css', watched: true, included: true, served: true },

0 comments on commit c2ab567

Please sign in to comment.