Merge pull request #205 from peterberkenbosch/add-support-for-solidus-3

kennyadsl · web-flow · commit 2887997e0de2 · 2021-01-29T11:09:50.000+01:00
Allow Solidus 3 version
diff --git a/solidus_auth_devise.gemspec b/solidus_auth_devise.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  solidus_version = [">= 2.6", "< 3"]
+  solidus_version = [">= 2.6", "< 4"]
 
   s.post_install_message = "
     NOTE: Rails 6 has removed secret_token in favor of secret_key_base, which was deprecated in
diff --git a/spec/support/features/fill_addresses_fields.rb b/spec/support/features/fill_addresses_fields.rb
@@ -8,7 +8,7 @@ def fill_addresses_fields_with(address)
       zipcode
       phone
     ]
-    fields += if Spree::Config.has_preference?(:use_combined_first_and_last_name_in_address) && Spree::Config.use_combined_first_and_last_name_in_address
+    fields += if SolidusSupport.combined_first_and_last_name_in_address?
       %w[name]
     else
       %w[firstname lastname]

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ def fill_addresses_fields_with(address)`
`8`	`8`	`zipcode`
`9`	`9`	`phone`
`10`	`10`	`]`
`11`		`- fields += if Spree::Config.has_preference?(:use_combined_first_and_last_name_in_address) && Spree::Config.use_combined_first_and_last_name_in_address`
	`11`	`+ fields += if SolidusSupport.combined_first_and_last_name_in_address?`
`12`	`12`	`%w[name]`
`13`	`13`	`else`
`14`	`14`	`%w[firstname lastname]`