Merge pull request solidusio#1468 from mamhoff/allow-sending-empty-st…

…ring-as-country-iso

Convert blank country_iso on prices to nil

core/app/models/spree/price.rb

@@ -57,6 +57,10 @@ def display_country
  end
  end
 
+ def country_iso=(country_iso)
+ self[:country_iso] = country_iso.presence
+ end
+
  private
 
  def sum_of_vat_amounts

core/spec/models/spree/price_spec.rb

@@ -55,6 +55,12 @@
  it { is_expected.to be_valid }
  end
 
+ context 'when country iso is an empty string' do
+ let(:country_iso) { "" }
+
+ it { is_expected.to be_valid }
+ end
+
  context 'when country iso is a country code' do
  let!(:country) { create(:country, iso: "DE") }
  let(:country_iso) { "DE" }
@@ -69,6 +75,15 @@
  end
  end
 
+ describe "country_iso=" do
+ let(:price) { Spree::Price.new(country_iso: "de") }
+
+ it "assigns nil if passed nil" do
+ price.country_iso = nil
+ expect(price.country_iso).to be_nil
+ end
+ end
+
  describe '#country' do
  let!(:country) { create(:country, iso: "DE") }
  let(:price) { create(:price, country_iso: "DE") }