Update CI tests to Ruby 2.7. Update spec dependencies. factory_bot_ra…

…ils, simplecov, and rspec-rails (#388) * update spec dependencies. factory_bot_rails, simplecov, and rspec-rails * update CI to run Ruby 2.7 * remove deprecated codeclimate-test-reporter
zooniverse · Dec 18, 2024 · 797940f · 797940f
1 parent 52f1942
commit 797940f
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 74 deletions.
diff --git a/.github/workflows/run_tests_CI.yml b/.github/workflows/run_tests_CI.yml
@@ -28,13 +28,7 @@ jobs:
           - Gemfile
           - Gemfile.next
         ruby:
-          - 2.6
           - 2.7
-        exclude:
-          - gemfile: Gemfile
-            ruby: 2.7
-          - gemfile: Gemfile.next
-            ruby: 2.6
     env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}
 

diff --git a/Gemfile b/Gemfile
@@ -32,21 +32,20 @@ gem 'zoo_stream', '~> 1.0'
 
 group :test, :development do
   gem 'benchmark-ips'
-  gem 'factory_bot_rails', '~> 5.0'
+  gem 'factory_bot_rails'
   gem 'ffi', '1.16.3'
   gem 'guard'
   gem 'guard-rspec'
   gem 'pry'
   gem 'rspec-its'
-  gem 'rspec-rails', '~> 4.1.2' # upgrade when on rails 5.2
+  gem 'rspec-rails'
   gem 'spring-commands-rspec'
   gem 'ten_years_rails'
   gem 'timecop'
 end
 
 group :test do
-  gem 'codeclimate-test-reporter', '~> 0.5'
   gem 'mock_redis'
-  gem 'simplecov', '~> 0.11.2'
+  gem 'simplecov'
   gem 'webmock', '~> 3.4'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -76,8 +76,6 @@ GEM
     benchmark-ips (2.13.0)
     bigdecimal (3.1.8)
     builder (3.3.0)
-    codeclimate-test-reporter (0.6.0)
-      simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.3)
     colorize (1.1.0)
     concurrent-ruby (1.3.4)
@@ -91,17 +89,17 @@ GEM
     crass (1.0.6)
     date (3.4.0)
     diff-lcs (1.5.1)
-    docile (1.1.5)
+    docile (1.4.1)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     erubi (1.13.0)
     et-orbi (1.2.11)
       tzinfo
-    factory_bot (5.2.0)
-      activesupport (>= 4.2.0)
-    factory_bot_rails (5.2.0)
-      factory_bot (~> 5.2.0)
-      railties (>= 4.2.0)
+    factory_bot (6.4.5)
+      activesupport (>= 5.0.0)
+    factory_bot_rails (6.4.3)
+      factory_bot (~> 6.4)
+      railties (>= 5.0.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -157,7 +155,6 @@ GEM
       concurrent-ruby (~> 1.0)
     its-it (1.3.0)
     jmespath (1.6.2)
-    json (1.8.6)
     json-schema (2.8.1)
       addressable (>= 2.4)
     kaminari (1.2.2)
@@ -197,8 +194,8 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2024.0806)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.7)
-    minitest (5.25.1)
+    mini_portile2 (2.8.8)
+    minitest (5.25.4)
     mock_redis (0.36.0)
       ruby2_keywords
     modware (0.1.3)
@@ -217,8 +214,8 @@ GEM
     netrc (0.11.0)
     newrelic_rpm (9.12.0)
     nio4r (2.7.4)
-    nokogiri (1.13.10)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.15.7)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -259,8 +256,9 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
+    rails-html-sanitizer (1.6.2)
+      loofah (~> 2.21)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     railties (5.2.8.1)
       actionpack (= 5.2.8.1)
       activesupport (= 5.2.8.1)
@@ -285,26 +283,26 @@ GEM
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (4.1.2)
-      actionpack (>= 4.2)
-      activesupport (>= 4.2)
-      railties (>= 4.2)
+    rspec-rails (5.1.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
       rspec-core (~> 3.10)
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
-    rspec-support (3.13.1)
+    rspec-support (3.13.2)
     ruby2_keywords (0.0.5)
     schema_monkey (2.1.6)
       activerecord (>= 4.2)
@@ -334,11 +332,12 @@ GEM
     sidekiq-cron (1.9.1)
       fugit (~> 1.8)
       sidekiq (>= 4.2.1)
-    simplecov (0.11.2)
-      docile (~> 1.1.0)
-      json (~> 1.8)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.13.1)
+    simplecov_json_formatter (0.1.4)
     spring (3.1.1)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
@@ -380,8 +379,7 @@ PLATFORMS
 DEPENDENCIES
   aws-sdk (~> 2.3.7)
   benchmark-ips
