Skip to content

Commit 69d13c2

Browse files
magento-engcom-teammagento-engcom-team
authored
[EngCom] Public Pull Requests - 2.3-develop
 - merged latest code from mainline branch
2 parents bea5dbf + 1a752a5 commit 69d13c2

File tree

25 files changed

+432
-7
lines changed

25 files changed

+432
-7
lines changed

‎app/code/Magento/Backend/etc/adminhtml/system.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@
234234
<field id="destinations" translate="label" type="multiselect" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
235235
<label>Top destinations</label>
236236
<source_model>Magento\Directory\Model\Config\Source\Country</source_model>
237+
<can_be_empty>1</can_be_empty>
237238
</field>
238239
</group>
239240
<group id="locale" translate="label" type="text" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="1">

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
<severity value="MAJOR"/>
1717
<testCaseId value="MC-74"/>
1818
<group value="CatalogRule"/>
19+
<skip>
20+
<issueId value="DEVOPS-3618"/>
21+
</skip>
1922
</annotations>
2023
<before>
2124
<createData entity="ApiCategory" stepKey="createCategoryOne"/>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MC-65"/>
1919
<group value="CatalogRule"/>
20+
<skip>
21+
<issueId value="DEVOPS-3618"/>
22+
</skip>
2023
</annotations>
2124
<before>
2225
<!-- Create the simple product and category that it will be in -->
@@ -74,6 +77,9 @@
7477
<severity value="MAJOR"/>
7578
<testCaseId value="MC-93"/>
7679
<group value="CatalogRule"/>
80+
<skip>
81+
<issueId value="DEVOPS-3618"/>
82+
</skip>
7783
</annotations>
7884
<before>
7985
<actionGroup stepKey="createNewPriceRule" ref="newCatalogPriceRuleByUI">
@@ -97,6 +103,9 @@
97103
<severity value="MAJOR"/>
98104
<testCaseId value="MC-69"/>
99105
<group value="CatalogRule"/>
106+
<skip>
107+
<issueId value="DEVOPS-3618"/>
108+
</skip>
100109
</annotations>
101110
<before>
102111
<actionGroup stepKey="createNewPriceRule" ref="newCatalogPriceRuleByUI">
@@ -120,6 +129,9 @@
120129
<severity value="MAJOR"/>
121130
<testCaseId value="MC-60"/>
122131
<group value="CatalogRule"/>
132+
<skip>
133+
<issueId value="DEVOPS-3618"/>
134+
</skip>
123135
</annotations>
124136
<before>
125137
<actionGroup stepKey="createNewPriceRule" ref="newCatalogPriceRuleByUI">
@@ -143,6 +155,9 @@
143155
<severity value="MAJOR"/>
144156
<testCaseId value="MC-71"/>
145157
<group value="CatalogRule"/>
158+
<skip>
159+
<issueId value="DEVOPS-3618"/>
160+
</skip>
146161
</annotations>
147162
<before>
148163
<!-- Create a simple product and a category-->

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MC-160"/>
1919
<group value="CatalogRule"/>
20+
<skip>
21+
<issueId value="DEVOPS-3618"/>
22+
</skip>
2023
</annotations>
2124
<before>
2225
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MC-79"/>
1919
<group value="CatalogRule"/>
20+
<skip>
21+
<issueId value="DEVOPS-3618"/>
22+
</skip>
2023
</annotations>
2124
<before>
2225
<actionGroup ref="LoginAsAdmin" stepKey="login"/>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,4 +145,13 @@
145145
<see selector="{{CheckoutSuccessMainSection.success}}" userInput="{{emailYouMessage}}" stepKey="seeEmailYou"/>
146146
</actionGroup>
147147

148+
<!--Verify country options in checkout top destination section-->
149+
<actionGroup name="VerifyTopDestinationsCountry">
150+
<arguments>
151+
<argument name="country" type="string"/>
152+
<argument name="placeNumber"/>
153+
</arguments>
154+
<conditionalClick selector="{{CheckoutCartSummarySection.shippingHeading}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="openShippingDetails"/>
155+
<see selector="{{CheckoutCartSummarySection.countryParameterized('placeNumber')}}" userInput="{{country}}" stepKey="seeCountry"/>
156+
</actionGroup>
148157
</actionGroups>

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="Countries" type="countryArray">
12+
<array key="country">
13+
<item>Bahamas</item>
14+
</array>
15+
</entity>
16+
</entities>

