Merge pull request #59 from solidusio/kennyadsl/fix-combined

Fix combined_first_and_last_name_in_address version
solidusio · Jan 27, 2021 · 81d1bed · 81d1bed
2 parents 1793442 + fc5e06e
commit 81d1bed
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/solidus_support.rb b/lib/solidus_support.rb
@@ -22,7 +22,7 @@ def reset_spree_preferences_deprecated?
     end
 
     def combined_first_and_last_name_in_address?
-      versions_before_preference = Gem::Requirement.new('< 2.10')
+      versions_before_preference = Gem::Requirement.new('< 2.11.0')
       versions_after_preference = Gem::Requirement.new('>= 3.0.0.alpha')
 
       return false if versions_before_preference.satisfied_by?(Spree.solidus_gem_version)

diff --git a/spec/solidus_support_spec.rb b/spec/solidus_support_spec.rb
@@ -59,7 +59,7 @@
     end
 
     context 'when Solidus has preference to choose if combine addresses fields' do
-      let(:solidus_version) { '2.10.3' }
+      let(:solidus_version) { '2.11.3' }
       before do
         allow(Spree::Config)
           .to receive(:use_combined_first_and_last_name_in_address)