refactor: update to ruby3

openedx · Sep 21, 2022 · 207d17c · 207d17c
1 parent 633ab01
commit 207d17c
Show file tree

Hide file tree

Showing 10 changed files with 156 additions and 146 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,14 +13,12 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        ruby-version:
-         - 2.5.7
-         - 3.0.4
+        ruby-version: ['2.5.7', '3.0.4']
         mongodb-version: ['4.2.14']
         include:
           - ruby-version: 2.5.7
             gemfile: Gemfile
-            allow-failure: false
+            allow-failure: true
           - ruby-version: 3.0.4
             gemfile: Gemfile3
             allow-failure: true

diff --git a/Gemfile b/Gemfile
@@ -60,7 +60,7 @@ gem 'rack-protection', '~> 1.5.5'
 group :test do
   gem 'codecov', :require => false
   gem 'mongoid_cleaner', '~> 1.2.0'
-  gem 'factory_girl', '~> 4.0'
+  gem 'factory_bot'
   gem 'faker', '~> 1.6'
   gem 'guard'
   gem 'guard-unicorn'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/edx/mongoid-tree
-  revision: c7407871e32d472b98c3f31bc30a44118e4e6dfc
+  revision: 51384016e09a0623fe7b5511b6aff1435607ee0f
   specs:
     mongoid-tree (2.1.1)
       mongoid (>= 4.0, < 8)
@@ -24,182 +24,194 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    bson (4.7.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    bson (4.15.0)
     bson_ext (1.5.1)
-    codecov (0.2.6)
-      colorize
-      json
-      simplecov
-    coderay (1.1.1)
-    colorize (0.8.1)
-    concurrent-ruby (1.1.9)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    dalli (2.7.6)
-    delayed_job (4.1.8)
-      activesupport (>= 3.0, < 6.1)
-    delayed_job_mongoid (2.3.1)
+    codecov (0.6.0)
+      simplecov (>= 0.15, < 0.22)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.10)
+    crack (0.4.5)
+      rexml
+    dalli (3.2.0)
+    delayed_job (4.1.10)
+      activesupport (>= 3.0, < 8.0)
+    delayed_job_mongoid (3.0.0)
       delayed_job (>= 3.0, < 5)
-      mongoid (>= 3.0, < 8)
-      mongoid-compatibility (>= 0.4.0)
-    diff-lcs (1.3)
-    docile (1.3.2)
-    domain_name (0.5.20170404)
+      mongoid (>= 5.0)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    elasticsearch (7.8.0)
-      elasticsearch-api (= 7.8.0)
-      elasticsearch-transport (= 7.8.0)
-    elasticsearch-api (7.8.0)
+    elasticsearch (7.8.1)
+      elasticsearch-api (= 7.8.1)
+      elasticsearch-transport (= 7.8.1)
+    elasticsearch-api (7.8.1)
       multi_json
-    elasticsearch-model (7.1.0)
+    elasticsearch-model (7.1.1)
       activesupport (> 3)
       elasticsearch (> 1)
       hashie
-    elasticsearch-transport (7.8.0)
+    elasticsearch-transport (7.8.1)
       faraday (~> 1)
       multi_json
-    enumerize (2.1.2)
+    enumerize (2.5.0)
       activesupport (>= 3.2)
     eventmachine (1.2.7)
-    factory_girl (4.8.0)
-      activesupport (>= 3.0.0)
-    faker (1.7.3)
-      i18n (~> 0.5)
-    faraday (1.0.1)
-      multipart-post (>= 1.2, < 3)
+    factory_bot (6.2.1)
+      activesupport (>= 5.0.0)
+    faker (1.9.6)
+      i18n (>= 0.7)
+    faraday (1.10.2)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
     faye-websocket (0.11.1)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
     ffi (1.9.25)
-    formatador (0.2.5)
-    guard (2.14.1)
+    formatador (1.1.0)
+    guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
+      lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
-      pry (>= 0.9.12)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-unicorn (0.2.0)
       guard (>= 1.1)