‎app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<element name="postcode" type="input" selector="input[name='postcode']" timeout="10"/>
2020
<element name="stateProvince" type="select" selector="select[name='region_id']" timeout="10"/>
2121
<element name="country" type="select" selector="select[name='country_id']" timeout="10"/>
22+
<element name="countryParameterized" type="select" selector="select[name='country_id'] > option:nth-child({{var}})" timeout="10" parameterized="true"/>
2223
<element name="estimateShippingAndTax" type="text" selector="#block-shipping-heading" timeout="5"/>
2324
<element name="flatRateShippingMethod" type="radio" selector="#s_method_flatrate_flatrate" timeout="30"/>
2425
</section>

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

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
10+
<test name="CheckoutSpecificDestinationsTest">
11+
<annotations>
12+
<title value="Check that top destinations can be removed after a selection was previously saved"/>
13+
<stories value="MAGETWO-91511: Top destinations cannot be removed after a selection was previously saved"/>
14+
<description value="Check that top destinations can be removed after a selection was previously saved"/>
15+
<features value="Checkout"/>
16+
<severity value="AVERAGE"/>
17+
<testCaseId value="MAGETWO-94195"/>
18+
<group value="Checkout"/>
19+
</annotations>
20+
21+
<before>
22+
<createData entity="_defaultCategory" stepKey="defaultCategory"/>
23+
<createData entity="_defaultProduct" stepKey="simpleProduct">
24+
<requiredEntity createDataKey="defaultCategory"/>
25+
</createData>
26+
27+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
28+
</before>
29+
30+
<!--Go to configuration general page-->
31+
<actionGroup ref="NavigateToConfigurationGeneralPage" stepKey="navigateToConfigurationGeneralPage"/>
32+
33+
<!--Open country options section-->
34+
<conditionalClick selector="{{CountryOptionsSection.countryOptions}}" dependentSelector="{{CountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="clickOnStoreInformation"/>
35+
36+
<!--Select top destinations country-->
37+
<actionGroup ref="SelectTopDestinationsCountry" stepKey="selectTopDestinationsCountry">
38+
<argument name="countries" value="Countries"/>
39+
</actionGroup>
40+
41+
<!--Go to product page-->
42+
<amOnPage url="{{StorefrontProductPage.url($$simpleProduct.name$$)}}" stepKey="amOnStorefrontProductPage"/>
43+
<waitForPageLoad stepKey="waitForProductPageLoad"/>
44+
45+
<!--Add product to cart-->
46+
<actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCart">
47+
<argument name="productName" value="$$simpleProduct.name$$"/>
48+
</actionGroup>
49+
50+
<!--Go to shopping cart-->
51+
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnPageShoppingCart"/>
52+
53+
<!--Verify country options in checkout top destination section-->
54+
<actionGroup ref="VerifyTopDestinationsCountry" stepKey="verifyTopDestinationsCountry">
55+
<argument name="country" value="Bahamas"/>
56+
<argument name="placeNumber" value="2"/>
57+
</actionGroup>
58+
59+
<!--Go to configuration general page-->
60+
<actionGroup ref="NavigateToConfigurationGeneralPage" stepKey="navigateToConfigurationGeneralPage2"/>
61+
62+
<!--Open country options section-->
63+
<conditionalClick selector="{{CountryOptionsSection.countryOptions}}" dependentSelector="{{CountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="clickOnStoreInformation2"/>
64+
65+
<!--Deselect top destinations country-->
66+
<actionGroup ref="UnSelectTopDestinationsCountry" stepKey="unSelectTopDestinationsCountry">
67+
<argument name="countries" value="Countries"/>
68+
</actionGroup>
69+
70+
<!--Go to shopping cart-->
71+
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnPageShoppingCart2"/>
72+
73+
<!--Verify country options is shown by default-->
74+
<actionGroup ref="VerifyTopDestinationsCountry" stepKey="verifyTopDestinationsCountry2">
75+
<argument name="country" value="Afghanistan"/>
76+
<argument name="placeNumber" value="2"/>
77+
</actionGroup>
78+
79+
<after>
80+
<actionGroup ref="logout" stepKey="logout"/>
81+
82+
<deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
83+
<deleteData createDataKey="defaultCategory" stepKey="deleteCategory"/>
84+
</after>
85+
</test>
86+
</tests>

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,27 @@
1414
<conditionalClick stepKey="expandDefaultLayouts" selector="{{WebSection.DefaultLayoutsTab}}" dependentSelector="{{WebSection.CheckIfTabExpand}}" visible="true" />
1515
<waitForElementVisible selector="{{DefaultLayoutsSection.categoryLayout}}" stepKey="waittForDefaultCategoryLayout" />
1616
</actionGroup>
17+
18+
<actionGroup name="NavigateToConfigurationGeneralPage">
19+
<amOnPage url="{{AdminConfigGeneralPage.url}}" stepKey="navigateToConfigGeneralPage"/>
20+
<waitForPageLoad stepKey="waitForConfigPageLoad"/>
21+
</actionGroup>
22+
23+
<actionGroup name="SelectTopDestinationsCountry">
24+
<arguments>
25+
<argument name="countries" type="countryArray"/>
26+
</arguments>
27+
<selectOption selector="{{CountryOptionsSection.topDestinations}}" parameterArray="[{{countries.country}}]" stepKey="selectTopDestinationsCountry"/>
28+
<click selector="#save" stepKey="saveConfig"/>
29+
<waitForPageLoad stepKey="waitForSavingConfig"/>
30+
</actionGroup>
31+
32+
<actionGroup name="UnSelectTopDestinationsCountry">
33+
<arguments>
34+
<argument name="countries" type="countryArray"/>
35+
</arguments>
36+
<unselectOption selector="{{CountryOptionsSection.topDestinations}}" parameterArray="[{{countries.country}}]" stepKey="unSelectTopDestinationsCountry"/>
37+
<click selector="#save" stepKey="saveConfig"/>
38+
<waitForPageLoad stepKey="waitForSavingConfig"/>
39+
</actionGroup>
1740
</actionGroups>

0 commit comments

Comments
 (0)