Download as
Browse Code »

Commit 07fe78b323a94d6c1591b7be8c1c657e56cd9df0

Authored by Dmitriy Zaporozhets
2 parents ed2b53cd db4c3e58
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #1275 from tsigo/no_ci_simplecov 

Don't run SimpleCov on Travis
Showing 2 changed files with 8 additions and 4 deletions   Show diff stats
features/support/env.rb
  Diff comments   View file @07fe78b
1 -require 'simplecov'  
2 -SimpleCov.start 'rails' 1 +unless ENV['CI']
  2 + require 'simplecov'
  3 + SimpleCov.start 'rails'
  4 +end
3 5
4 require 'cucumber/rails' 6 require 'cucumber/rails'
5 require 'webmock/cucumber' 7 require 'webmock/cucumber'
spec/spec_helper.rb
  Diff comments   View file @07fe78b
1 -require 'simplecov'  
2 -SimpleCov.start 'rails' 1 +unless ENV['CI']
  2 + require 'simplecov'
  3 + SimpleCov.start 'rails'
  4 +end
3 5
4 # This file is copied to spec/ when you run 'rails generate rspec:install' 6 # This file is copied to spec/ when you run 'rails generate rspec:install'
5 ENV["RAILS_ENV"] ||= 'test' 7 ENV["RAILS_ENV"] ||= 'test'