Skip to content

Commit 8831abe

Browse files
sivaschenkosivaschenko
authored
ENGCOM-3386: #18990: Shipping address is not validated in checkout… #19038 
2 parents d2a69f3 + 74e4bec commit 8831abe

File tree

7 files changed

+151
-4
lines changed

7 files changed

+151
-4
lines changed

‎app/code/Magento/Checkout/Test/Mftf/Data/CountryData.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,26 @@
1313
<item>Bahamas</item>
1414
</array>
1515
</entity>
16+
<entity name="DefaultCountriesWithRequiredRegions" type="countryArray">
17+
<array key="country">
18+
<item>Australia</item>
19+
<item>Brazil</item>
20+
<item>Canada</item>
21+
<item>Croatia</item>
22+
<item>Estonia</item>
23+
<item>India</item>
24+
<item>Latvia</item>
25+
<item>Lithuania</item>
26+
<item>Romania</item>
27+
<item>Spain</item>
28+
<item>Switzerland</item>
29+
<item>United States</item>
30+
<item>Australia</item>
31+
</array>
32+
</entity>
33+
<entity name="CustomCountryWithRequiredRegion" type="countryArray">
34+
<array key="country">
35+
<item>United Kingdom</item>
36+
</array>
37+
</entity>
1638
</entities>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithoutRegionTest.xml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="StorefrontCustomerCheckoutWithoutRegionTest">
12+
<annotations>
13+
<features value="Checkout"/>
14+
<stories value="Checkout via the Admin"/>
15+
<title value="Shipping address is not validated in checkout when proceeding step as logged in user with default shipping address"/>
16+
<description value="Shouldn't be able to place an order as a customer without state if it's required."/>
17+
<severity value="CRITICAL"/>
18+
<testCaseId value="#"/>
19+
<group value="checkout"/>
20+
</annotations>
21+
<before>
22+
<createData entity="SimpleSubCategory" stepKey="createCategory"/>
23+
<createData entity="SimpleProduct" stepKey="createProduct">
24+
<requiredEntity createDataKey="createCategory"/>
25+
</createData>
26+
<createData entity="Simple_GB_Customer" stepKey="createCustomer"/>
27+
<actionGroup stepKey="loginToAdminPanel" ref="LoginAsAdmin"/>
28+
<actionGroup ref="SelectCountriesWithRequiredRegion" stepKey="setCustomCountryWithRequiredRegion">
29+
<argument name="countries" value="CustomCountryWithRequiredRegion"/>
30+
</actionGroup>
31+
</before>
32+
<after>
33+
<actionGroup ref="SelectCountriesWithRequiredRegion" stepKey="setDefaultCountriesWithRequiredRegion">
34+
<argument name="countries" value="DefaultCountriesWithRequiredRegions"/>
35+
</actionGroup>
36+
<actionGroup ref="logout" stepKey="logout"/>
37+
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
38+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
39+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
40+
</after>
41+
42+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
43+
<argument name="Customer" value="$$createCustomer$$" />
44+
</actionGroup>
45+
46+
<actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart">
47+
<argument name="product" value="$$createProduct$$"/>
48+
</actionGroup>
49+
50+
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="navigateToCheckoutPage"/>
51+
52+
<click selector="{{CheckoutShippingSection.next}}" stepKey="clickNextButton"/>
53+
<see selector="{{StorefrontMessagesSection.error}}" userInput='Please specify a regionId in shipping address.' stepKey="seeErrorMessages"/>
54+
</test>
55+
</tests>

