Merge branch 'development' into 345-change-delegate-registration-moda…

…l-header

Jenkinsfile

@@ -1,6 +1,3 @@
-environment {
-  ON_JENKINS = 'TRUE'
-}
 node('lisk-nano-01'){
   lock(resource: "lisk-nano-01", inversePrecedence: true) {
     stage ('Cleanup Orphaned Processes') {
@@ -70,6 +67,7 @@ node('lisk-nano-01'){
     stage ('Run Tests') {
       try {
         sh '''
+        export ON_JENKINS=true
         # Run test
         cd $WORKSPACE
         npm run test

karma.conf.js

@@ -15,7 +15,6 @@ preprocessors[testLibs] = ['webpack'];
 preprocessors[test] = ['webpack'];
 
 const opts = {
-  onTravis: process.env.ON_TRAVIS,
   onJenkins: process.env.ON_JENKINS,
   live: process.env.LIVE,
 };
@@ -44,7 +43,7 @@ module.exports = function (config) {
     // Rest results reporter to use
     // Possible values: 'dots', 'progress'
     // Available reporters: https://npmjs.org/browse/keyword/karma-reporter
-    reporters: ['coverage', 'mocha'].concat(opts.onTravis ? ['coveralls'] : []).concat(opts.onJenkins ? ['coveralls'] : []),
+    reporters: ['coverage', 'mocha'].concat(opts.onJenkins ? ['coveralls'] : []),
 
     preprocessors,
 
@@ -74,17 +73,14 @@ module.exports = function (config) {
     autoWatch: opts.live,
 
     ngHtml2JsPreprocessor: {
-      stripPrefix: 'app/components/',
+      stripPrefix: 'src/app/components/',
       moduleName: 'my.templates',
     },
 
     coverageReporter: {
       reporters: [{
         type: 'text',
         dir: 'coverage/',
-      }, {
-        type: opts.onTravis ? 'lcov' : 'html',
-        dir: 'coverage/',
       }, {
         type: opts.onJenkins ? 'lcov' : 'html',
         dir: 'coverage/',
@@ -112,6 +108,7 @@ module.exports = function (config) {
       'karma-chrome-launcher',
       'karma-ng-html2js-preprocessor',
       'karma-mocha-reporter',
+      'karma-jenkins-reporter',
       'karma-coverage',
       'karma-coveralls',
       'karma-phantomjs-launcher',