diff --git a/.travis.yml b/.travis.yml index 56c1dcc4..36cede55 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,13 @@ language: node_js + node_js: - "0.10" + env: - global: - - secure: "Ugov4QqHxEN4976jaQvtQigwwB7wiG0vxiE4pIDiZKJ67py0d0kLZXI4CzNs8zV5EOrkR+ug2cs9vTmA8CdSmhQcx4SVwFoim/ReoQb9AK76+tgEso+F3nZpE1jeIorKN2/LAXtwkHOZa9WaDwhMlCULJxJ8DZoMsXkc5Xq3c6A=" - - secure: "QW7a9wCfc4u+MGnPyLzE+HHRhAhTf0a1mqixoUB2MVNL/hZ7+nXAOL/oz3LxodPpwH3NEl4RyqteGS15XpJvZKuKXiyHWbrfSLHz7DD1LYuIzc7UOgyBTXF0C97DP5ae7zui+qvDOe67ud+qBerroP9jdcx+mSVQgMIAfF1uWY4=" + global: + - secure: "Ugov4QqHxEN4976jaQvtQigwwB7wiG0vxiE4pIDiZKJ67py0d0kLZXI4CzNs8zV5EOrkR+ug2cs9vTmA8CdSmhQcx4SVwFoim/ReoQb9AK76+tgEso+F3nZpE1jeIorKN2/LAXtwkHOZa9WaDwhMlCULJxJ8DZoMsXkc5Xq3c6A=" + - secure: "QW7a9wCfc4u+MGnPyLzE+HHRhAhTf0a1mqixoUB2MVNL/hZ7+nXAOL/oz3LxodPpwH3NEl4RyqteGS15XpJvZKuKXiyHWbrfSLHz7DD1LYuIzc7UOgyBTXF0C97DP5ae7zui+qvDOe67ud+qBerroP9jdcx+mSVQgMIAfF1uWY4=" + - secure: "gflE27IYzgjICndyY7800KdoNKem0oMWKtIjXQuSTJFuWJvBVWkUajT8maNbv1+c46r6iFptd27m5Arzl9hqAh2deHqLxwRGqietcY737q7oRJzKRfA4MGycF8fKHEh8U5KupXTC7UXuESLWGA+bpWA6KNJ5CImAw2MWJXmsX9c=" before_script:   - npm install -g grunt-cli diff --git a/Gruntfile.js b/Gruntfile.js index 22077b9f..f37de66d 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -182,12 +182,19 @@ module.exports = function(grunt) { 'dist/angular-leaflet-directive.js': ['coverage'] }, coverageReporter: { - type : 'html', + type : 'lcov', dir : 'coverage/' } } }, + coveralls: { + options: { + debug: true, + coverage_dir: 'coverage' + } + }, + watch: { options : { livereload: 7777 @@ -286,5 +293,5 @@ module.exports = function(grunt) { grunt.registerTask('serve', ['connect:webserver']); //travis - grunt.registerTask('travis', ['bower:install', 'test:unit', 'shell:protractor_update', 'protractor:saucelabs']); + grunt.registerTask('travis', ['bower:install', 'test:unit', 'karma:unit_coverage', 'coveralls', 'shell:protractor_update', 'protractor:saucelabs']); }; diff --git a/package.json b/package.json index 2258a125..640efe1d 100644 --- a/package.json +++ b/package.json @@ -37,12 +37,13 @@ "karma-coffee-preprocessor": "*", "karma-phantomjs-launcher": "*", "karma-coverage": "*", - "karma": "~0.10.x", + "karma": "*", "protractor": "*", "grunt-protractor-runner": "*", "grunt-shell-spawn": "*", "grunt-conventional-changelog": "*", - "grunt-bump": "*" + "grunt-bump": "*", + "grunt-karma-coveralls": "*" }, "scripts": { "test": "grunt travis --verbose"