Skip to content

Commit

Permalink
Upgrade simplecov and remove codecov ruby uploader
Browse files Browse the repository at this point in the history
  • Loading branch information
mayorova committed Sep 18, 2024
1 parent 866484e commit 77d2aac
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 19 deletions.
5 changes: 2 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,10 @@ gem 'dynamic_form'
gem 'record_tag_helper', '~> 1.0'

group :test do
# To remove once migrated all functional tests
gem 'codecov', :require => false
gem 'rack-no_animations', '~> 1.0.3'
gem 'rails-controller-testing', '~> 1.0.4'
gem 'simplecov', '~> 0.21.2', require: false
gem 'simplecov', '~> 0.22.0', require: false
gem 'simplecov-cobertura', '~> 2.1'

gem 'capybara', '~>3.35.3'
gem 'xpath', '~>3.2.0'
Expand Down
15 changes: 8 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,6 @@ GEM
ci_reporter (2.0.0)
builder (>= 2.1.2)
climate_control (0.2.0)
codecov (0.4.3)
simplecov (>= 0.15, < 0.22)
coderay (1.1.3)
coffee-rails (5.0.0)
coffee-script (>= 2.2.0)
Expand Down Expand Up @@ -332,7 +330,7 @@ GEM
declarative-option (< 0.2.0)
representable (>= 2.4.0, <= 3.1.0)
uber (< 0.2.0)
docile (1.3.5)
docile (1.4.1)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.8.1)
Expand Down Expand Up @@ -813,12 +811,15 @@ GEM
concurrent-ruby (>= 1.2.0)
redis-prescription (~> 2.2)
sidekiq (>= 6.5)
simplecov (0.21.2)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
simplecov-cobertura (2.1.0)
rexml
simplecov (~> 0.19)
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.2)
simplecov_json_formatter (0.1.4)
slim (4.0.1)
temple (>= 0.7.6, < 0.9)
tilt (>= 2.0.6, < 2.1)
Expand Down Expand Up @@ -988,7 +989,6 @@ DEPENDENCIES
childprocess
chronic
ci_reporter_shell!
codecov
coffee-rails (~> 5.0)
colorize
commonmarker (~> 0.23.10)
Expand Down Expand Up @@ -1096,7 +1096,8 @@ DEPENDENCIES
sidekiq-batch (~> 0.2.0)
sidekiq-cron
sidekiq-throttled (~> 1.4.0)
simplecov (~> 0.21.2)
simplecov (~> 0.22.0)
simplecov-cobertura (~> 2.1)
slim-rails (~> 3.2)
sorted_set (~> 1.0)
sprockets-rails
Expand Down
4 changes: 2 additions & 2 deletions features/support/env_formatter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
if ENV['CI']
require 'simplecov'
require "simplecov_json_formatter"
require 'codecov'
require 'simplecov-cobertura'
formatters = [
SimpleCov::Formatter::SimpleFormatter,
SimpleCov::Formatter::JSONFormatter,
SimpleCov::Formatter::HTMLFormatter,
Codecov::SimpleCov::Formatter
SimpleCov::Formatter::CoberturaFormatter
]
SimpleCov.start do
formatter SimpleCov::Formatter::MultiFormatter.new(formatters)
Expand Down
4 changes: 3 additions & 1 deletion lib/tasks/coverage.rake
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# frozen_string_literal: true

task :coverage do
require 'simplecov'
SimpleCov::ResultMerger.merged_result.format!
SimpleCov::ResultMerger.merged_result&.format!
end
4 changes: 2 additions & 2 deletions spec/rails_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@
if ENV['CI']
require 'simplecov'
require "simplecov_json_formatter"
require 'codecov'
require 'simplecov-cobertura'
formatters = [
SimpleCov::Formatter::SimpleFormatter,
SimpleCov::Formatter::JSONFormatter,
SimpleCov::Formatter::HTMLFormatter,
Codecov::SimpleCov::Formatter
SimpleCov::Formatter::CoberturaFormatter
]
SimpleCov.start do
formatter SimpleCov::Formatter::MultiFormatter.new(formatters)
Expand Down
4 changes: 2 additions & 2 deletions test/minitest_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
if ENV['CI']
require 'simplecov'
require "simplecov_json_formatter"
require 'codecov'
require 'simplecov-cobertura'
formatters = [
SimpleCov::Formatter::SimpleFormatter,
SimpleCov::Formatter::JSONFormatter,
SimpleCov::Formatter::HTMLFormatter,
Codecov::SimpleCov::Formatter
SimpleCov::Formatter::CoberturaFormatter
]
SimpleCov.start do
formatter SimpleCov::Formatter::MultiFormatter.new(formatters)
Expand Down
4 changes: 2 additions & 2 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
if ENV['CI']
require 'simplecov'
require "simplecov_json_formatter"
require 'codecov'
require 'simplecov-cobertura'
formatters = [
SimpleCov::Formatter::SimpleFormatter,
SimpleCov::Formatter::JSONFormatter,
SimpleCov::Formatter::HTMLFormatter,
Codecov::SimpleCov::Formatter
SimpleCov::Formatter::CoberturaFormatter
]
SimpleCov.start do
formatter SimpleCov::Formatter::MultiFormatter.new(formatters)
Expand Down

0 comments on commit 77d2aac

Please sign in to comment.