Add Coveralls support

diff --git a/.coveralls.yml b/.coveralls.yml
new file mode 100644 (file)
index 0000000..9160059
--- /dev/null
+++ b/.coveralls.yml
@@ -0,0 +1 @@
+service_name: travis-ci

diff --git a/Gemfile b/Gemfile
index a459fabc41fdfe78a666054271a25d9168f30899..25de38098883ce6ee179ec6cf4099a23e8eb442c 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -93,4 +93,5 @@ group :development, :test do
   gem "jshint"
   gem "konacha"
   gem "poltergeist"
   gem "jshint"
   gem "konacha"
   gem "poltergeist"

+  gem "coveralls", :require => false

 end
 end

diff --git a/Gemfile.lock b/Gemfile.lock
index 7c8691a22378fcc7f6723533e2c12d1f4a1f8f8b..91d4b662c07b9f6da6fa8d772c0c2759086e6d30 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -69,9 +69,16 @@ GEM
     colorize (0.7.5)
     composite_primary_keys (8.0.0)
       activerecord (~> 4.2.0)
     colorize (0.7.5)
     composite_primary_keys (8.0.0)
       activerecord (~> 4.2.0)

+    coveralls (0.7.11)
+      multi_json (~> 1.10)
+      rest-client (>= 1.6.8, < 2)
+      simplecov (~> 0.9.1)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.1)

     crass (1.0.1)
     dalli (2.7.2)
     deadlock_retry (1.2.0)
     crass (1.0.1)
     dalli (2.7.2)
     deadlock_retry (1.2.0)

+    docile (1.1.5)

     dynamic_form (1.1.4)
     erubis (2.7.0)
     execjs (2.3.0)
     dynamic_form (1.1.4)
     erubis (2.7.0)
     execjs (2.3.0)


@@ -99,7 +106,7 @@ GEM
     jsonify-rails (0.3.2)
       actionpack
       jsonify (< 0.4.0)
     jsonify-rails (0.3.2)
       actionpack
       jsonify (< 0.4.0)

-    jwt (1.2.1)
+    jwt (1.3.0)

     kgio (2.9.3)
     konacha (3.3.0)
       actionpack (>= 3.1, < 5)
     kgio (2.9.3)
     konacha (3.3.0)
       actionpack (>= 3.1, < 5)


@@ -119,6 +126,7 @@ GEM
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)

+    netrc (0.10.3)

     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     nokogumbo (1.2.0)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     nokogumbo (1.2.0)


@@ -185,7 +193,7 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.1)
       loofah (~> 2.0)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.1)
       loofah (~> 2.0)

-    rails-i18n (4.0.3)
+    rails-i18n (4.0.4)

       i18n (~> 0.6)
       railties (~> 4.0)
     railties (4.2.0)
       i18n (~> 0.6)
       railties (~> 4.0)
     railties (4.2.0)


@@ -197,6 +205,9 @@ GEM
     rake (10.4.2)
     redcarpet (3.2.2)
     ref (1.0.5)
     rake (10.4.2)
     redcarpet (3.2.2)
     ref (1.0.5)

+    rest-client (1.7.3)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)

     rinku (1.7.3)
     rubocop (0.29.1)
       astrolabe (~> 1.3)
     rinku (1.7.3)
     rubocop (0.29.1)
       astrolabe (~> 1.3)


@@ -217,6 +228,11 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (~> 1.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (~> 1.1)

+    simplecov (0.9.2)
+      docile (~> 1.1.0)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.9.0)
+    simplecov-html (0.9.0)

     soap4r-ruby1.9 (2.0.5)
     sprockets (2.12.3)
       hike (~> 1.2)
     soap4r-ruby1.9 (2.0.5)
     sprockets (2.12.3)
       hike (~> 1.2)


@@ -227,6 +243,8 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)

+    term-ansicolor (1.3.0)
+      tins (~> 1.0)

     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref


@@ -234,6 +252,7 @@ GEM
     thread_safe (0.3.4)
     tilt (1.4.1)
     timecop (0.7.3)
     thread_safe (0.3.4)
     tilt (1.4.1)
     timecop (0.7.3)

+    tins (1.3.4)

     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (2.7.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (2.7.0)


@@ -258,6 +277,7 @@ DEPENDENCIES
   bigdecimal (~> 1.1.0)
   coffee-rails (~> 4.1.0)
   composite_primary_keys (~> 8.0.0)
   bigdecimal (~> 1.1.0)
   coffee-rails (~> 4.1.0)
   composite_primary_keys (~> 8.0.0)

+  coveralls

   dalli
   deadlock_retry (>= 1.2.0)
   dynamic_form
   dalli
   deadlock_retry (>= 1.2.0)
   dynamic_form

diff --git a/README.md b/README.md
index eb163a665b2d1a585548b36806a3321a8358402b..d53bae1577d56071ad0ce0250dea7153fc871476 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # "The Rails Port"
 
 [![Build Status](https://travis-ci.org/openstreetmap/openstreetmap-website.svg?branch=master)](https://travis-ci.org/openstreetmap/openstreetmap-website)
 # "The Rails Port"
 
 [![Build Status](https://travis-ci.org/openstreetmap/openstreetmap-website.svg?branch=master)](https://travis-ci.org/openstreetmap/openstreetmap-website)

+[![Coverage Status](https://coveralls.io/repos/openstreetmap/openstreetmap-website/badge.svg?branch=master)](https://coveralls.io/r/openstreetmap/openstreetmap-website?branch=master)

 
 This is The Rails Port, the [Ruby on Rails](http://rubyonrails.org/)
 application that powers the [OpenStreetMap](http://www.openstreetmap.org) website and API.
 
 This is The Rails Port, the [Ruby on Rails](http://rubyonrails.org/)
 application that powers the [OpenStreetMap](http://www.openstreetmap.org) website and API.

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 247e7f8491971b0c792fba699d8ce3e4ad461f4d..04deabe9db9727d7b32b7137b77c6d444fe3b2e0 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,3 +1,6 @@
+require "coveralls"
+Coveralls.wear!("rails")
+

 ENV["RAILS_ENV"] = "test"
 require File.expand_path("../../config/environment", __FILE__)
 require "rails/test_help"
 ENV["RAILS_ENV"] = "test"
 require File.expand_path("../../config/environment", __FILE__)
 require "rails/test_help"