Merge pull request #4072 from nebulab/waiting-for-dev/ruby3

Support Ruby 3
solidusio · May 25, 2021 · d6e84ec · d6e84ec
2 parents db980e6 + 5f35714
commit d6e84ec
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/core/app/models/spree/return_item.rb b/core/app/models/spree/return_item.rb
@@ -254,10 +254,9 @@ def validate_no_other_completed_return_items
       }).where.not(id: id).first
 
       if other_return_item && (new_record? || COMPLETED_RECEPTION_STATUSES.include?(reception_status.to_sym))
-        errors.add(:inventory_unit, :other_completed_return_item_exists, {
+        errors.add(:inventory_unit, :other_completed_return_item_exists,
           inventory_unit_id: inventory_unit_id,
-          return_item_id: other_return_item.id
-        })
+          return_item_id: other_return_item.id)
       end
     end
 

diff --git a/core/lib/spree/core/validators/email.rb b/core/lib/spree/core/validators/email.rb
@@ -16,7 +16,7 @@ class EmailValidator < ActiveModel::EachValidator
 
     def validate_each(record, attribute, value)
       unless EMAIL_REGEXP.match? value
-        record.errors.add(attribute, :invalid, { value: value }.merge!(options))
+        record.errors.add(attribute, :invalid, **{ value: value }.merge!(options))
       end
     end
   end

diff --git a/core/spec/models/spree/store_credit_spec.rb b/core/spec/models/spree/store_credit_spec.rb
@@ -290,7 +290,13 @@
 
       subject { store_credit.validate_authorization(store_credit_attrs[:amount], store_credit.currency) }
 
-      it { is_expected.to be_truthy }
+      if RUBY_VERSION >= "3"
+        pending "https://github.com/rails/rails/issues/42098" do
+          it { is_expected.to be_truthy }
+        end
+      else
+        it { is_expected.to be_truthy }
+      end
     end
   end