From 5bf499baa00c2da1db94740a5497ef467114fdc1 Mon Sep 17 00:00:00 2001
From: Pierre de La Morinerie <kemenaran@gmail.com>
Date: Tue, 9 Mar 2021 14:47:58 +0100
Subject: [PATCH 1/2] specs: remove rspec_junit_formatter

It was unsed by CircleCI to generate test reports in the JUnit XML
format, but:

- We now use Github Actions, which has its own reporting system,
- It prevents us to upgrade to rspec > 3.
---
 Gemfile      | 1 -
 Gemfile.lock | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 228b0de16..14898ae50 100644
--- a/Gemfile
+++ b/Gemfile
@@ -115,7 +115,6 @@ group :development, :test do
   gem 'graphql-schema_comparator'
   gem 'mina', git: 'https://github.com/mina-deploy/mina.git', require: false # Deploy
   gem 'pry-byebug' # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem 'rspec_junit_formatter', require: false
   gem 'rspec-rails'
   gem 'simple_xlsx_reader'
   gem 'spring' # Spring speeds up development by keeping your application running in the background
diff --git a/Gemfile.lock b/Gemfile.lock
index 081650c09..1c3bcc5d0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -588,8 +588,6 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.10.2)
-    rspec_junit_formatter (0.4.1)
-      rspec-core (>= 2, < 4, != 2.12.0)
     rubocop (1.10.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
@@ -855,7 +853,6 @@ DEPENDENCIES
   rgeo-geojson
   rqrcode
   rspec-rails
-  rspec_junit_formatter
   rubocop
   rubocop-rails_config
   rubocop-rspec-focused

From 4c3fcfeec272b112c50375d12ed2ffa703e995b3 Mon Sep 17 00:00:00 2001
From: Pierre de La Morinerie <kemenaran@gmail.com>
Date: Tue, 9 Mar 2021 14:48:47 +0100
Subject: [PATCH 2/2] specs: upgrade to rspec 5

Rspec 5 is compatible with Rails 6.1.
---
 Gemfile.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1c3bcc5d0..74145f600 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -416,7 +416,7 @@ GEM
     mini_magick (4.11.0)
     mini_mime (1.0.2)
     mini_portile2 (2.5.0)
-    minitest (5.14.3)
+    minitest (5.14.4)
     momentjs-rails (2.20.1)
       railties (>= 3.1)
     multi_json (1.15.0)
@@ -579,10 +579,10 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-rails (4.0.2)
-      actionpack (>= 4.2)
-      activesupport (>= 4.2)
-      railties (>= 4.2)
+    rspec-rails (5.0.0)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
       rspec-core (~> 3.10)
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)