Move coveralls submission to actions workflow

diff --git a/.coveralls.yml b/.coveralls.yml
deleted file mode 100644 (file)
index 9160059..0000000
--- a/.coveralls.yml
+++ /dev/null
@@ -1 +0,0 @@
-service_name: travis-ci

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2eaf153b0a5df577043cf6e3e7ed40e136a2602e..b111da9338262b0a2a5a8e9c84f2d8bb11217c0b 100644 (file)
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -3,7 +3,7 @@ on:
   - push
   - pull_request
 jobs:
   - push
   - pull_request
 jobs:

-  tests:
+  test:

     name: Ubuntu ${{ matrix.ubuntu }}, Ruby ${{ matrix.ruby }}
     strategy:
       matrix:
     name: Ubuntu ${{ matrix.ubuntu }}, Ruby ${{ matrix.ruby }}
     strategy:
       matrix:


@@ -67,3 +67,19 @@ jobs:
       run: bundle exec rake yarn:install
     - name: Run tests
       run: bundle exec rake test:db
       run: bundle exec rake yarn:install
     - name: Run tests
       run: bundle exec rake test:db

+    - name: Report completion to Coveralls
+      uses: coverallsapp/github-action@v1.1.2
+      with:
+        github-token: ${{ secrets.github_token }}
+        flag-name: ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}
+        parallel: true
+  finish:
+    name: Finalise
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+    - name: Report completion to Coveralls
+      uses: coverallsapp/github-action@v1.1.2
+      with:
+        github-token: ${{ secrets.github_token }}
+        parallel-finished: true

diff --git a/Gemfile b/Gemfile
index 10cfb970e4b5bf0207d16a7bba9079fa78076af2..8869fb37cf1c92b1b085c2e34d0cd8f4955854bb 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -141,7 +141,6 @@ end
 group :test do
   gem "brakeman"
   gem "capybara", ">= 2.15"
 group :test do
   gem "brakeman"
   gem "capybara", ">= 2.15"

-  gem "coveralls", :require => false

   gem "erb_lint", :require => false
   gem "factory_bot_rails"
   gem "minitest", "~> 5.1"
   gem "erb_lint", :require => false
   gem "factory_bot_rails"
   gem "minitest", "~> 5.1"


@@ -152,5 +151,7 @@ group :test do
   gem "rubocop-performance"
   gem "rubocop-rails"
   gem "selenium-webdriver"
   gem "rubocop-performance"
   gem "rubocop-rails"
   gem "selenium-webdriver"

+  gem "simplecov", :require => false
+  gem "simplecov-lcov", :require => false

   gem "webmock"
 end
   gem "webmock"
 end

diff --git a/Gemfile.lock b/Gemfile.lock
index 61fe25c0939f8c53d721bd17ef53e91b702b2587..13903837839d67ce0fdc9255010e617f97dd4b57 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -137,12 +137,6 @@ GEM
     config (2.2.1)
       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)
     config (2.2.1)
       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)

-    coveralls (0.8.23)
-      json (>= 1.8, < 3)
-      simplecov (~> 0.16.1)
-      term-ansicolor (~> 1.3)
-      thor (>= 0.19.4, < 2.0)
-      tins (~> 1.6)

     crack (0.4.4)
     crass (1.0.6)
     dalli (2.7.11)
     crack (0.4.4)
     crass (1.0.6)
     dalli (2.7.11)


@@ -435,6 +429,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)

+    simplecov-lcov (0.8.0)

     smart_properties (1.15.0)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
     smart_properties (1.15.0)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)


@@ -445,14 +440,9 @@ GEM
       sprockets (>= 3.0.0)
     strong_migrations (0.7.3)
       activerecord (>= 5)
       sprockets (>= 3.0.0)
     strong_migrations (0.7.3)
       activerecord (>= 5)

-    sync (0.5.0)
-    term-ansicolor (1.7.1)
-      tins (~> 1.0)

     thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
     thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)

-    tins (1.26.0)
-      sync

     tzinfo (1.2.8)
       thread_safe (~> 0.1)
     uglifier (4.2.0)
     tzinfo (1.2.8)
       thread_safe (~> 0.1)
     uglifier (4.2.0)


@@ -498,7 +488,6 @@ DEPENDENCIES
   capybara (>= 2.15)
   composite_primary_keys (~> 12.0.0)
   config
   capybara (>= 2.15)
   composite_primary_keys (~> 12.0.0)
   config

-  coveralls

   dalli
   delayed_job_active_record
   dynamic_form
   dalli
   delayed_job_active_record
   dynamic_form


@@ -552,6 +541,8 @@ DEPENDENCIES
   sassc-rails
   secure_headers
   selenium-webdriver
   sassc-rails
   secure_headers
   selenium-webdriver

+  simplecov
+  simplecov-lcov

   strong_migrations
   uglifier (>= 1.3.0)
   validates_email_format_of (>= 1.5.1)
   strong_migrations
   uglifier (>= 1.3.0)
   validates_email_format_of (>= 1.5.1)

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 720618ba094ec06ca1a5aabea17371d3675771ca..41dac890a4e880af2f61fc3ae9d77dca800bd65a 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,21 +1,30 @@
-require "coveralls"
-Coveralls.wear!("rails")
-
-# Override the simplecov output message, since it is mostly unwanted noise
-module SimpleCov
-  module Formatter
-    class HTMLFormatter
-      def output_message(_result); end
+require "simplecov"
+require "simplecov-lcov"
+
+# Fix incompatibility of simplecov-lcov with older versions of simplecov that are not expresses in its gemspec.
+# https://github.com/fortissimo1997/simplecov-lcov/pull/25
+unless SimpleCov.respond_to?(:branch_coverage)
+  module SimpleCov
+    def self.branch_coverage?
+      false

     end
   end
 end
 
     end
   end
 end
 

-# Output both the local simplecov html and the coveralls report
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
-  [SimpleCov::Formatter::HTMLFormatter,
-   Coveralls::SimpleCov::Formatter]
+SimpleCov::Formatter::LcovFormatter.config do |config|
+  config.report_with_single_file = true
+  config.single_report_path = "coverage/lcov.info"
+end
+
+SimpleCov.formatters = SimpleCov::Formatter::MultiFormatter.new(
+  [
+    SimpleCov::Formatter::HTMLFormatter,
+    SimpleCov::Formatter::LcovFormatter
+  ]

 )
 
 )
 

+SimpleCov.start("rails")
+

 require "securerandom"
 require "digest/sha1"
 
 require "securerandom"
 require "digest/sha1"