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 address state when not persisted and validation error (#12915)

brozek457cabbd9629
diff --git a/api/spec/requests/spree/api/v2/storefront/account/orders_spec.rb b/api/spec/requests/spree/api/v2/storefront/account/orders_spec.rb
index 135c79b8d3..e0d1d6a32f 100644
--- a/api/spec/requests/spree/api/v2/storefront/account/orders_spec.rb
+++ b/api/spec/requests/spree/api/v2/storefront/account/orders_spec.rb
@@ -5,7 +5,10 @@ describe 'Storefront API v2 Orders spec', type: :request do
let!(:user) { create(:user_with_addresses) }
let!(:order) { create(:order, state: 'complete', user: user, completed_at: Time.current, store: store) }
- before { Spree::Api::Config[:api_v2_per_page_limit] = 2 }
+ before do
+ allow(Spree::Api::Config).to receive(:[]).and_call_original
+ allow(Spree::Api::Config).to receive(:[]).with(:api_v2_per_page_limit).and_return(2)
+ end
include_context 'API v2 tokens'
diff --git a/api/spec/requests/spree/api/v2/storefront/products_spec.rb b/api/spec/requests/spree/api/v2/storefront/products_spec.rb
index c09a58fe2c..99ebc2db86 100644
--- a/api/spec/requests/spree/api/v2/storefront/products_spec.rb
+++ b/api/spec/requests/spree/api/v2/storefront/products_spec.rb
@@ -27,7 +27,8 @@ describe 'API V2 Storefront Products Spec', type: :request do
# We need to make sure that the default locale is reset before and after every test case
before do
I18n.default_locale = :en
- Spree::Api::Config[:api_v2_per_page_limit] = 4
+ allow(Spree::Api::Config).to receive(:[]).and_call_original
+ allow(Spree::Api::Config).to receive(:[]).with(:api_v2_per_page_limit).and_return(4)
allow_any_instance_of(Spree::Api::V2::Storefront::ProductsController).to receive(:current_store).and_return(store)
end
diff --git a/api/spec/requests/spree/api/v2/storefront/taxons_spec.rb b/api/spec/requests/spree/api/v2/storefront/taxons_spec.rb
index 2238c543b1..2078246afb 100644
--- a/api/spec/requests/spree/api/v2/storefront/taxons_spec.rb
+++ b/api/spec/requests/spree/api/v2/storefront/taxons_spec.rb
@@ -7,7 +7,8 @@ describe 'Taxons Spec', type: :request do
before do
store.update_column(:supported_locales, 'en,pl,es')
- Spree::Api::Config[:api_v2_per_page_limit] = 2
+ allow(Spree::Api::Config).to receive(:[]).and_call_original
+ allow(Spree::Api::Config).to receive(:[]).with(:api_v2_per_page_limit).and_return(2)
end
after { I18n.locale = :en }
diff --git a/core/app/views/spree/addresses/_form.html.erb b/core/app/views/spree/addresses/_form.html.erb
index 2501a23901..5ec01f2ecb 100644
--- a/core/app/views/spree/addresses/_form.html.erb
+++ b/core/app/views/spree/addresses/_form.html.erb
@@ -5,7 +5,7 @@
data-controller="address-form address-autocomplete"
data-address-form-countries-value="<%= available_countries.to_json %>"
data-address-form-states-value="<%= available_states.to_json %>"
- data-address-form-current-state-id-value="<%= address.state_id %>"
+ data-address-form-current-state-id-value="<%= address.state_id || address_form.object.state_id %>"
>
<div id="<%= "#{address_id}country" %>">
<div class="form-group mb-0">