From a247ccc70a712b97869309aa5d2feaf0e1e90b98 Mon Sep 17 00:00:00 2001 From: Joerg Reichert Date: Sat, 5 Mar 2016 21:28:32 +0100 Subject: [PATCH] use Coveralls.merged!('rails') --- spec/spec_helper.rb | 6 +++--- test/test_helper.rb | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index db1215b..338182d 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,3 +1,6 @@ +require 'coveralls' +Coveralls.merged!('rails') + # This file was generated by the `rails generate rspec:install` command. Conventionally, all # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`. # The generated `.rspec` file contains `--require spec_helper` which will cause @@ -40,9 +43,6 @@ RSpec.configure do |config| mocks.verify_partial_doubles = true end -require 'coveralls' -Coveralls.wear! - # The settings below are suggested to provide a good initial experience # with RSpec, but feel free to customize to your heart's content. =begin diff --git a/test/test_helper.rb b/test/test_helper.rb index d6b6f75..67a2605 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,3 +1,6 @@ +require 'coveralls' +Coveralls.merged!('rails') + require 'simplecov' SimpleCov.start 'rails' @@ -6,9 +9,6 @@ require File.expand_path('../../config/environment', __FILE__) require 'rails/test_help' require 'capybara/rails' -require 'coveralls' -Coveralls.wear! - class ActiveSupport::TestCase # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. # fixtures :all