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 more tests and use .blank? not .nil? for zipcode field.

Matthew Kennedy841ec7c98a34
diff --git a/backend/spec/features/admin/orders/order_details_spec.rb b/backend/spec/features/admin/orders/order_details_spec.rb
index d1a0093538..413b345a01 100644
--- a/backend/spec/features/admin/orders/order_details_spec.rb
+++ b/backend/spec/features/admin/orders/order_details_spec.rb
@@ -5,6 +5,7 @@ describe 'Order Details', type: :feature, js: true do
let!(:product) { create(:product, name: 'spree t-shirt', price: 20.00) }
let!(:store) { create(:store) }
let(:order) { create(:order, state: 'complete', completed_at: '2011-02-01 12:36:15', number: 'R100', store_id: store.id) }
+ let(:fresh_order) { create(:order) }
let(:state) { create(:state) }
before do
@@ -21,7 +22,7 @@ describe 'Order Details', type: :feature, js: true do
before do
product.master.stock_items.first.update_column(:count_on_hand, 100)
- visit spree.store_admin_order_path(order)
+ visit spree.store_admin_order_path(fresh_order)
end
it 'displays select with current order store name' do
diff --git a/backend/spec/features/admin/returns/return_authorizations_spec.rb b/backend/spec/features/admin/returns/return_authorizations_spec.rb
index ff5e9298c3..492e7a8567 100644
--- a/backend/spec/features/admin/returns/return_authorizations_spec.rb
+++ b/backend/spec/features/admin/returns/return_authorizations_spec.rb
@@ -116,7 +116,7 @@ describe 'Return Authorizations', type: :feature do
it 'only shows authorized return authorizations' do
visit spree.admin_return_authorizations_path
- within('.nav-tabs') do
+ within('#spreePageTabs') do
click_link 'Authorized'
end
@@ -126,7 +126,7 @@ describe 'Return Authorizations', type: :feature do
it 'preselects authorized status in filter' do
visit spree.admin_return_authorizations_path
- within('.nav-tabs') do
+ within('#spreePageTabs') do
click_link 'Authorized'
end
@@ -143,7 +143,7 @@ describe 'Return Authorizations', type: :feature do
it 'only shows canceled return authorizations' do
visit spree.admin_return_authorizations_path
- within('.nav-tabs') do
+ within('#spreePageTabs') do
click_link 'Canceled'
end
@@ -153,7 +153,7 @@ describe 'Return Authorizations', type: :feature do
it 'preselects canceled status in filter' do
visit spree.admin_return_authorizations_path
- within('.nav-tabs') do
+ within('#spreePageTabs') do
click_link 'Canceled'
end
diff --git a/core/app/models/spree/address.rb b/core/app/models/spree/address.rb
index 9bdf8d41c3..f3c2b2a016 100644
--- a/core/app/models/spree/address.rb
+++ b/core/app/models/spree/address.rb
@@ -223,7 +223,7 @@ module Spree
end
def postal_code_validate
- return if country.blank? || country_iso.blank? || !require_zipcode? || zipcode.nil?
+ return if country.blank? || country_iso.blank? || !require_zipcode? || zipcode.blank?
return unless ::ValidatesZipcode::CldrRegexpCollection::ZIPCODES_REGEX.keys.include?(country_iso.upcase.to_sym)
formatted_zip = ::ValidatesZipcode::Formatter.new(