Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Fix nil errors when trying to call `Address#country_iso` without coun… (#13927)

Damian Legawiec4f261b0a052e
diff --git a/spree/core/app/models/spree/address.rb b/spree/core/app/models/spree/address.rb
index acbe2434d1..f9423dddf4 100644
--- a/spree/core/app/models/spree/address.rb
+++ b/spree/core/app/models/spree/address.rb
@@ -79,7 +79,7 @@ module Spree
end
end
- delegate :name, :iso3, :iso, :iso_name, to: :country, prefix: true
+ delegate :name, :iso3, :iso, :iso_name, to: :country, prefix: true, allow_nil: true
delegate :abbr, to: :state, prefix: true, allow_nil: true
alias_attribute :postal_code, :zipcode
diff --git a/spree/core/spec/models/spree/address_spec.rb b/spree/core/spec/models/spree/address_spec.rb
index 5f3cd98f9b..adb3aef3a6 100644
--- a/spree/core/spec/models/spree/address_spec.rb
+++ b/spree/core/spec/models/spree/address_spec.rb
@@ -384,6 +384,20 @@ describe Spree::Address, type: :model do
end
end
+ describe '#country_iso' do
+ let(:address) { build(:address, country: country) }
+ let(:country) { Spree::Country.find_by(iso: 'US') || create(:country, iso: 'US') }
+
+ it 'returns the country iso' do
+ expect(address.country_iso).to eq('US')
+ end
+
+ it 'returns nil if the country is nil' do
+ address.country = nil
+ expect(address.country_iso).to be_nil
+ end
+ end
+
context 'defines require_phone? helper method' do
let(:address) { create(:address) }