diff --git a/.github/workflows/spec.yml b/.github/workflows/spec.yml index 606489a4..514f1743 100644 --- a/.github/workflows/spec.yml +++ b/.github/workflows/spec.yml @@ -49,3 +49,4 @@ jobs: if: github.ref == 'refs/heads/master' with: project-token: ${{ secrets.CODACY_PROJECT_TOKEN }} + coverage-reports: coverage/coverage.xml diff --git a/Gemfile b/Gemfile index d19bed4b..b4f036c7 100644 --- a/Gemfile +++ b/Gemfile @@ -245,7 +245,7 @@ group :test do gem 'transactional_capybara' gem 'webdrivers' # for measuring test coverage - gem 'codecov', require: false + gem 'simplecov-cobertura' # for describing models gem 'shoulda-matchers', require: false # for stubing/mocking models diff --git a/Gemfile.lock b/Gemfile.lock index 94bee081..2a8f64c5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -128,9 +128,6 @@ GEM aws_cf_signer rest-client cocoon (1.2.14) - codecov (0.2.11) - json - simplecov coderay (1.1.1) concurrent-ruby (1.1.8) connection_pool (2.2.2) @@ -164,7 +161,7 @@ GEM devise_ichain_authenticatable (0.3.2) devise (>= 2.2) diff-lcs (1.3) - docile (1.3.2) + docile (1.3.5) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) dotenv (2.7.5) @@ -530,10 +527,14 @@ GEM shellany (0.0.1) shoulda-matchers (4.1.2) activesupport (>= 4.2.0) - simplecov (0.19.0) + simplecov (0.21.2) docile (~> 1.1) simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (1.4.2) + simplecov (~> 0.8) simplecov-html (0.12.3) + simplecov_json_formatter (0.1.2) sixarm_ruby_unaccent (1.2.0) skylight (3.1.5) skylight-core (= 3.1.5) @@ -633,7 +634,6 @@ DEPENDENCIES climate_control cloudinary cocoon - codecov countable-rails country_select daemons @@ -706,6 +706,7 @@ DEPENDENCIES sass-rails (>= 4.0.2) selectize-rails shoulda-matchers + simplecov-cobertura skylight spring-commands-rspec sprockets-rails diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index a68412da..4e43fb06 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -3,9 +3,9 @@ # This file is copied to spec/ when you run 'rails generate rspec:install' require 'simplecov' -if ENV['TRAVIS'] - require 'codecov' - SimpleCov.formatter = SimpleCov::Formatter::Codecov +if ENV['GITHUB_ACTIONS'] + require 'simplecov-cobertura' + SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter end SimpleCov.start 'rails'