Bump rails to 6.1.7.3 (#221)

* Bump rails to 6.1.7.3
* Bump rspec-rails to 4.0.2 (to make specs work again)
* Fix ReorderWorkflow to solve deprecation warning

Gemfile

@@ -5,7 +5,7 @@ ruby '3.0.6'
 
 gem 'rake', '12.3.3'
 
-gem 'rails', '6.0.5'
+gem 'rails', '6.1.7.3'
 
 gem 'pg', '1.3.5'
 
@@ -40,7 +40,7 @@ gem 'kaminari', '1.2.2'
 group :development, :test do
   gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
 
-  gem 'rspec-rails', '3.8.3'
+  gem 'rspec-rails', '4.0.2'
   gem 'factory_bot_rails', '5.0.2'
 end
 

Gemfile.lock

@@ -1,61 +1,65 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.5)
+    actioncable (6.1.7.3)
-      actionpack (= 6.0.5)
+      actionpack (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.5)
+    actionmailbox (6.1.7.3)
-      actionpack (= 6.0.5)
+      actionpack (= 6.1.7.3)
-      activejob (= 6.0.5)
+      activejob (= 6.1.7.3)
-      activerecord (= 6.0.5)
+      activerecord (= 6.1.7.3)
-      activestorage (= 6.0.5)
+      activestorage (= 6.1.7.3)
-      activesupport (= 6.0.5)
+      activesupport (= 6.1.7.3)
       mail (>= 2.7.1)
-    actionmailer (6.0.5)
+    actionmailer (6.1.7.3)
-      actionpack (= 6.0.5)
+      actionpack (= 6.1.7.3)
-      actionview (= 6.0.5)
+      actionview (= 6.1.7.3)
-      activejob (= 6.0.5)
+      activejob (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.5)
+    actionpack (6.1.7.3)
-      actionview (= 6.0.5)
+      actionview (= 6.1.7.3)
-      activesupport (= 6.0.5)
+      activesupport (= 6.1.7.3)
-      rack (~> 2.0, >= 2.0.8)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.5)
+    actiontext (6.1.7.3)
-      actionpack (= 6.0.5)
+      actionpack (= 6.1.7.3)
-      activerecord (= 6.0.5)
+      activerecord (= 6.1.7.3)
-      activestorage (= 6.0.5)
+      activestorage (= 6.1.7.3)
-      activesupport (= 6.0.5)
+      activesupport (= 6.1.7.3)
       nokogiri (>= 1.8.5)
-    actionview (6.0.5)
+    actionview (6.1.7.3)
-      activesupport (= 6.0.5)
+      activesupport (= 6.1.7.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.5)
+    activejob (6.1.7.3)
-      activesupport (= 6.0.5)
+      activesupport (= 6.1.7.3)
       globalid (>= 0.3.6)
