Merge pull request spree-contrib#249 from spree-contrib/fix/ruby-27-30-travis-config

Test against Ruby 2.7 and 3.0

Author: damianlegawiec

.travis.yml

@@ -19,7 +19,8 @@ env:
   - DB=mysql
 
 rvm:
-  - 2.6
+  - 2.7
+  - 3.0
 
 gemfile:
   - gemfiles/spree_3_7.gemfile
@@ -34,6 +35,13 @@ script:
   - bundle exec codeclimate-test-reporter
 
 jobs:
+  exclude:
+  - rvm: 3.0
+    gemfile: gemfiles/spree_3_7.gemfile
+  - rvm: 3.0
+    gemfile: gemfiles/spree_4_0.gemfile
+  - rvm: 3.0
+    gemfile: gemfiles/spree_4_1.gemfile
   allow_failures:
     - gemfile: gemfiles/spree_master.gemfile
 

app/models/spree/gateway/braintree_vzero_base/utils.rb

@@ -81,9 +81,11 @@ def customer_payment_methods(payment_method_type)
 
         def payment_in_vault(data = {})
           store_ship_address = data['shipping_address_id'].blank?
-          if gateway.preferred_store_payments_in_vault == 'store_only_on_success'
+
+          case gateway.preferred_store_payments_in_vault.to_s
+          when 'store_only_on_success'
             { store_in_vault_on_success: true, store_shipping_address_in_vault: store_ship_address }
-          elsif gateway.preferred_store_payments_in_vault == 'store_all'
+          when 'store_all'
             { store_in_vault: true, store_shipping_address_in_vault: store_ship_address }
           else
             { store_in_vault: false }

app/models/spree/preferences/preferable_decorator.rb

@@ -10,7 +10,7 @@ def convert_preference_value(value, type)
         when :password
           value.to_s
         when :decimal
-          BigDecimal.new(value.to_s)
+          value.to_d
         when :integer
           value.to_i
         when :boolean, :boolean_select

spec/models/gateway/braintree_vzero_base_spec.rb

@@ -116,9 +116,10 @@
         it 'saves Braintree::Address id to Spree::Address when address is being saved' do
           gateway.preferred_pass_billing_and_shipping_address = true
           address = create(:address)
-          order.ship_address = address
-          order.bill_address = address
-          order.save
+
+          order.update!(ship_address: address, bill_address: address)
+          user.update!(ship_address: address, bill_address: address)
+
           purchase
           order.reload
 
@@ -133,8 +134,10 @@
           gateway.preferred_pass_billing_and_shipping_address = true
           ship_address = create(:address, first_name: 'foo')
           bill_address = create(:address, first_name: 'bar')
-          order.ship_address = ship_address
-          order.bill_address = bill_address
+
+          order.update!(ship_address: ship_address, bill_address: bill_address)
+          user.update!(ship_address: ship_address, bill_address: bill_address)
+
           order.save
           purchase
           order.reload