-  codeclimate-test-reporter (~> 0.5)
-  factory_bot_rails (~> 5.0)
+  factory_bot_rails
   faraday
   faraday_middleware
   ffi (= 1.16.3)
@@ -402,12 +400,12 @@ DEPENDENCIES
   redis (~> 3.3.0)
   restpack_serializer!
   rspec-its
-  rspec-rails (~> 4.1.2)
+  rspec-rails
   schema_plus_pg_indexes
   sidekiq (< 6)
   sidekiq-congestion (~> 0.1.0)
   sidekiq-cron
-  simplecov (~> 0.11.2)
+  simplecov
   spring
   spring-commands-rspec
   ten_years_rails

diff --git a/Gemfile.next.lock b/Gemfile.next.lock
@@ -76,8 +76,6 @@ GEM
     benchmark-ips (2.14.0)
     bigdecimal (3.1.8)
     builder (3.3.0)
-    codeclimate-test-reporter (0.6.0)
-      simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.3)
     concurrent-ruby (1.3.4)
     congestion (0.1.0)
@@ -90,15 +88,15 @@ GEM
     crass (1.0.6)
     date (3.3.4)
     diff-lcs (1.5.1)
-    docile (1.1.5)
+    docile (1.4.1)
     erubi (1.13.0)
     et-orbi (1.2.11)
       tzinfo
-    factory_bot (5.2.0)
-      activesupport (>= 4.2.0)
-    factory_bot_rails (5.2.0)
-      factory_bot (~> 5.2.0)
-      railties (>= 4.2.0)
+    factory_bot (6.4.5)
+      activesupport (>= 5.0.0)
+    factory_bot_rails (6.4.3)
+      factory_bot (~> 6.4)
+      railties (>= 5.0.0)
     faraday (1.10.4)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -151,7 +149,6 @@ GEM
       concurrent-ruby (~> 1.0)
     its-it (1.3.0)
     jmespath (1.6.2)
-    json (1.8.6)
     json-schema (2.8.1)
       addressable (>= 2.4)
     kaminari (1.2.2)
@@ -176,7 +173,7 @@ GEM
       activesupport (>= 3.0)
       logstash-event (~> 1.2.0)
       request_store
-    loofah (2.22.0)
+    loofah (2.23.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     lumberjack (1.2.10)
@@ -188,8 +185,8 @@ GEM
     marcel (1.0.4)
     method_source (1.1.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.7)
-    minitest (5.25.1)
+    mini_portile2 (2.8.8)
+    minitest (5.25.4)
     mock_redis (0.36.0)
       ruby2_keywords
     modware (0.1.3)
@@ -207,8 +204,8 @@ GEM
       net-protocol
     newrelic_rpm (9.14.0)
     nio4r (2.7.3)
-    nokogiri (1.13.10)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.15.7)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -249,8 +246,9 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
+    rails-html-sanitizer (1.6.2)
+      loofah (~> 2.21)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     railties (5.2.8.1)
       actionpack (= 5.2.8.1)
       activesupport (= 5.2.8.1)
@@ -281,15 +279,15 @@ GEM
     rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (4.1.2)
-      actionpack (>= 4.2)
-      activesupport (>= 4.2)
-      railties (>= 4.2)
+    rspec-rails (5.1.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
       rspec-core (~> 3.10)
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
-    rspec-support (3.13.1)
+    rspec-support (3.13.2)
     ruby2_keywords (0.0.5)
     schema_monkey (2.1.6)
       activerecord (>= 4.2)
@@ -319,11 +317,12 @@ GEM
     sidekiq-cron (1.9.1)
       fugit (~> 1.8)
       sidekiq (>= 4.2.1)
-    simplecov (0.11.2)
-      docile (~> 1.1.0)
-      json (~> 1.8)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.13.1)
+    simplecov_json_formatter (0.1.4)
     spring (3.1.1)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
@@ -359,8 +358,7 @@ PLATFORMS
 DEPENDENCIES
   aws-sdk (~> 2.3.7)
   benchmark-ips
-  codeclimate-test-reporter (~> 0.5)
-  factory_bot_rails (~> 5.0)
+  factory_bot_rails
   faraday
   faraday_middleware
   ffi (= 1.16.3)
@@ -381,12 +379,12 @@ DEPENDENCIES
   redis (~> 3.3.0)
   restpack_serializer!
   rspec-its
-  rspec-rails (~> 4.1.2)
+  rspec-rails
   schema_plus_pg_indexes
   sidekiq (< 6)
   sidekiq-congestion (~> 0.1.0)
   sidekiq-cron
-  simplecov (~> 0.11.2)
+  simplecov
   spring
   spring-commands-rspec
   ten_years_rails

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,8 +1,7 @@
 ENV['RAILS_ENV'] ||= 'test'
 
 require 'simplecov'
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
+SimpleCov.start
 
 ENV.keys.grep(/aws/i).each{ |key| ENV.delete key }