-    hashdiff (0.3.4)
-    hashie (4.1.0)
-    http-cookie (1.0.3)
+    hashdiff (1.0.1)
+    hashie (5.0.0)
+    http-accept (1.7.0)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
-    i18n (0.9.5)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    json (2.3.1)
-    kgio (2.11.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    lumberjack (1.0.12)
-    method_source (0.8.2)
-    mime-types (3.1)
+    kgio (2.11.4)
+    listen (3.7.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.8)
+    method_source (1.0.0)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types-data (3.2022.0105)
     mini_portile2 (2.3.0)
     minitest (5.15.0)
-    mongo (2.5.3)
-      bson (>= 4.3.0, < 5.0.0)
-    mongoid (7.0.5)
-      activemodel (>= 5.1, < 6.1)
-      mongo (>= 2.5.1, < 3.0.0)
-      origin (~> 2.1)
-      tzinfo (>= 0.3.37)
-    mongoid-compatibility (0.4.1)
-      activesupport
-      mongoid (>= 2.0)
+    mongo (2.18.1)
+      bson (>= 4.14.1, < 5.0.0)
+    mongoid (7.5.1)
+      activemodel (>= 5.1, < 7.1, != 7.0.0)
+      mongo (>= 2.10.5, < 3.0.0)
+      ruby2_keywords (~> 0.0.5)
     mongoid_cleaner (1.2.0)
       mongoid (>= 4.0)
     mongoid_magic_counter_cache (1.1.1)
       mongoid
       rake
     multi_json (1.15.0)
-    multipart-post (2.1.1)
+    multipart-post (2.2.3)
     nenv (0.3.0)
     netrc (0.11.0)
-    newrelic_rpm (5.6.0.349)
-    nokogiri (1.8.1)
+    newrelic_rpm (8.10.1)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
-    notiffany (0.1.1)
+    notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    origin (2.3.1)
-    protected_attributes_continued (1.5.0)
+    protected_attributes_continued (1.8.2)
       activemodel (>= 5.0)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    public_suffix (4.0.6)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-nav (1.0.0)
+      pry (>= 0.9.10, < 0.15)
+    public_suffix (4.0.7)
     rack (1.6.13)
     rack-protection (1.5.5)
       rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rack-timeout (0.4.2)
-    raindrops (0.18.0)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rack-timeout (0.6.3)
+    raindrops (0.20.0)
     rake (12.3.3)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rdiscount (2.2.0.1)
-    rest-client (2.0.2)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rdiscount (2.2.0.2)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
+    rexml (3.2.5)
     rs_voteable_mongo (1.3.0)
       mongoid (~> 7.0)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)
       rspec-expectations (~> 3.6.0)
       rspec-mocks (~> 3.6.0)
-    rspec-collection_matchers (1.1.3)
+    rspec-collection_matchers (1.2.0)
       rspec-expectations (>= 2.99.0.beta1)
     rspec-core (3.6.0)
       rspec-support (~> 3.6.0)
     rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.6.0)
-    rspec-its (1.2.0)
+    rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
     rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
-    ruby_dep (1.5.0)
+    ruby2_keywords (0.0.5)
     rubyzip (1.2.4)
-    safe_yaml (1.0.4)
     shellany (0.0.1)
-    simplecov (0.19.0)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
     sinatra (1.4.8)
       rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    sinatra-param (1.4.0)
-      sinatra (~> 1.3)
-    slop (3.6.0)
-    thor (0.19.4)
+    sinatra-param (1.6.0)
+      sinatra (>= 1.3)
+    thor (1.2.1)
     thread_safe (0.3.6)
-    tilt (2.0.7)
+    tilt (2.0.11)
     timecop (0.9.5)
-    tzinfo (1.2.9)
+    tzinfo (1.2.10)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.4)
-    unicorn (5.3.1)
+    unf_ext (0.0.8.2)
+    unicorn (6.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     webmock (3.0.1)
@@ -209,12 +221,12 @@ GEM
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    will_paginate (3.1.6)
+    will_paginate (3.3.1)
     will_paginate_mongoid (2.0.1)
       mongoid
       will_paginate (~> 3.0)
     yajl-ruby (1.3.1)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby
@@ -233,7 +245,7 @@ DEPENDENCIES
   elasticsearch (~> 7.8.0)
   elasticsearch-model (~> 7.1.0)
   enumerize
-  factory_girl (~> 4.0)
+  factory_bot
   faker (~> 1.6)
   faye-websocket (~> 0.11.0)
   ffi (~> 1.9.24)

diff --git a/Gemfile3 b/Gemfile3
@@ -60,15 +60,15 @@ gem 'rack-protection', '~> 1.5.5'
 group :test do
   gem 'codecov', :require => false
   gem 'mongoid_cleaner', '~> 1.2.0'
-  gem 'factory_girl', '~> 4.0'
-  gem 'faker', '~> 1.6'
+  gem 'factory_bot'
+  gem 'faker'
   gem 'guard'
   gem 'guard-unicorn'
   gem 'rack-test', :require => 'rack/test'
   gem 'rspec', '~> 3.6.0'
   gem 'rspec-its'
   gem 'rspec-collection_matchers'
-  gem 'webmock', '~> 3.0.1'
+  gem 'webmock'
 end
 
 group 'newrelic_rpm' do