Output both the local simplecov html and the coveralls report

Fixes #2066

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index acb7807461ea56621f0bf950e324ac110965e5d3..43b74224fae6b88aa09495e0a2f12beb94cc44f6 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -35,12 +35,7 @@ You can run the existing test suite with:
 bundle exec rake test
 ```
 
 bundle exec rake test
 ```
 

-You can generate test coverage stats with:
-
-```
-sudo gem install rcov
-rcov -x gems test/*/*.rb
-```
+You can view test coverage statistics by browsing the `coverage` directory.

 
 The tests are automatically run on Pull Requests and other commits with the
 results shown on [Travis CI](https://travis-ci.org/openstreetmap/openstreetmap-website).
 
 The tests are automatically run on Pull Requests and other commits with the
 results shown on [Travis CI](https://travis-ci.org/openstreetmap/openstreetmap-website).

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 747edf016056b30c7a0e10b347ed72cc4ec9b466..d44fcd2538aeb502d8313a20ba29b5edb8757eeb 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,6 +1,12 @@
 require "coveralls"
 Coveralls.wear!("rails")
 
 require "coveralls"
 Coveralls.wear!("rails")
 

+# Output both the local simplecov html and the coveralls report
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
+  [SimpleCov::Formatter::HTMLFormatter,
+   Coveralls::SimpleCov::Formatter]
+)
+

 ENV["RAILS_ENV"] = "test"
 require_relative "../config/environment"
 require "rails/test_help"
 ENV["RAILS_ENV"] = "test"
 require_relative "../config/environment"
 require "rails/test_help"