[ci] Cleanup SimpleCov settings

openSUSE · Aug 18, 2015 · 9e2569c · 9e2569c
1 parent 7c8b48f
commit 9e2569c
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 19 deletions.
diff --git a/src/api/.simplecov b/src/api/.simplecov
diff --git a/src/api/test/functional/webui/login_test.rb b/src/api/test/functional/webui/login_test.rb
@@ -3,8 +3,6 @@
 require_relative '../../test_helper'
 require 'faker'
 
-SimpleCov.command_name 'test:webui'
-
 class Webui::LoginTest < Webui::IntegrationTest
 
   #

diff --git a/src/api/test/test_helper.rb b/src/api/test/test_helper.rb
@@ -1,13 +1,22 @@
 ENV['RAILS_ENV'] = 'test'
 require 'simplecov'
 require 'coveralls'
-Coveralls.wear_merged!('rails')
 
-SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-SimpleCov.start 'rails' do
-  add_filter '/app/indices/'
-  add_filter '/app/models/user_ldap_strategy.rb'
-end if ENV['DO_COVERAGE']
+if ENV['DO_COVERAGE']
+  Coveralls.wear_merged!('rails')
+
+  SimpleCov.start 'rails' do
+    add_filter '/app/indices/'
+    add_filter '/app/models/user_ldap_strategy.rb'
+    merge_timeout 3600
+    formatter Coveralls::SimpleCov::Formatter
+  end
+
+  SimpleCov.at_exit do
+    puts "Coverage done"
+    SimpleCov.result.format!
+  end
+end
 
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'

diff --git a/src/api/test/unit/binary_release.rb b/src/api/test/unit/binary_release.rb
@@ -1,8 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + "/..") + "/test_helper"
 require 'faker'
 
-SimpleCov.command_name 'test:api'
-
 class BinaryReleaseTest < ActiveSupport::TestCase
   fixtures :all
 

diff --git a/src/api/test/unit/channel_test.rb b/src/api/test/unit/channel_test.rb
@@ -1,8 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + "/..") + "/test_helper"
 require 'faker'
 
-SimpleCov.command_name 'test:api'
-
 class ChannelTest < ActiveSupport::TestCase
   fixtures :all
 

diff --git a/src/api/test/unit/webui/application_helper_test.rb b/src/api/test/unit/webui/application_helper_test.rb
@@ -1,5 +1,7 @@
 require 'test_helper'
 
+SimpleCov.command_name 'test:webui'
+
 class ApplicationHelperTest < ActiveSupport::TestCase
   include Webui::WebuiHelper