From 15da6c14da6bfc769518d41e71026aef38643859 Mon Sep 17 00:00:00 2001 From: evilaliv3 Date: Sun, 24 Jan 2016 19:10:19 +0100 Subject: [PATCH 1/3] Replace coveralls with codeclimate coverage by means of codeclimate-test-reporter --- .travis.yml | 5 ++++- Gruntfile.js | 19 ------------------- package.json | 1 - travis.sh | 3 ++- 4 files changed, 6 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index eb542cc2..ca1ccf7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,8 @@ sudo: false language: node_js +addons: + code_climate: + repo_token: tanxchangeme!46ecd492907f8224b0ae64890d4befb4bbd9ebbeba55b5acb38 matrix: fast_finish: true include: @@ -52,6 +55,6 @@ matrix: - env: OPENPGPJSTEST='end2end-12' BROWSER='iphone 7.0' - env: OPENPGPJSTEST='end2end-13' BROWSER='iphone 9.1' before_script: - - npm install -g grunt-cli + - npm install -g grunt-cli codeclimate-test-reporter script: - $TRAVIS_BUILD_DIR/travis.sh diff --git a/Gruntfile.js b/Gruntfile.js index 1f37c3f1..02f142e9 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -136,15 +136,6 @@ module.exports = function(grunt) { root: '.', timeout: 240000, } - }, - coveralls: { - src: ['test'], - options: { - root: '.', - timeout: 240000, - coverage: true, - reportFormats: ['cobertura','lcovonly'] - } } }, mochaTest: { @@ -254,18 +245,8 @@ module.exports = function(grunt) { grunt.registerTask('documentation', ['jsdoc']); - grunt.event.on('coverage', function(lcov, done){ - require('coveralls').handleInput(lcov, function(err){ - if (err) { - return done(err); - } - done(); - }); - }); - // Test/Dev tasks grunt.registerTask('test', ['jshint:build', 'jscs:build', 'copy:zlib', 'mochaTest']); grunt.registerTask('coverage', ['copy:zlib', 'mocha_istanbul:coverage']); - grunt.registerTask('coveralls', ['copy:zlib', 'mocha_istanbul:coveralls']); grunt.registerTask('saucelabs', ['default', 'copy:browsertest', 'connect', 'saucelabs-mocha']); }; diff --git a/package.json b/package.json index f292d6a6..5166d8f1 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,6 @@ }, "devDependencies": { "chai": "~3.4.1", - "coveralls": "^2.11.2", "grunt": "~0.4.5", "grunt-browserify": "~4.0.1", "grunt-contrib-clean": "~0.7.0", diff --git a/travis.sh b/travis.sh index ec91b9c1..64c20ae1 100755 --- a/travis.sh +++ b/travis.sh @@ -4,7 +4,8 @@ set -e if [ $OPENPGPJSTEST = "unit" ]; then echo "Running OpenPGP.js unit-tests" - grunt coveralls + grunt coverage + codeclimate-test-reporter < coverage/lcov.info elif [[ $OPENPGPJSTEST =~ ^end2end-.* ]]; then echo "Running browser-testing on Saucelabs" From 6523155d657e9cbb5a5ddb6a63ee0872918f0cd6 Mon Sep 17 00:00:00 2001 From: evilaliv3 Date: Sun, 24 Jan 2016 19:49:20 +0100 Subject: [PATCH 2/3] Replace coveralls bagdge with codeclimate coverage badge and add codeclimate badge for tracking code quality --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 71b36f6e..dbdb9f4f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -OpenPGP.js [![Build Status](https://travis-ci.org/openpgpjs/openpgpjs.svg?branch=master)](https://travis-ci.org/openpgpjs/openpgpjs) [![Coverage Status](https://coveralls.io/repos/openpgpjs/openpgpjs/badge.svg)](https://coveralls.io/r/openpgpjs/openpgpjs) +OpenPGP.js [![Build Status](https://travis-ci.org/openpgpjs/openpgpjs.svg?branch=master)](https://travis-ci.org/openpgpjs/openpgpjs) [![Test Coverage](https://codeclimate.com/github/openpgpjs/openpgpjs/badges/coverage.svg)](https://codeclimate.com/github/openpgpjs/openpgpjs/coverage) [![Code Climate](https://codeclimate.com/github/openpgpjs/openpgpjs/badges/gpa.svg)](https://codeclimate.com/github/openpgpjs/openpgpjs) ========== [OpenPGP.js](http://openpgpjs.org/) is a Javascript implementation of the OpenPGP protocol. This is defined in [RFC 4880](http://tools.ietf.org/html/rfc4880). From 7538878506bfbf926b7db1b86789399613c9b0fe Mon Sep 17 00:00:00 2001 From: Tankred Hase Date: Mon, 1 Feb 2016 14:46:49 +0700 Subject: [PATCH 3/3] Set codecliamte repo token --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ca1ccf7c..01f21451 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: false language: node_js addons: code_climate: - repo_token: tanxchangeme!46ecd492907f8224b0ae64890d4befb4bbd9ebbeba55b5acb38 + repo_token: $CODECLIMATE_REPO_TOKEN matrix: fast_finish: true include: