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.

Update specs

Łukasz Adamczykc08c68aba194
diff --git a/api/spec/controllers/spree/api/v2/storefront/account/addresses_controller_spec.rb b/api/spec/controllers/spree/api/v2/storefront/account/addresses_controller_spec.rb
index 13fb643168..e52ef5d63e 100644
--- a/api/spec/controllers/spree/api/v2/storefront/account/addresses_controller_spec.rb
+++ b/api/spec/controllers/spree/api/v2/storefront/account/addresses_controller_spec.rb
@@ -61,12 +61,11 @@ describe 'Spree::Api::V2::Storefront::Account::AddressesController', type: :requ
it 'returns errors' do
post_create
- expect(json_response['error']).to eq("City can't be blank, Country can't be blank, Zip Code can't be blank, Phone can't be blank")
+ expect(json_response['error']).to eq("City can't be blank, Country can't be blank, Zip Code can't be blank")
expect(json_response['errors']).to eq(
'city' => ["can't be blank"],
'zipcode' => ["can't be blank"],
- 'country' => ["can't be blank"],
- 'phone' => ["can't be blank"]
+ 'country' => ["can't be blank"]
)
end
@@ -206,7 +205,7 @@ describe 'Spree::Api::V2::Storefront::Account::AddressesController', type: :requ
lastname: 'Doe',
address1: '51 Guild Street',
address2: '2nd floor',
- city: 'London',
+ city: '',
phone: '079 4721 9458',
zipcode: 'SE25 3FZ',
state_name: state.name,
@@ -216,10 +215,8 @@ describe 'Spree::Api::V2::Storefront::Account::AddressesController', type: :requ
it 'returns errors' do
patch_update
- expect(json_response['error']).to eq("First Name can't be blank")
- expect(json_response['errors']).to eq(
- 'firstname' => ["can't be blank"]
- )
+ expect(json_response['error']).to eq("City can't be blank")
+ expect(json_response['errors']).to eq('city' => ["can't be blank"])
end
it 'does not update address' do
diff --git a/api/spec/requests/spree/api/v2/platform/resources_spec.rb b/api/spec/requests/spree/api/v2/platform/resources_spec.rb
index c4ad798f5c..757eb77dd5 100644
--- a/api/spec/requests/spree/api/v2/platform/resources_spec.rb
+++ b/api/spec/requests/spree/api/v2/platform/resources_spec.rb
@@ -299,12 +299,11 @@ describe 'Platform API v2 Resources spec', type: :request do
before { execute }
it 'returns errors' do
- expect(json_response['error']).to eq("City can't be blank, Country can't be blank, Zip Code can't be blank, and Phone can't be blank")
+ expect(json_response['error']).to eq("City can't be blank, Country can't be blank, and Zip Code can't be blank")
expect(json_response['errors']).to eq(
'city' => ["can't be blank"],
'zipcode' => ["can't be blank"],
- 'country' => ["can't be blank"],
- 'phone' => ["can't be blank"]
+ 'country' => ["can't be blank"]
)
end
end
diff --git a/api/spec/requests/spree/api/v2/storefront/account/addresses_spec.rb b/api/spec/requests/spree/api/v2/storefront/account/addresses_spec.rb
index 52ace3a072..2f51fb37b9 100644
--- a/api/spec/requests/spree/api/v2/storefront/account/addresses_spec.rb
+++ b/api/spec/requests/spree/api/v2/storefront/account/addresses_spec.rb
@@ -164,12 +164,11 @@ describe 'Storefront API v2 Addresses spec', type: :request do
before { post '/api/v2/storefront/account/addresses', params: params, headers: headers_bearer }
it 'returns errors' do
- expect(json_response['error']).to eq("City can't be blank, Country can't be blank, Zip Code can't be blank, Phone can't be blank")
+ expect(json_response['error']).to eq("City can't be blank, Country can't be blank, Zip Code can't be blank")
expect(json_response['errors']).to eq(
'city' => ["can't be blank"],
'zipcode' => ["can't be blank"],
- 'country' => ["can't be blank"],
- 'phone' => ["can't be blank"]
+ 'country' => ["can't be blank"]
)
end
end
diff --git a/api/spec/services/spree/webhooks/subscribers/handle_request_spec.rb b/api/spec/services/spree/webhooks/subscribers/handle_request_spec.rb
index 2b3995f324..00e35c6cf0 100644
--- a/api/spec/services/spree/webhooks/subscribers/handle_request_spec.rb
+++ b/api/spec/services/spree/webhooks/subscribers/handle_request_spec.rb
@@ -185,7 +185,7 @@ describe Spree::Webhooks::Subscribers::HandleRequest do
end
it 'adds the event data to the body' do
- perform_enqueued_jobs do
+ perform_enqueued_jobs(except: Spree::Addresses::GeocodeAddressJob) do
with_webhooks_enabled do
allow(Spree::Webhooks::Subscribers::MakeRequest).to receive(:new).and_call_original
order.finalize!
diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rb
index 511884afcf..b35e25325e 100644
--- a/core/lib/spree/core.rb
+++ b/core/lib/spree/core.rb
@@ -30,6 +30,7 @@ require 'activerecord-typedstore'
require 'request_store'
require 'wannabe_bool'
require 'geared_pagination'
+require 'geocoder'
# This is required because ActiveModel::Validations#invalid? conflicts with the
# invalid state of a Payment. In the future this should be removed.
diff --git a/core/spec/models/spree/address_spec.rb b/core/spec/models/spree/address_spec.rb
index 3cbe04aab1..83917aeb01 100644
--- a/core/spec/models/spree/address_spec.rb
+++ b/core/spec/models/spree/address_spec.rb
@@ -161,10 +161,20 @@ describe Spree::Address, type: :model do
expect(address).to be_valid
end
- it 'requires phone' do
+ it 'does not require phone' do
+ Spree::Config.set address_requires_state: false
address.phone = ''
- address.valid?
- expect(address.errors['phone']).to eq(["can't be blank"])
+ expect(address).to be_valid
+ end
+
+ context 'when phone is required' do
+ before { Spree::Config.set address_requires_phone: true }
+
+ it 'validates presence of the phone' do
+ address.phone = ''
+ address.valid?
+ expect(address.errors['phone']).to eq(["can't be blank"])
+ end
end
it 'requires zipcode' do
@@ -322,7 +332,7 @@ describe Spree::Address, type: :model do
context 'defines require_phone? helper method' do
let(:address) { create(:address) }
- specify { expect(address.instance_eval { require_phone? }).to be true }
+ specify { expect(address.instance_eval { require_phone? }).to be(false) }
end
context '#clear_state' do
diff --git a/core/spec/models/spree/shipment_spec.rb b/core/spec/models/spree/shipment_spec.rb
index 19443126c4..1cf4bbf905 100644
--- a/core/spec/models/spree/shipment_spec.rb
+++ b/core/spec/models/spree/shipment_spec.rb
@@ -793,7 +793,7 @@ describe Spree::Shipment, type: :model do
let(:variant) { order.line_items.first.variant }
before do
- perform_enqueued_jobs
+ perform_enqueued_jobs(except: Spree::Addresses::GeocodeAddressJob)
shipping_method = order.shipments.first.shipping_method
shipping_method.calculator.preferences[:amount] = order.shipments.first.cost
shipping_method.calculator.save!
diff --git a/core/spec/services/spree/account/addresses/create_spec.rb b/core/spec/services/spree/account/addresses/create_spec.rb
index c472fdbc6d..0034555f39 100644
--- a/core/spec/services/spree/account/addresses/create_spec.rb
+++ b/core/spec/services/spree/account/addresses/create_spec.rb
@@ -145,7 +145,6 @@ module Spree
country: ["can't be blank"],
firstname: ["can't be blank"],
lastname: ["can't be blank"],
- phone: ["can't be blank"],
zipcode: ["can't be blank"]
)
end
diff --git a/core/spec/services/spree/account/addresses/update_spec.rb b/core/spec/services/spree/account/addresses/update_spec.rb
index 726c084be9..97d1f69fad 100644
--- a/core/spec/services/spree/account/addresses/update_spec.rb
+++ b/core/spec/services/spree/account/addresses/update_spec.rb
@@ -37,22 +37,14 @@ module Spree
end
context 'with invalid params' do
- let(:new_address_params) do
- {
- phone: '',
- zipcode: ''
- }
- end
+ let(:new_address_params) { { zipcode: '' } }
it 'returns errors' do
expect { result }.not_to change(Address, :count)
expect(result).to be_failure
messages = result.error.value.messages
- expect(messages).to eq(
- phone: ["can't be blank"],
- zipcode: ["can't be blank"]
- )
+ expect(messages).to eq(zipcode: ["can't be blank"])
end
end
end
diff --git a/core/spec/services/spree/addresses/update_spec.rb b/core/spec/services/spree/addresses/update_spec.rb
index 5043b42357..b19632f043 100644
--- a/core/spec/services/spree/addresses/update_spec.rb
+++ b/core/spec/services/spree/addresses/update_spec.rb
@@ -324,10 +324,7 @@ RSpec.describe Spree::Addresses::Update do
expect(result).to be_failure
messages = result.error.value.messages
- expect(messages).to eq(
- phone: ["can't be blank"],
- zipcode: ["can't be blank"]
- )
+ expect(messages).to eq( zipcode: ["can't be blank"])
end
end
end
diff --git a/core/spree_core.gemspec b/core/spree_core.gemspec
index ee4f70666c..0668baae22 100644
--- a/core/spree_core.gemspec
+++ b/core/spree_core.gemspec
@@ -61,4 +61,5 @@ Gem::Specification.new do |s|
s.add_dependency 'wannabe_bool'
s.add_dependency 'geared_pagination'
s.add_dependency 'any_ascii', '~> 0.3.2'
+ s.add_dependency 'geocoder'
end