From e3d3872b8de7e6d606d4fc68042d6f43c3e0b8c6 Mon Sep 17 00:00:00 2001 From: Peter Berkenbosch Date: Thu, 21 Jan 2021 12:46:26 +0100 Subject: [PATCH] Check for combined first and last name We need to use the SolidusSupport method for checking for the combined first and last name since Solidus 3 has removed the deprecated methods from the config. --- spec/support/features/fill_addresses_fields.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/support/features/fill_addresses_fields.rb b/spec/support/features/fill_addresses_fields.rb index 9e521a0b..8beb82a7 100644 --- 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]