‎app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,11 @@ define([
265265
addressData,
266266
loginFormSelector = 'form[data-role=email-with-possible-login]',
267267
emailValidationResult = customer.isLoggedIn(),
268-
field;
268+
field,
269+
country = registry.get(this.parentName + '.shippingAddress.shipping-address-fieldset.country_id'),
270+
countryIndexedOptions = country.indexedOptions,
271+
option = countryIndexedOptions[quote.shippingAddress().countryId],
272+
messageContainer = registry.get('checkout.errors').messageContainer;
269273

270274
if (!quote.shippingMethod()) {
271275
this.errorValidationMessage(
@@ -318,6 +322,16 @@ define([
318322
shippingAddress['save_in_address_book'] = 1;
319323
}
320324
selectShippingAddress(shippingAddress);
325+
} else if (customer.isLoggedIn() &&
326+
option &&
327+
option['is_region_required'] &&
328+
!quote.shippingAddress().region
329+
) {
330+
messageContainer.addErrorMessage({
331+
message: $t('Please specify a regionId in shipping address.')
332+
});
333+
334+
return false;
321335
}
322336

323337
if (!emailValidationResult) {

‎app/code/Magento/Config/Test/Mftf/ActionGroup/GeneralConfigurationActionGroup.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,17 @@
3737
<click selector="#save" stepKey="saveConfig"/>
3838
<waitForPageLoad stepKey="waitForSavingConfig"/>
3939
</actionGroup>
40+
41+
<actionGroup name="SelectCountriesWithRequiredRegion">
42+
<arguments>
43+
<argument name="countries" type="countryArray"/>
44+
</arguments>
45+
<amOnPage url="{{AdminConfigGeneralPage.url}}" stepKey="navigateToAdminConfigGeneralPage"/>
46+
<conditionalClick selector="{{StateOptionsSection.stateOptions}}" dependentSelector="{{StateOptionsSection.countriesWithRequiredRegions}}" visible="false" stepKey="expandStateOptionsTab" />
47+
<waitForAjaxLoad stepKey="waitForAjax"/>
48+
<scrollTo selector="{{StateOptionsSection.countriesWithRequiredRegions}}" stepKey="scrollToForm"/>
49+
<selectOption selector="{{StateOptionsSection.countriesWithRequiredRegions}}" parameterArray="[{{countries.country}}]" stepKey="selectCountriesWithRequiredRegion"/>
50+
<click selector="#save" stepKey="saveConfig"/>
51+
<waitForPageLoad stepKey="waitForSavingConfig"/>
52+
</actionGroup>
4053
</actionGroups>

‎app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,9 @@
3838
<element name="countryOptionsOpen" type="button" selector="#general_country-head.open"/>
3939
<element name="topDestinations" type="select" selector="#general_country_destinations"/>
4040
</section>
41+
<section name="StateOptionsSection">
42+
<element name="stateOptions" type="button" selector="#general_region-head"/>
43+
<element name="countriesWithRequiredRegions" type="select" selector="#general_region_state_required"/>
44+
<element name="allowToChooseState" type="select" selector="general_region_display_all"/>
45+
</section>
4146
</sections>

‎app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,4 +102,17 @@
102102
<data key="website_id">0</data>
103103
<requiredEntity type="address">US_Address_CA</requiredEntity>
104104
</entity>
105+
<entity name="Simple_GB_Customer" type="customer">
106+
<data key="group_id">0</data>
107+
<data key="default_billing">true</data>
108+
<data key="default_shipping">true</data>
109+
<data key="email" unique="prefix">Jane.Doe@example.com</data>
110+
<data key="firstname">Jane</data>
111+
<data key="lastname">Doe</data>
112+
<data key="fullname">Jane Doe</data>
113+
<data key="password">pwdTest123!</data>
114+
<data key="store_id">0</data>
115+
<data key="website_id">0</data>
116+
<requiredEntity type="address">UK_Not_Default_Address</requiredEntity>
117+
</entity>
105118
</entities>

‎dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/shipping.test.js

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require.config({
1212
}
1313
});
1414

15-
define(['squire', 'ko', 'jquery', 'jquery/validate'], function (Squire, ko, $) {
15+
define(['squire', 'ko', 'jquery', 'uiRegistry', 'jquery/validate'], function (Squire, ko, $, registry) {
1616
'use strict';
1717

1818
var injector = new Squire(),
@@ -28,7 +28,17 @@ define(['squire', 'ko', 'jquery', 'jquery/validate'], function (Squire, ko, $) {
2828
'Magento_Checkout/js/model/address-converter': jasmine.createSpy(),
2929
'Magento_Checkout/js/model/quote': {
3030
isVirtual: jasmine.createSpy(),
31-
shippingMethod: ko.observable()
31+
shippingMethod: ko.observable(),
32+
33+
/**
34+
* Stub
35+
*/
36+
shippingAddress: function () {
37+
38+
return {
39+
'countryId': 'AD'
40+
};
41+
}
3242
},
3343
'Magento_Checkout/js/action/create-shipping-address': jasmine.createSpy().and.returnValue(
3444
jasmine.createSpyObj('newShippingAddress', ['getKey'])
@@ -52,7 +62,7 @@ define(['squire', 'ko', 'jquery', 'jquery/validate'], function (Squire, ko, $) {
5262
'checkoutData',
5363
['setSelectedShippingAddress', 'setNewCustomerShippingAddress', 'setSelectedShippingRate']
5464
),
55-
'uiRegistry': jasmine.createSpy(),
65+
'Magento_Ui/js/lib/registry/registry': registry,
5666
'Magento_Checkout/js/model/shipping-rate-service': jasmine.createSpy()
5767
},
5868
obj;
@@ -63,6 +73,7 @@ define(['squire', 'ko', 'jquery', 'jquery/validate'], function (Squire, ko, $) {
6373
obj = new Constr({
6474
provider: 'provName',
6575
name: '',
76+
parentName: 'test',
6677
index: '',
6778
popUpForm: {
6879
options: {
@@ -156,12 +167,26 @@ define(['squire', 'ko', 'jquery', 'jquery/validate'], function (Squire, ko, $) {
156167

157168
describe('"setShippingInformation" method', function () {
158169
it('Check method call.', function () {
170+
spyOn(obj, 'validateShippingInformation').and.returnValue(false);
159171
expect(obj.setShippingInformation()).toBeUndefined();
160172
});
161173
});
162174

163175
describe('"validateShippingInformation" method', function () {
164176
it('Check method call on negative cases.', function () {
177+
var country = {
178+
'indexedOptions': {
179+
'AD':
180+
{
181+
label: 'Andorra',
182+
labeltitle: 'Andorra',
183+
value: 'AD'
184+
}
185+
}
186+
};
187+
188+
registry.set('test.shippingAddress.shipping-address-fieldset.country_id', country);
189+
registry.set('checkout.errors', {});
165190
obj.source = {
166191
get: jasmine.createSpy().and.returnValue(true),
167192
set: jasmine.createSpy(),

0 commit comments

Comments
 (0)