diff --git a/ng2-components/ng2-alfresco-datatable/karma.conf.js b/ng2-components/ng2-alfresco-datatable/karma.conf.js index 038462c603..270670581c 100644 --- a/ng2-components/ng2-alfresco-datatable/karma.conf.js +++ b/ng2-components/ng2-alfresco-datatable/karma.conf.js @@ -1,8 +1,7 @@ 'use strict'; module.exports = function (config) { - config.set({ - + var configuration = { basePath: '.', frameworks: ['jasmine'], @@ -46,6 +45,14 @@ module.exports = function (config) { browsers: ['Chrome'], + + customLaunchers: { + Chrome_travis_ci: { + base: 'Chrome', + flags: ['--no-sandbox'] + } + }, + // Karma plugins loaded plugins: [ 'karma-jasmine', @@ -76,5 +83,10 @@ module.exports = function (config) { }, singleRun: true - }) + } + + if (process.env.TRAVIS) { + configuration.browsers = ['Chrome_travis_ci']; + } + config.set(configuration) }; diff --git a/ng2-components/ng2-alfresco-documentlist/karma.conf.js b/ng2-components/ng2-alfresco-documentlist/karma.conf.js index 8b0a1feda7..c37262920b 100644 --- a/ng2-components/ng2-alfresco-documentlist/karma.conf.js +++ b/ng2-components/ng2-alfresco-documentlist/karma.conf.js @@ -1,12 +1,12 @@ 'use strict'; module.exports = function (config) { - config.set({ - + var configuration = { basePath: '.', frameworks: ['jasmine'], + files: [ // paths loaded by Karma {pattern: 'node_modules/angular2/bundles/angular2-polyfills.js', included: true, watched: true}, @@ -54,6 +54,13 @@ module.exports = function (config) { browsers: ['Chrome'], + customLaunchers: { + Chrome_travis_ci: { + base: 'Chrome', + flags: ['--no-sandbox'] + } + }, + // Karma plugins loaded plugins: [ 'karma-jasmine', @@ -81,5 +88,11 @@ module.exports = function (config) { {type: 'html'} ] } - }) + } + + if (process.env.TRAVIS) { + configuration.browsers = ['Chrome_travis_ci']; + } + + config.set(configuration) }; diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json index 33868fe767..cc895a578c 100644 --- a/ng2-components/ng2-alfresco-documentlist/package.json +++ b/ng2-components/ng2-alfresco-documentlist/package.json @@ -62,7 +62,8 @@ "rxjs": "5.0.0-beta.2", "systemjs": "0.19.26", "zone.js": "^0.6.12", - "alfresco-js-api": "^0.1.0" + "alfresco-js-api": "^0.1.0", + "ng2-translate": "1.11.1" }, "devDependencies": { "concurrently": "^2.1.0", diff --git a/ng2-components/ng2-alfresco-login/karma.conf.js b/ng2-components/ng2-alfresco-login/karma.conf.js index 60b5377520..789f480bd1 100644 --- a/ng2-components/ng2-alfresco-login/karma.conf.js +++ b/ng2-components/ng2-alfresco-login/karma.conf.js @@ -1,8 +1,7 @@ 'use strict'; module.exports = function (config) { - config.set({ - + var configuration = { basePath: '.', frameworks: ['jasmine'], @@ -50,6 +49,13 @@ module.exports = function (config) { browsers: ['Chrome'], + customLaunchers: { + Chrome_travis_ci: { + base: 'Chrome', + flags: ['--no-sandbox'] + } + }, + // Karma plugins loaded plugins: [ 'karma-jasmine', @@ -80,5 +86,11 @@ module.exports = function (config) { }, singleRun: true - }) + } + + if (process.env.TRAVIS) { + configuration.browsers = ['Chrome_travis_ci']; + } + + config.set(configuration) }; diff --git a/ng2-components/ng2-alfresco-login/package.json b/ng2-components/ng2-alfresco-login/package.json index 2cecc4a1c2..c4b3b06646 100644 --- a/ng2-components/ng2-alfresco-login/package.json +++ b/ng2-components/ng2-alfresco-login/package.json @@ -70,7 +70,8 @@ "rxjs": "5.0.0-beta.2", "systemjs": "0.19.26", "zone.js": "^0.6.12", - "alfresco-core-rest-api": "^0.1.0" + "alfresco-core-rest-api": "^0.1.0", + "ng2-translate": "1.11.1" }, "peerDependencies": { "angular2": "2.0.0-beta.15" diff --git a/ng2-components/ng2-alfresco-search/karma.conf.js b/ng2-components/ng2-alfresco-search/karma.conf.js index 17aa656b91..8cf12d48c9 100644 --- a/ng2-components/ng2-alfresco-search/karma.conf.js +++ b/ng2-components/ng2-alfresco-search/karma.conf.js @@ -1,8 +1,7 @@ 'use strict'; module.exports = function (config) { - config.set({ - + var configuration = { basePath: '.', frameworks: ['jasmine'], @@ -47,6 +46,15 @@ module.exports = function (config) { browsers: ['Chrome'], + customLaunchers: { + Chrome_travis_ci: { + base: 'Chrome', + flags: ['--no-sandbox'] + } + }, + + + // Karma plugins loaded plugins: [ 'karma-jasmine', @@ -77,5 +85,11 @@ module.exports = function (config) { }, singleRun: true - }) + } + + if (process.env.TRAVIS) { + configuration.browsers = ['Chrome_travis_ci']; + } + + config.set(configuration) }; diff --git a/ng2-components/ng2-alfresco-search/package.json b/ng2-components/ng2-alfresco-search/package.json index a7f5ac0bec..8df031dd47 100644 --- a/ng2-components/ng2-alfresco-search/package.json +++ b/ng2-components/ng2-alfresco-search/package.json @@ -56,7 +56,8 @@ "rxjs": "5.0.0-beta.2", "zone.js": "^0.6.12", "es6-module-loader": "^0.17.8", - "alfresco-js-api": "^0.1.0" + "alfresco-js-api": "^0.1.0", + "ng2-translate": "1.11.1" }, "peerDependencies": { "angular2": "2.0.0-beta.15" diff --git a/ng2-components/ng2-alfresco-upload/karma.conf.js b/ng2-components/ng2-alfresco-upload/karma.conf.js index 19bc811f4e..fb4bf7633c 100644 --- a/ng2-components/ng2-alfresco-upload/karma.conf.js +++ b/ng2-components/ng2-alfresco-upload/karma.conf.js @@ -1,8 +1,7 @@ 'use strict'; module.exports = function (config) { - config.set({ - + var configuration = { basePath: '.', frameworks: ['jasmine-ajax', 'jasmine'], @@ -50,6 +49,13 @@ module.exports = function (config) { browsers: ['Chrome'], + customLaunchers: { + Chrome_travis_ci: { + base: 'Chrome', + flags: ['--no-sandbox'] + } + }, + // Karma plugins loaded plugins: [ 'karma-jasmine', @@ -80,5 +86,11 @@ module.exports = function (config) { }, singleRun: true - }) + } + + if (process.env.TRAVIS) { + configuration.browsers = ['Chrome_travis_ci']; + } + + config.set(configuration) }; diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json index 23771995ce..95d2696250 100644 --- a/ng2-components/ng2-alfresco-upload/package.json +++ b/ng2-components/ng2-alfresco-upload/package.json @@ -61,7 +61,8 @@ "reflect-metadata": "0.1.2", "rxjs": "5.0.0-beta.2", "systemjs": "0.19.26", - "zone.js": "^0.6.12" + "zone.js": "^0.6.12", + "ng2-translate": "1.11.1" }, "peerDependencies": { "angular2": "2.0.0-beta.15"