From 62234c0708582cbf8ee94f399b2764e404eb91f0 Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Fri, 12 Mar 2021 11:08:38 +1100
Subject: [PATCH] Configure SimpleCov as recommended by author

The configuration can go into the central .simplecov file and then we
just need to `require` simplecov to start the coverage process. This
also avoids duplicating the config if we want to start simplecov from
the rails server to cover the lines used in by the server in feature
specs.

https://github.com/simplecov-ruby/simplecov#using-simplecov-for-centralized-config
---
 .simplecov              | 18 ++++++++++++++++++
 spec/coverage_helper.rb | 21 ---------------------
 spec/spec_helper.rb     |  6 +-----
 3 files changed, 19 insertions(+), 26 deletions(-)
 create mode 100644 .simplecov
 delete mode 100644 spec/coverage_helper.rb

diff --git a/.simplecov b/.simplecov
new file mode 100644
index 0000000000..ed6f826b48
--- /dev/null
+++ b/.simplecov
@@ -0,0 +1,18 @@
+#!/bin/env ruby
+
+SimpleCov.start 'rails' do
+  minimum_coverage 54
+
+  add_filter '/bin/'
+  add_filter '/config/'
+  add_filter '/jobs/application_job.rb'
+  add_filter '/schemas/'
+  add_filter '/lib/generators'
+  add_filter '/spec/'
+  add_filter '/vendor/'
+  add_filter '/public'
+  add_filter '/swagger'
+  add_filter '/script'
+  add_filter '/log'
+  add_filter '/db'
+end
diff --git a/spec/coverage_helper.rb b/spec/coverage_helper.rb
deleted file mode 100644
index fe51f01771..0000000000
--- a/spec/coverage_helper.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-if ENV["COVERAGE"]
-  require 'simplecov'
-
-  SimpleCov.minimum_coverage 54
-  SimpleCov.start 'rails' do
-    add_filter '/bin/'
-    add_filter '/config/'
-    add_filter '/jobs/application_job.rb'
-    add_filter '/schemas/'
-    add_filter '/lib/generators'
-    add_filter '/spec/'
-    add_filter '/vendor/'
-    add_filter '/public'
-    add_filter '/swagger'
-    add_filter '/script'
-    add_filter '/log'
-    add_filter '/db'
-  end
-end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c418078f19..ab8a9802e4 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
-if ENV["COVERAGE"]
-  require 'simplecov'
-  SimpleCov.start 'rails'
-end
+require 'simplecov' if ENV["COVERAGE"]
 
 require 'rubygems'
 
@@ -24,7 +21,6 @@ require 'rspec/rails'
 require 'capybara'
 require 'database_cleaner'
 require 'rspec/retry'
-require 'coverage_helper'
 require 'paper_trail/frameworks/rspec'
 
 require 'webdrivers'