[ADF-3789] Fix the content service coverage path and config (#4010)

* Fix the content service coverage path and config

* Use relative path
This commit is contained in:
Maurizio Vitale
2018-11-27 21:11:37 +00:00
committed by Eugenio Romano
parent 393b7ebe97
commit 86ae2f5c2b
2 changed files with 21 additions and 27 deletions

View File

@@ -575,7 +575,7 @@
}, },
"content-services": { "content-services": {
"root": "lib/content-services", "root": "lib/content-services",
"sourceRoot": "lib/content-services/src", "sourceRoot": "lib/content-services",
"projectType": "library", "projectType": "library",
"prefix": "adf", "prefix": "adf",
"architect": { "architect": {

View File

@@ -3,40 +3,38 @@
module.exports = function (config) { module.exports = function (config) {
config.set({ config.set({
basePath: '../../', basePath: '',
files: [ files: [
{pattern: 'node_modules/core-js/client/core.js', included: true, watched: false}, {pattern: '../../node_modules/core-js/client/core.js', included: true, watched: false},
{pattern: 'node_modules/tslib/tslib.js', included: true, watched: false}, {pattern: '../../node_modules/tslib/tslib.js', included: true, watched: false},
{pattern: 'node_modules/hammerjs/hammer.min.js', included: true, watched: false}, {pattern: '../../node_modules/hammerjs/hammer.min.js', included: true, watched: false},
{pattern: 'node_modules/hammerjs/hammer.min.js.map', included: false, watched: false}, {pattern: '../../node_modules/hammerjs/hammer.min.js.map', included: false, watched: false},
// pdf-js // pdf-js
{pattern: 'node_modules/pdfjs-dist/build/pdf.js', included: true, watched: false}, {pattern: '../../node_modules/pdfjs-dist/build/pdf.js', included: true, watched: false},
{pattern: 'node_modules/pdfjs-dist/build/pdf.worker.js', included: true, watched: false}, {pattern: '../../node_modules/pdfjs-dist/build/pdf.worker.js', included: true, watched: false},
{pattern: 'node_modules/pdfjs-dist/web/pdf_viewer.js', included: true, watched: false}, {pattern: '../../node_modules/pdfjs-dist/web/pdf_viewer.js', included: true, watched: false},
{ {
pattern: 'node_modules/@angular/material/prebuilt-themes/indigo-pink.css', pattern: '../../node_modules/@angular/material/prebuilt-themes/indigo-pink.css',
included: true, included: true,
watched: false watched: false
}, },
{pattern: 'node_modules/alfresco-js-api/dist/alfresco-js-api.min.js', included: true, watched: false}, {pattern: '../../node_modules/alfresco-js-api/dist/alfresco-js-api.min.js', included: true, watched: false},
{pattern: 'node_modules/moment/min/moment.min.js', included: true, watched: false}, {pattern: '../../node_modules/moment/min/moment.min.js', included: true, watched: false},
{pattern: 'lib/content-services/i18n/**/en.json', included: false, served: true, watched: false}, {pattern: '../content-services/i18n/**/en.json', included: false, served: true, watched: false},
{pattern: 'lib/core/i18n/**/en.json', included: false, served: true, watched: false}, {pattern: '../core/i18n/**/en.json', included: false, served: true, watched: false},
{pattern: '../content-services/**/*.ts', included: false, served: true, watched: false},
{pattern: 'lib/content-services/**/*.ts', included: false, served: true, watched: false}, {pattern: '../config/app.config.json', included: false, served: true, watched: false},
{pattern: 'lib/config/app.config.json', included: false, served: true, watched: false},
], ],
frameworks: ['jasmine-ajax', 'jasmine', '@angular-devkit/build-angular'], frameworks: ['jasmine-ajax', 'jasmine', '@angular-devkit/build-angular'],
proxies: { proxies: {
'/base/assets/' :'/base/lib/content-services/assets/', '/base/assets/': '/base/lib/content-services/assets/',
'/assets/adf-content-services/i18n/en.json': '/base/lib/content-services/i18n/en.json', '/assets/adf-content-services/i18n/en.json': '/base/lib/content-services/i18n/en.json',
'/assets/adf-core/i18n/en.json': '/base/lib/core/i18n/en.json', '/assets/adf-core/i18n/en.json': '/base/lib/core/i18n/en.json',
'/app.config.json': '/base/lib/config/app.config.json', '/app.config.json': '/base/lib/config/app.config.json',
@@ -56,18 +54,11 @@ module.exports = function (config) {
}, },
coverageIstanbulReporter: { coverageIstanbulReporter: {
dir: './lib/coverage/content-services/', dir: require('path').join(__dirname, '../coverage/content-services'),
reports: ['html', 'lcovonly'], reports: ['html', 'lcovonly'],
fixWebpackSourcePaths: true fixWebpackSourcePaths: true
}, },
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
logLevel: config.LOG_INFO,
colors: true,
autoWatch: false,
browserDisconnectTimeout: 200000, browserDisconnectTimeout: 200000,
browserNoActivityTimeout: 2400000, browserNoActivityTimeout: 2400000,
captureTimeout: 1200000, captureTimeout: 1200000,
@@ -86,6 +77,9 @@ module.exports = function (config) {
reporters: ['mocha', 'kjhtml'], reporters: ['mocha', 'kjhtml'],
port: 9876, port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome'], browsers: ['Chrome'],
singleRun: false singleRun: false
}); });