-    activemodel (6.0.5)
+    activemodel (6.1.7.3)
-      activesupport (= 6.0.5)
+      activesupport (= 6.1.7.3)
-    activerecord (6.0.5)
+    activerecord (6.1.7.3)
-      activemodel (= 6.0.5)
+      activemodel (= 6.1.7.3)
-      activesupport (= 6.0.5)
+      activesupport (= 6.1.7.3)
-    activestorage (6.0.5)
+    activestorage (6.1.7.3)
-      actionpack (= 6.0.5)
+      actionpack (= 6.1.7.3)
-      activejob (= 6.0.5)
+      activejob (= 6.1.7.3)
-      activerecord (= 6.0.5)
+      activerecord (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       marcel (~> 1.0)
-    activesupport (6.0.5)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.7.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
+      i18n (>= 1.6, < 2)
-      minitest (~> 5.1)
+      minitest (>= 5.1)
-      tzinfo (~> 1.1)
+      tzinfo (~> 2.0)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      zeitwerk (~> 2.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     babel-source (5.8.35)
@@ -78,9 +82,10 @@ GEM
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     childprocess (4.1.0)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     connection_pool (2.2.5)
     crass (1.0.6)
+    date (3.3.3)
     devise (4.7.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -88,7 +93,7 @@ GEM
       responders
       warden (~> 1.2.3)
     diff-lcs (1.5.0)
-    erubi (1.10.0)
+    erubi (1.12.0)
     execjs (2.8.1)
     factory_bot (5.0.2)
       activesupport (>= 4.2.0)
@@ -96,12 +101,12 @@ GEM
       factory_bot (~> 5.0.2)
       railties (>= 4.2.0)
     ffi (1.15.5)
-    globalid (1.0.1)
+    globalid (1.1.0)
       activesupport (>= 5.0)
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.12.0)
+    i18n (1.13.0)
       concurrent-ruby (~> 1.0)
     i18n-js (3.9.2)
       i18n (>= 0.6.6)
@@ -123,21 +128,33 @@ GEM
     listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.19.1)
+    loofah (2.20.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.1)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     marcel (1.0.2)
     matrix (0.4.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
+    mini_portile2 (2.8.2)
-    minitest (5.17.0)
+    minitest (5.18.0)
     msgpack (1.5.2)
     multi_xml (0.6.0)
-    nio4r (2.5.8)
+    net-imap (0.3.4)
-    nokogiri (1.13.10)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
+    nio4r (2.5.9)
+    nokogiri (1.14.3)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     orm_adapter (0.5.0)
@@ -147,38 +164,38 @@ GEM
       nio4r (~> 2.0)
     pundit (2.2.0)
       activesupport (>= 3.0.0)
-    racc (1.6.1)
+    racc (1.6.2)
-    rack (2.2.6.3)
+    rack (2.2.7)
     rack-proxy (0.7.2)
       rack
-    rack-test (1.1.0)
+    rack-test (2.1.0)
-      rack (>= 1.0, < 3)
+      rack (>= 1.3)
-    rails (6.0.5)
+    rails (6.1.7.3)
-      actioncable (= 6.0.5)
+      actioncable (= 6.1.7.3)
-      actionmailbox (= 6.0.5)
+      actionmailbox (= 6.1.7.3)
-      actionmailer (= 6.0.5)
+      actionmailer (= 6.1.7.3)
-      actionpack (= 6.0.5)
+      actionpack (= 6.1.7.3)
-      actiontext (= 6.0.5)
+      actiontext (= 6.1.7.3)
-      actionview (= 6.0.5)
+      actionview (= 6.1.7.3)
-      activejob (= 6.0.5)
+      activejob (= 6.1.7.3)
-      activemodel (= 6.0.5)
+      activemodel (= 6.1.7.3)
-      activerecord (= 6.0.5)
+      activerecord (= 6.1.7.3)
-      activestorage (= 6.0.5)
+      activestorage (= 6.1.7.3)
-      activesupport (= 6.0.5)
+      activesupport (= 6.1.7.3)
-      bundler (>= 1.3.0)
+      bundler (>= 1.15.0)
-      railties (= 6.0.5)
+      railties (= 6.1.7.3)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.4)
+    rails-html-sanitizer (1.5.0)
       loofah (~> 2.19, >= 2.19.1)
-    railties (6.0.5)
+    railties (6.1.7.3)
-      actionpack (= 6.0.5)
+      actionpack (= 6.1.7.3)
-      activesupport (= 6.0.5)
+      activesupport (= 6.1.7.3)
       method_source
-      rake (>= 0.8.7)
+      rake (>= 12.2)
-      thor (>= 0.20.3, < 2.0)
+      thor (~> 1.0)
     rake (12.3.3)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
@@ -194,23 +211,23 @@ GEM
       actionpack (>= 5.0)
       railties (>= 5.0)
     rexml (3.2.5)
-    rspec-core (3.8.2)
+    rspec-core (3.12.2)
-      rspec-support (~> 3.8.0)
+      rspec-support (~> 3.12.0)
-    rspec-expectations (3.8.6)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
+      rspec-support (~> 3.12.0)
-    rspec-mocks (3.8.2)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
+      rspec-support (~> 3.12.0)
-    rspec-rails (3.8.3)
+    rspec-rails (4.0.2)
-      actionpack (>= 3.0)
+      actionpack (>= 4.2)
-      activesupport (>= 3.0)
+      activesupport (>= 4.2)
-      railties (>= 3.0)
+      railties (>= 4.2)
-      rspec-core (~> 3.8.0)
+      rspec-core (~> 3.10)
-      rspec-expectations (~> 3.8.0)
+      rspec-expectations (~> 3.10)
-      rspec-mocks (~> 3.8.0)
+      rspec-mocks (~> 3.10)
-      rspec-support (~> 3.8.0)
+      rspec-support (~> 3.10)
-    rspec-support (3.8.3)
+    rspec-support (3.12.0)
     rubyzip (2.3.2)
     selenium-webdriver (4.1.0)
       childprocess (>= 0.5, < 5.0)
@@ -220,21 +237,21 @@ GEM
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
       spring (>= 1.2, < 3.0)
-    sprockets (3.7.2)
+    sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
+      rack (>= 2.2.4, < 4)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     thor (1.2.1)
-    thread_safe (0.3.6)
     tilt (2.0.10)
+    timeout (0.3.2)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
-    tzinfo (1.2.10)
+    tzinfo (2.0.6)
-      thread_safe (~> 0.1)
+      concurrent-ruby (~> 1.0)
     warden (1.2.9)
       rack (>= 2.0.9)
     web-console (4.2.0)
@@ -255,7 +272,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.6)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   ruby
@@ -274,10 +291,10 @@ DEPENDENCIES
   pg (= 1.3.5)
   puma (= 4.3.12)
   pundit (= 2.2.0)
-  rails (= 6.0.5)
+  rails (= 6.1.7.3)
   rake (= 12.3.3)
   react-rails (= 2.6.2)
-  rspec-rails (= 3.8.3)
+  rspec-rails (= 4.0.2)
   selenium-webdriver (= 4.1.0)
   spring (= 2.1.1)
   spring-watcher-listen (= 2.0.1)

app/workflows/ReorderWorkflow.rb

@@ -8,7 +8,7 @@ class ReorderWorkflow
   #   column_name: the name of the db column that contains the order information, e.g. 'order'
   #   entity_id: the id of the entity being reordered
   #   src_index: the current order of the entity
-  #   dst_index = the new order of the entity
+  #   dst_index: the new order of the entity
   #
   # The workflow reorders the record with id <entity_id> of entity <entity_classname>
   # from <src_index> to <dst_index> using <column_name> as the db column that keeps the ordering
@@ -51,14 +51,13 @@ class ReorderWorkflow
 
     # save all changes in a single transaction
     entity_classname.transaction do
-      begin
+      entity_records.each(&:save!)
-        entity_records.each(&:save!)
-
-        return entity_records
-      rescue
-        return nil
-      end
     end
+
+    return entity_records
+
+  rescue
+    return nil
   end
 
   def convert_indexes_to_i

db/schema.rb

@@ -2,8 +2,8 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# This file is the source Rails uses to define your schema when running `rails
+# This file is the source Rails uses to define your schema when running `bin/rails
-# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
 # be faster and is potentially less error prone than running all of your
 # migrations from scratch. Old migrations may fail to apply correctly if those
 # migrations use external dependencies or application code.