Merge pull request #1275 from tsigo/no_ci_simplecov

Don't run SimpleCov on Travis

Merge pull request #1275 from tsigo/no_ci_simplecov
Don't run SimpleCov on Travis
07fe78b3 · Dmitriy Zaporozhets · ed2b53cd · db4c3e58 · 07fe78b3 · 07fe78b3
Commit 07fe78b3 authored Aug 23, 2012 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

features/support/env.rb features/support/env.rb +4 -2

spec/spec_helper.rb spec/spec_helper.rb +4 -2

No files found.
--- a/features/support/env.rb
+++ b/features/support/env.rb
-require 'simplecov'
+unless ENV['CI']
-SimpleCov.start 'rails'
+  require 'simplecov'
+  SimpleCov.start 'rails'
+end
 require 'cucumber/rails'
 require 'webmock/cucumber'

--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
-require 'simplecov'
+unless ENV['CI']
-SimpleCov.start 'rails'
+  require 'simplecov'
+  SimpleCov.start 'rails'
+end
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'