From 8709aef0916ac6899a1c6049aab4390c4ee4f5c9 Mon Sep 17 00:00:00 2001 From: Ryan Roemer Date: Fri, 8 May 2015 08:29:20 -0700 Subject: [PATCH 1/2] Add tests and coverage to Travis. Add badges to README. Fixes #136 --- .travis.yml | 3 +++ README.md | 16 +++++++++++++--- package.json | 3 ++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5a6923fe..3fcf1a8c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,3 +18,6 @@ branches: script: - npm run lint + - npm run test + # Upload to coveralls, but don't _fail_ if coveralls is down. + - cat coverage/lcov.info node_modules/.bin/coveralls || echo "Coveralls upload failed" diff --git a/README.md b/README.md index 9b8ded05..300a480a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ -[![Travis Status](https://api.travis-ci.org/FormidableLabs/radium.svg)](https://travis-ci.org/FormidableLabs/radium) -[![npm package](https://img.shields.io/npm/v/radium.svg)](https://www.npmjs.org/package/radium) -[![dependency status](https://img.shields.io/david/FormidableLabs/radium.svg)](https://david-dm.org/FormidableLabs/radium) +[![Travis Status][trav_img]][trav_site] +[![Coverage Status][cov_img]][cov_site] +[![NPM Package][npm_img]][npm_site] +[![Dependency Status][david_img]][david_site] # Radium @@ -125,3 +126,12 @@ npm run examples ## Contributing Please see [CONTRIBUTING](CONTRIBUTING.md) + +[trav_img]: https://api.travis-ci.org/FormidableLabs/radium.svg +[trav_site]: https://travis-ci.org/FormidableLabs/radium +[cov_img]: https://img.shields.io/coveralls/FormidableLabs/radium.svg +[cov_site]: https://coveralls.io/r/FormidableLabs/radium +[npm_img]: https://img.shields.io/npm/v/radium.svg +[npm_site]: https://www.npmjs.org/package/radium +[david_img]: https://img.shields.io/david/FormidableLabs/radium.svg +[david_site]: https://david-dm.org/FormidableLabs/radium diff --git a/package.json b/package.json index a0b1d7cb..0c6aef07 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "dist": "webpack && webpack --config=webpack.config.minified.js", "examples": "webpack-dev-server --config examples/webpack.config.js --no-info --content-base examples/", "test": "jest", - "lint": "eslint modules/" + "lint": "eslint modules" }, "license": "MIT", "peerDependencies": { @@ -26,6 +26,7 @@ "lodash": "^3.2.0" }, "devDependencies": { + "coveralls": "^2.11.2", "eslint": "^0.19.0", "jest-cli": "^0.4.0", "jsx-loader": "^0.12.2", From 412c57f2611d466b1fab6e60c1231fd64116a1e0 Mon Sep 17 00:00:00 2001 From: Ryan Roemer Date: Fri, 8 May 2015 08:41:39 -0700 Subject: [PATCH 2/2] Disable travis v0.12 builds --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3fcf1a8c..757401ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,10 @@ language: node_js node_js: - 0.10 - - 0.12 + # TODO: Re-enable v0.12 builds. + # Radium Ticket: https://github.com/FormidableLabs/radium/issues/138 + # Upstream Jest Ticket: https://github.com/facebook/jest/issues/243 + #- 0.12 # Use container-based Travis infrastructure. sudo: false