diff options
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 9 | ||||
| -rw-r--r-- | features/support/env.rb | 5 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 4 |
5 files changed, 20 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index a1d0d49da4b..b342130423a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: ruby env: - DB=mysql + - TRAVIS=true before_install: - sudo apt-get install libicu-dev -y - gem install charlock_holmes -v="0.6.9" @@ -143,6 +143,7 @@ group :development do end group :development, :test do + gem 'coveralls', require: false gem 'rails-dev-tweaks' gem 'spinach-rails', '0.2.0' gem "rspec-rails", '2.12.2' diff --git a/Gemfile.lock b/Gemfile.lock index 36447188359..f738907fd42 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -89,6 +89,12 @@ GEM colored (1.2) colorize (0.5.8) connection_pool (1.0.0) + coveralls (0.6.2) + colorize + multi_json (~> 1.3) + rest-client + simplecov (>= 0.7) + thor crack (0.3.1) daemons (1.1.9) database_cleaner (0.9.1) @@ -348,6 +354,8 @@ GEM redis-store (1.1.3) redis (>= 2.2.0) request_store (1.0.5) + rest-client (1.6.7) + mime-types (>= 1.16) rspec (2.12.0) rspec-core (~> 2.12.0) rspec-expectations (~> 2.12.0) @@ -468,6 +476,7 @@ DEPENDENCIES chosen-rails (= 0.9.8) coffee-rails (~> 3.2.2) colored + coveralls database_cleaner devise draper diff --git a/features/support/env.rb b/features/support/env.rb index 2fd7ffdb813..03521afb9a1 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -1,5 +1,10 @@ require 'simplecov' unless ENV['CI'] +if ENV['TRAVIS'] + require 'coveralls' + Coveralls.wear! +end + ENV['RAILS_ENV'] = 'test' require './config/environment' diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index f6f70cfd96a..30518cc2b9f 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,5 +1,9 @@ require 'simplecov' unless ENV['CI'] +if ENV['TRAVIS'] + require 'coveralls' + Coveralls.wear! +end # This file is copied to spec/ when you run 'rails generate rspec:install' ENV["RAILS_ENV"] ||= 'test' |