From ebd1e0abac813f78c615a84c9168dc44179289cb Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Tue, 14 Jun 2016 19:23:33 +0100 Subject: [PATCH] configuration translate and core karma RC1 --- .../ng2-alfresco-core/karma-test-shim.js | 10 +++--- .../ng2-alfresco-core/karma.conf.js | 36 ++++++++++++------- .../ng2-alfresco-datatable/karma-test-shim.js | 10 +++--- .../ng2-alfresco-datatable/karma.conf.js | 23 ++++++------ .../karma-test-shim.js | 12 ++++--- .../ng2-alfresco-documentlist/karma.conf.js | 26 ++++++-------- .../ng2-alfresco-login/karma-test-shim.js | 12 ++++--- .../ng2-alfresco-login/karma.conf.js | 19 +++++----- 8 files changed, 83 insertions(+), 65 deletions(-) diff --git a/ng2-components/ng2-alfresco-core/karma-test-shim.js b/ng2-components/ng2-alfresco-core/karma-test-shim.js index 5760992362..ebd6c3fe8b 100644 --- a/ng2-components/ng2-alfresco-core/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-core/karma-test-shim.js @@ -8,12 +8,14 @@ __karma__.loaded = function() {}; var map = { 'app': 'base/dist', 'rxjs': 'base/node_modules/rxjs', - '@angular': 'base/node_modules/@angular' + '@angular': 'base/node_modules/@angular', + 'ng2-translate' : '/base/node_modules/ng2-translate' }; var packages = { 'app': { main: 'main.js', defaultExtension: 'js' }, - 'rxjs': { defaultExtension: 'js' } + 'rxjs': { defaultExtension: 'js' }, + 'ng2-translate': { defaultExtension: 'js' } }; var packageNames = [ @@ -26,7 +28,7 @@ var packageNames = [ '@angular/router', '@angular/router-deprecated', '@angular/testing', - '@angular/upgrade', + '@angular/upgrade' ]; packageNames.forEach(function(pkgName) { @@ -54,7 +56,7 @@ System.import('@angular/platform-browser/src/browser/browser_adapter') __karma__.start(); }, function(error) { - if(typeof __karma__.error == 'fucntion') { + if(typeof __karma__.error == 'function') { __karma__.error(error.stack || error); }else{ console.error(error); diff --git a/ng2-components/ng2-alfresco-core/karma.conf.js b/ng2-components/ng2-alfresco-core/karma.conf.js index d55a948009..0e5e8e7fbd 100644 --- a/ng2-components/ng2-alfresco-core/karma.conf.js +++ b/ng2-components/ng2-alfresco-core/karma.conf.js @@ -1,22 +1,20 @@ 'use strict'; module.exports = function (config) { - config.set({ - + var configuration = { basePath: '.', - frameworks: ['jasmine'], + frameworks: ['jasmine-ajax', 'jasmine'], files: [ // paths loaded by Karma - {pattern: 'node_modules/angular2/bundles/angular2-polyfills.js', included: true, watched: false}, + {pattern: 'node_modules/reflect-metadata/Reflect.js', included: true, watched: true}, {pattern: 'node_modules/systemjs/dist/system.src.js', included: true, watched: false}, - {pattern: 'node_modules/rxjs/bundles/Rx.js', included: true, watched: false}, - {pattern: 'node_modules/angular2/bundles/angular2.dev.js', included: true, watched: false}, - {pattern: 'node_modules/angular2/bundles/testing.dev.js', included: true, watched: false}, - {pattern: 'node_modules/angular2/bundles/http.dev.js', included: true, watched: false}, - {pattern: 'node_modules/angular2/bundles/router.dev.js', included: true, watched: false}, - {pattern: 'node_modules/ng2-translate/bundles/ng2-translate.js', included: true, watched: false}, + {pattern: 'node_modules/zone.js/dist/zone.js', included: true, watched: true}, + {pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false}, + {pattern: 'node_modules/rxjs/**/*.map', included: false, watched: false}, + {pattern: 'node_modules/@angular/**/*.js', included: false, watched: false}, + {pattern: 'node_modules/@angular/**/*.map', included: false, watched: false}, {pattern: 'karma-test-shim.js', included: true, watched: true}, @@ -40,7 +38,7 @@ module.exports = function (config) { // level of logging // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG - logLevel: config.LOG_INFO, + logLevel: config.LOG_DEBUG, colors: true, @@ -48,10 +46,18 @@ module.exports = function (config) { browsers: ['Chrome'], + customLaunchers: { + Chrome_travis_ci: { + base: 'Chrome', + flags: ['--no-sandbox'] + } + }, + // Karma plugins loaded plugins: [ 'karma-jasmine', 'karma-coverage', + 'karma-jasmine-ajax', 'karma-chrome-launcher', 'karma-mocha-reporter', 'karma-jasmine-html-reporter' @@ -71,11 +77,15 @@ module.exports = function (config) { subdir: 'report', reporters: [ {type: 'text'}, - {type: 'text-summary'}, {type: 'json', file: 'coverage-final.json'}, {type: 'html'} ] } + } - }) + if (process.env.TRAVIS) { + configuration.browsers = ['Chrome_travis_ci']; + } + + config.set(configuration) }; diff --git a/ng2-components/ng2-alfresco-datatable/karma-test-shim.js b/ng2-components/ng2-alfresco-datatable/karma-test-shim.js index 5760992362..2890162739 100644 --- a/ng2-components/ng2-alfresco-datatable/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-datatable/karma-test-shim.js @@ -8,12 +8,14 @@ __karma__.loaded = function() {}; var map = { 'app': 'base/dist', 'rxjs': 'base/node_modules/rxjs', - '@angular': 'base/node_modules/@angular' + '@angular': 'base/node_modules/@angular', + 'ng2-alfresco-core/dist': '/base/node_modules/ng2-alfresco-core/dist' }; var packages = { 'app': { main: 'main.js', defaultExtension: 'js' }, - 'rxjs': { defaultExtension: 'js' } + 'rxjs': { defaultExtension: 'js' }, + 'ng2-alfresco-core/dist': { defaultExtension: 'js' } }; var packageNames = [ @@ -26,7 +28,7 @@ var packageNames = [ '@angular/router', '@angular/router-deprecated', '@angular/testing', - '@angular/upgrade', + '@angular/upgrade' ]; packageNames.forEach(function(pkgName) { @@ -54,7 +56,7 @@ System.import('@angular/platform-browser/src/browser/browser_adapter') __karma__.start(); }, function(error) { - if(typeof __karma__.error == 'fucntion') { + if(typeof __karma__.error == 'function') { __karma__.error(error.stack || error); }else{ console.error(error); diff --git a/ng2-components/ng2-alfresco-datatable/karma.conf.js b/ng2-components/ng2-alfresco-datatable/karma.conf.js index 06ad2c2555..749e071558 100644 --- a/ng2-components/ng2-alfresco-datatable/karma.conf.js +++ b/ng2-components/ng2-alfresco-datatable/karma.conf.js @@ -4,16 +4,18 @@ module.exports = function (config) { var configuration = { basePath: '.', - frameworks: ['jasmine'], + frameworks: ['jasmine-ajax', 'jasmine'], files: [ // paths loaded by Karma - {pattern: 'node_modules/angular2/bundles/angular2-polyfills.js', included: true, watched: true}, - {pattern: 'node_modules/systemjs/dist/system.src.js', included: true, watched: true}, - {pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false, served: true}, - {pattern: 'node_modules/angular2/bundles/angular2.dev.js', included: true, watched: true}, - {pattern: 'node_modules/angular2/bundles/testing.dev.js', included: true, watched: true}, - {pattern: 'node_modules/angular2/bundles/http.dev.js', included: true, watched: true}, + {pattern: 'node_modules/reflect-metadata/Reflect.js', included: true, watched: true}, + {pattern: 'node_modules/systemjs/dist/system.src.js', included: true, watched: false}, + {pattern: 'node_modules/zone.js/dist/zone.js', included: true, watched: true}, + {pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false}, + {pattern: 'node_modules/rxjs/**/*.map', included: false, watched: false}, + {pattern: 'node_modules/@angular/**/*.js', included: false, watched: false}, + {pattern: 'node_modules/@angular/**/*.map', included: false, watched: false}, + {pattern: 'node_modules/ng2-alfresco-core/dist/**/*.js', included: false, served: true, watched: false}, {pattern: 'karma-test-shim.js', included: true, watched: true}, @@ -37,7 +39,7 @@ module.exports = function (config) { // level of logging // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG - logLevel: config.LOG_INFO, + logLevel: config.LOG_DEBUG, colors: true, @@ -45,7 +47,6 @@ module.exports = function (config) { browsers: ['Chrome'], - customLaunchers: { Chrome_travis_ci: { base: 'Chrome', @@ -57,6 +58,7 @@ module.exports = function (config) { plugins: [ 'karma-jasmine', 'karma-coverage', + 'karma-jasmine-ajax', 'karma-chrome-launcher', 'karma-mocha-reporter', 'karma-jasmine-html-reporter' @@ -76,16 +78,15 @@ module.exports = function (config) { subdir: 'report', reporters: [ {type: 'text'}, - {type: 'text-summary'}, {type: 'json', file: 'coverage-final.json'}, {type: 'html'} ] } - } if (process.env.TRAVIS) { configuration.browsers = ['Chrome_travis_ci']; } + config.set(configuration) }; diff --git a/ng2-components/ng2-alfresco-documentlist/karma-test-shim.js b/ng2-components/ng2-alfresco-documentlist/karma-test-shim.js index 5760992362..0e75b01bf5 100644 --- a/ng2-components/ng2-alfresco-documentlist/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-documentlist/karma-test-shim.js @@ -8,12 +8,16 @@ __karma__.loaded = function() {}; var map = { 'app': 'base/dist', 'rxjs': 'base/node_modules/rxjs', - '@angular': 'base/node_modules/@angular' + '@angular': 'base/node_modules/@angular', + 'ng2-alfresco-core/dist': '/base/node_modules/ng2-alfresco-core/dist', + 'ng2-translate' : '/base/node_modules/ng2-translate' }; var packages = { 'app': { main: 'main.js', defaultExtension: 'js' }, - 'rxjs': { defaultExtension: 'js' } + 'rxjs': { defaultExtension: 'js' }, + 'ng2-alfresco-core/dist': { defaultExtension: 'js' }, + 'ng2-translate': { defaultExtension: 'js' } }; var packageNames = [ @@ -26,7 +30,7 @@ var packageNames = [ '@angular/router', '@angular/router-deprecated', '@angular/testing', - '@angular/upgrade', + '@angular/upgrade' ]; packageNames.forEach(function(pkgName) { @@ -54,7 +58,7 @@ System.import('@angular/platform-browser/src/browser/browser_adapter') __karma__.start(); }, function(error) { - if(typeof __karma__.error == 'fucntion') { + if(typeof __karma__.error == 'function') { __karma__.error(error.stack || error); }else{ console.error(error); diff --git a/ng2-components/ng2-alfresco-documentlist/karma.conf.js b/ng2-components/ng2-alfresco-documentlist/karma.conf.js index 3524ac2e16..5330c069d6 100644 --- a/ng2-components/ng2-alfresco-documentlist/karma.conf.js +++ b/ng2-components/ng2-alfresco-documentlist/karma.conf.js @@ -4,19 +4,19 @@ module.exports = function (config) { var configuration = { basePath: '.', - frameworks: ['jasmine'], + frameworks: ['jasmine-ajax', 'jasmine'], files: [ // paths loaded by Karma - {pattern: 'node_modules/angular2/bundles/angular2-polyfills.js', included: true, watched: true}, - {pattern: 'node_modules/systemjs/dist/system.src.js', included: true, watched: true}, - {pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false, served: true}, - {pattern: 'node_modules/angular2/bundles/angular2.dev.js', included: true, watched: true}, - {pattern: 'node_modules/angular2/bundles/testing.dev.js', included: true, watched: true}, - {pattern: 'node_modules/angular2/bundles/http.dev.js', included: true, watched: true}, - {pattern: 'node_modules/alfresco-core-rest-api/bundle.js', included: true, watched: false}, + {pattern: 'node_modules/reflect-metadata/Reflect.js', included: true, watched: true}, + {pattern: 'node_modules/systemjs/dist/system.src.js', included: true, watched: false}, + {pattern: 'node_modules/zone.js/dist/zone.js', included: true, watched: true}, + {pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false}, + {pattern: 'node_modules/rxjs/**/*.map', included: false, watched: false}, + {pattern: 'node_modules/@angular/**/*.js', included: false, watched: false}, + {pattern: 'node_modules/@angular/**/*.map', included: false, watched: false}, {pattern: 'node_modules/ng2-alfresco-core/dist/**/*.js', included: false, served: true, watched: false}, - {pattern: 'node_modules/ng2-translate/**/*.js', included: false, watched: false}, + {pattern: 'node_modules/ng2-translate/**/*.js', included: false, served: true, watched: false}, {pattern: 'karma-test-shim.js', included: true, watched: true}, @@ -36,16 +36,11 @@ module.exports = function (config) { '/src/': '/base/src/' }, - // list of files to exclude - exclude: [ - 'node_modules/**/*spec.js' - ], - port: 9876, // level of logging // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG - logLevel: config.LOG_INFO, + logLevel: config.LOG_DEBUG, colors: true, @@ -64,6 +59,7 @@ module.exports = function (config) { plugins: [ 'karma-jasmine', 'karma-coverage', + 'karma-jasmine-ajax', 'karma-chrome-launcher', 'karma-mocha-reporter', 'karma-jasmine-html-reporter' diff --git a/ng2-components/ng2-alfresco-login/karma-test-shim.js b/ng2-components/ng2-alfresco-login/karma-test-shim.js index 5760992362..0e75b01bf5 100644 --- a/ng2-components/ng2-alfresco-login/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-login/karma-test-shim.js @@ -8,12 +8,16 @@ __karma__.loaded = function() {}; var map = { 'app': 'base/dist', 'rxjs': 'base/node_modules/rxjs', - '@angular': 'base/node_modules/@angular' + '@angular': 'base/node_modules/@angular', + 'ng2-alfresco-core/dist': '/base/node_modules/ng2-alfresco-core/dist', + 'ng2-translate' : '/base/node_modules/ng2-translate' }; var packages = { 'app': { main: 'main.js', defaultExtension: 'js' }, - 'rxjs': { defaultExtension: 'js' } + 'rxjs': { defaultExtension: 'js' }, + 'ng2-alfresco-core/dist': { defaultExtension: 'js' }, + 'ng2-translate': { defaultExtension: 'js' } }; var packageNames = [ @@ -26,7 +30,7 @@ var packageNames = [ '@angular/router', '@angular/router-deprecated', '@angular/testing', - '@angular/upgrade', + '@angular/upgrade' ]; packageNames.forEach(function(pkgName) { @@ -54,7 +58,7 @@ System.import('@angular/platform-browser/src/browser/browser_adapter') __karma__.start(); }, function(error) { - if(typeof __karma__.error == 'fucntion') { + if(typeof __karma__.error == 'function') { __karma__.error(error.stack || error); }else{ console.error(error); diff --git a/ng2-components/ng2-alfresco-login/karma.conf.js b/ng2-components/ng2-alfresco-login/karma.conf.js index ce2bf10183..5330c069d6 100644 --- a/ng2-components/ng2-alfresco-login/karma.conf.js +++ b/ng2-components/ng2-alfresco-login/karma.conf.js @@ -4,18 +4,17 @@ module.exports = function (config) { var configuration = { basePath: '.', - frameworks: ['jasmine'], + frameworks: ['jasmine-ajax', 'jasmine'], files: [ // paths loaded by Karma - {pattern: 'node_modules/angular2/bundles/angular2-polyfills.js', included: true, watched: false}, + {pattern: 'node_modules/reflect-metadata/Reflect.js', included: true, watched: true}, {pattern: 'node_modules/systemjs/dist/system.src.js', included: true, watched: false}, - {pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false, served: true}, - {pattern: 'node_modules/angular2/bundles/angular2.dev.js', included: true, served: true, watched: false}, - {pattern: 'node_modules/angular2/bundles/testing.dev.js', included: true, served: true, watched: false}, - {pattern: 'node_modules/angular2/bundles/http.dev.js', included: true, served: true, watched: false}, - {pattern: 'node_modules/angular2/bundles/router.dev.js', included: true, watched: false}, - {pattern: 'node_modules/alfresco-core-rest-api/bundle.js', included: true, watched: false}, + {pattern: 'node_modules/zone.js/dist/zone.js', included: true, watched: true}, + {pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false}, + {pattern: 'node_modules/rxjs/**/*.map', included: false, watched: false}, + {pattern: 'node_modules/@angular/**/*.js', included: false, watched: false}, + {pattern: 'node_modules/@angular/**/*.map', included: false, watched: false}, {pattern: 'node_modules/ng2-alfresco-core/dist/**/*.js', included: false, served: true, watched: false}, {pattern: 'node_modules/ng2-translate/**/*.js', included: false, served: true, watched: false}, @@ -41,7 +40,7 @@ module.exports = function (config) { // level of logging // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG - logLevel: config.LOG_INFO, + logLevel: config.LOG_DEBUG, colors: true, @@ -60,6 +59,7 @@ module.exports = function (config) { plugins: [ 'karma-jasmine', 'karma-coverage', + 'karma-jasmine-ajax', 'karma-chrome-launcher', 'karma-mocha-reporter', 'karma-jasmine-html-reporter' @@ -79,7 +79,6 @@ module.exports = function (config) { subdir: 'report', reporters: [ {type: 'text'}, - {type: 'text-summary'}, {type: 'json', file: 'coverage-final.json'}, {type: 'html'} ]