Upgrade simplecov and remove codecov ruby uploader

3scale · Sep 16, 2024 · 71000f5 · 71000f5
1 parent b1800dc
commit 71000f5
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 19 deletions.
diff --git a/Gemfile b/Gemfile
@@ -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'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -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)
@@ -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)
@@ -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)
@@ -988,7 +989,6 @@ DEPENDENCIES
   childprocess
   chronic
   ci_reporter_shell!
-  codecov
   coffee-rails (~> 5.0)
   colorize
   commonmarker (~> 0.23.10)
@@ -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

diff --git a/features/support/env_formatter.rb b/features/support/env_formatter.rb
@@ -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)

diff --git a/lib/tasks/coverage.rake b/lib/tasks/coverage.rake
@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 task :coverage do
   require 'simplecov'
-  SimpleCov::ResultMerger.merged_result.format!
+  SimpleCov::ResultMerger.merged_result&.format!
 end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
@@ -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)

diff --git a/test/minitest_helper.rb b/test/minitest_helper.rb
@@ -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)

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -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)