Skip to content

Commit c73f18e

Browse files
author
Magento CICD
authored
merge magento/2.3-develop into magento-tsg-csl3/2.3-develop-pr7
2 parents 183a017 + 3a236b3 commit c73f18e

File tree

161 files changed

+1151
-225
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+1151
-225
lines changed

‎app/code/Magento/Backend/Test/Mftf/Page/AdminDashboardPage.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
11+
<page name="AdminDashboardPage" url="admin/dashboard/" area="admin" module="Magento_Backend">
12+
<section name="AdminMenuSection"/>
13+
</page>
14+
</pages>

‎app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
11+
<section name="AdminMenuSection">
12+
<element name="catalog" type="button" selector="#menu-magento-catalog-catalog"/>
13+
<element name="customers" type="button" selector="#menu-magento-customer-customer"/>
14+
<element name="content" type="button" selector="#menu-magento-backend-content"/>
15+
<element name="widgets" type="button" selector="#nav li[data-ui-id='menu-magento-widget-cms-widget-instance']"/>
16+
<element name="stores" type="button" selector="#menu-magento-backend-stores"/>
17+
<element name="configuration" type="button" selector="#nav li[data-ui-id='menu-magento-config-system-config']"/>
18+
</section>
19+
</sections>

‎app/code/Magento/Braintree/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"require": {
88
"php": "~7.1.3||~7.2.0",
9-
"braintree/braintree_php": "3.34.0",
9+
"braintree/braintree_php": "3.35.0",
1010
"magento/framework": "*",
1111
"magento/magento-composer-installer": "*",
1212
"magento/module-catalog": "*",

‎app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClearFiltersActionGroup.xml

100644100755
File mode changed.

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@
121121
<argument name="simpleProduct"/>
122122
</arguments>
123123
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
124+
<waitForPageLoad stepKey="waitForPageLoad"/>
124125
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
125126
<click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
126127
<fillField userInput="{{simpleProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
<element name="setProductAsNewFrom" type="input" selector="input[name='product[news_from_date]']"/>
4848
<element name="setProductAsNewTo" type="input" selector="input[name='product[news_to_date]']"/>
4949
<element name="attributeLabelByText" type="text" selector="//*[@class='admin__field']//span[text()='{{attributeLabel}}']" parameterized="true"/>
50+
<element name="customSelectField" type="select" selector="//select[@name='product[{{var}}]']" parameterized="true"/>
5051
</section>
5152
<section name="ProductInWebsitesSection">
5253
<element name="sectionHeader" type="button" selector="div[data-index='websites']" timeout="30"/>

‎app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,7 @@
1313
<element name="filterOption" type="text" selector=".filter-options-content .item"/>
1414
<element name="optionQty" type="text" selector=".filter-options-content .item .count"/>
1515
</section>
16+
<section name="StorefrontCategorySidebarMobileSection">
17+
<element name="shopByButton" type="button" selector="//div[contains(@class, 'filter-title')]/strong[contains(text(), 'Shop By')]"/>
18+
</section>
1619
</sections>

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViews.xml renamed to ‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,19 @@
6868
<!-- Open Product Grid, Filter product and open -->
6969

7070
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
71-
<waitForPageLoad time="30" stepKey="waitForPageLoad"/>
71+
<waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
7272

73-
<actionGroup ref="filterProductGridBySku" stepKey="filterGroupedProductOptions">
73+
<actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="filterGroupedProductOptions">
7474
<argument name="product" value="_defaultProduct"/>
7575
</actionGroup>
76+
7677
<click selector="{{AdminProductGridSection.productGridXRowYColumnButton('1', '2')}}" stepKey="openProductForEdit"/>
77-
<waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
78+
<waitForPageLoad time="30" stepKey="waitForPageLoad2"/>
7879

7980
<!-- Update Product with Option Value DropDown 1-->
80-
8181
<conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses2"/>
8282
<click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="checkAddOption1"/>
83-
<waitForPageLoad time="10" stepKey="waitForPageLoad7"/>
83+
<waitForPageLoad time="10" stepKey="waitForPageLoad3"/>
8484
<fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionTitle('New Option')}}" userInput="Custom Options 1" stepKey="fillOptionTitle1"/>
8585
<click selector="{{AdminProductCustomizableOptionsSection.checkSelect('Custom Options 1')}}" stepKey="clickSelect1"/>
8686
<click selector="{{AdminProductCustomizableOptionsSection.checkDropDown('Custom Options 1')}}" stepKey="clickDropDown1"/>
@@ -97,19 +97,20 @@
9797
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton1"/>
9898

9999
<!-- Switcher to Store FR-->
100+
<scrollToTopOfPage stepKey="scrollToTopOfPage1"/>
100101

101102
<click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreSwitcher"/>
102103
<click selector="{{AdminProductFormActionSection.selectStoreView(customStoreFR.name)}}" stepKey="clickStoreView"/>
103104
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptMessage"/>
104105

105106
<!-- Open tab Customizable Options -->
106107

107-
<waitForPageLoad time="10" stepKey="waitForPageLoad2"/>
108+
<waitForPageLoad time="10" stepKey="waitForPageLoad4"/>
108109
<conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses3"/>
109110

110111
<!-- Update Option Customizable Options and Option Value 1-->
111112

112-
<waitForPageLoad time="30" stepKey="waitForPageLoad8"/>
113+
<waitForPageLoad time="30" stepKey="waitForPageLoad5"/>
113114
<uncheckOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitle}}" stepKey="uncheckUseDefaultOptionTitle"/>
114115
<fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionTitle('Custom Options 1')}}" userInput="FR Custom Options 1" stepKey="fillOptionTitle2"/>
115116
<uncheckOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitleByIndex('0')}}" stepKey="uncheckUseDefaultOptionValueTitle1"/>
@@ -125,15 +126,16 @@
125126
<!-- Login Customer Storefront -->
126127

127128
<amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
128-
<waitForPageLoad stepKey="waitForSignInPage"/>
129+
<waitForPageLoad time="30" stepKey="waitForPageLoad6"/>
129130
<fillField userInput="$$createCustomer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="fillEmail"/>
130131
<fillField userInput="$$createCustomer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
131132
<click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton"/>
132133

133134
<!-- Go to Product Page -->
134135

135136
<amOnPage url="{{StorefrontHomePage.url}}$$createProduct.custom_attributes[url_key]$$.html" stepKey="amOnProduct1Page"/>
136-
<waitForPageLoad stepKey="waitForProductPage"/>
137+
<waitForPageLoad time="30" stepKey="waitForPageLoad7"/>
138+
137139
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownTitle('Custom Options 1')}}" stepKey="seeProductOptionDropDownTitle"/>
138140
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option1')}}" stepKey="seeproductOptionDropDownOptionTitle1"/>
139141
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option2')}}" stepKey="seeproductOptionDropDownOptionTitle2"/>
@@ -171,22 +173,24 @@
171173
<conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemPrice('150')}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" visible="false" stepKey="exposeProductOptions1"/>
172174
<see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" userInput="option2" stepKey="seeProductOptionValueDropdown1Input2"/>
173175
<click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
176+
<waitForPageLoad time="30" stepKey="waitForPageLoad8"/>
174177

175178
<!-- Place Order -->
176179

177-
<waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
180+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder1"/>
178181
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
179182

180183
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
181184

182185
<!-- Open Order -->
183186

184187
<amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
185-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnOrdersPage"/>
188+
<waitForPageLoad stepKey="waitForPageLoadOrdersPage"/>
186189
<fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
187190
<click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
188191
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>
189192
<click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
193+
<waitForPageLoad time="30" stepKey="waitForPageLoad10"/>
190194

191195
<!-- Checking the correctness of displayed custom options for user parameters on Order -->
192196

@@ -196,14 +200,15 @@
196200
<!-- Switch to FR Store View Storefront -->
197201

198202
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnProduct4Page"/>
199-
<waitForPageLoad stepKey="waitForStorefrontHomePage"/>
203+
<waitForPageLoad time="30" stepKey="waitForPageLoad11"/>
200204
<click selector="{{StorefrontHeaderSection.storeViewSwitcher}}" stepKey="clickStoreViewSwitcher1"/>
201205
<waitForElementVisible selector="{{StorefrontHeaderSection.storeViewDropdown}}" stepKey="waitForStoreViewDropdown1"/>
202206
<click selector="{{StorefrontHeaderSection.storeViewOption(customStoreFR.code)}}" stepKey="selectStoreView1"/>
203-
<waitForPageLoad stepKey="waitForPageLoad4"/>
207+
<waitForPageLoad stepKey="waitForPageLoad12"/>
204208

205209
<amOnPage url="{{StorefrontHomePage.url}}$$createProduct.custom_attributes[url_key]$$.html" stepKey="amOnProduct2Page"/>
206-
<waitForPageLoad stepKey="waitForProductPage2"/>
210+
<waitForPageLoad time="30" stepKey="waitForPageLoad13"/>
211+
207212
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownTitle('FR Custom Options 1')}}" stepKey="seeProductFrOptionDropDownTitle"/>
208213
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('FR Custom Options 1', 'FR option1')}}" stepKey="productFrOptionDropDownOptionTitle1"/>
209214
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('FR Custom Options 1', 'FR option2')}}" stepKey="productFrOptionDropDownOptionTitle2"/>
@@ -241,52 +246,56 @@
241246
<conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemPrice('150')}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" visible="false" stepKey="exposeProductOptions3"/>
242247
<see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" userInput="FR option2" stepKey="seeProductFrOptionValueDropdown1Input3"/>
243248
<click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext1"/>
249+
<waitForPageLoad time="30" stepKey="waitForPageLoad14"/>
244250

245251
<!-- Place Order -->
246252

247-
<waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton1"/>
253+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder2"/>
248254
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder1"/>
249255

250256
<!-- Open Product Grid, Filter product and open -->
251257

252258
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage1"/>
253-
<waitForPageLoad time="30" stepKey="waitForPageLoad5"/>
259+
<waitForPageLoad time="30" stepKey="waitForPageLoad15"/>
254260

255-
<actionGroup ref="filterProductGridBySku" stepKey="filterGroupedProductOptions1">
261+
<actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="filterGroupedProductOptions1">
256262
<argument name="product" value="_defaultProduct"/>
257263
</actionGroup>
264+
258265
<click selector="{{AdminProductGridSection.productGridXRowYColumnButton('1', '2')}}" stepKey="openProductForEdit1"/>
259-
<waitForPageLoad time="30" stepKey="waitForPageLoad6"/>
266+
<waitForPageLoad time="30" stepKey="waitForPageLoad16"/>
260267

261268
<!-- Switcher to Store FR-->
262269

270+
<scrollToTopOfPage stepKey="scrollToTopOfPage2"/>
263271
<click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreSwitcher1"/>
264272
<click selector="{{AdminProductFormActionSection.selectStoreView(customStoreFR.name)}}" stepKey="clickStoreView1"/>
265273
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptMessage1"/>
266274

267275
<!-- Open tab Customizable Options -->
268276

269-
<waitForPageLoad time="30" stepKey="waitForPageLoad9"/>
277+
<waitForPageLoad time="30" stepKey="waitForPageLoad17"/>
270278
<conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses4" />
271279

272280
<!-- Update Option Customizable Options and Option Value 1-->
273281

274-
<waitForPageLoad time="30" stepKey="waitForPageLoad10"/>
282+
<waitForPageLoad time="30" stepKey="waitForPageLoad18"/>
275283
<checkOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitle}}" stepKey="checkUseDefaultOptionTitle"/>
276284
<checkOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitleByIndex('0')}}" stepKey="checkUseDefaultOptionValueTitle1"/>
277285

278286
<!-- Update Product with Option Value 1 DropDown 1-->
279287

280-
<waitForPageLoad time="30" stepKey="waitForPageLoad11"/>
288+
<waitForPageLoad time="30" stepKey="waitForPageLoad19"/>
281289
<checkOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitleByIndex('1')}}" stepKey="checkUseDefaultOptionValueTitle2"/>
282290
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton3"/>
283291

284292
<!--Go to Product Page-->
285293

286294
<amOnPage url="{{StorefrontHomePage.url}}$$createProduct.custom_attributes[url_key]$$.html" stepKey="amOnProduct2Page2"/>
287-
<waitForPageLoad stepKey="waitForProductPage3"/>
295+
<waitForPageLoad time="30" stepKey="waitForPageLoad20"/>
296+
288297
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownTitle('Custom Options 1')}}" stepKey="seeProductOptionDropDownTitle1"/>
289298
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option1')}}" stepKey="seeProductOptionDropDownOptionTitle3"/>
290299
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option2')}}" stepKey="seeProductOptionDropDownOptionTitle4"/>
291300
</test>
292-
</tests>
301+
</tests>

‎app/code/Magento/CatalogGraphQl/Model/Resolver/Categories.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
9797
}
9898

9999
if (!$this->collection->isLoaded()) {
100-
$that->attributesJoiner->join($info->fieldASTs[0], $this->collection);
100+
$that->attributesJoiner->join($info->fieldNodes[0], $this->collection);
101101
$this->collection->addIdFilter($this->categoryIds);
102102
}
103103
/** @var CategoryInterface | \Magento\Catalog\Model\Category $item */

‎app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public function __construct(
8989
*/
9090
public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId) : array
9191
{
92-
$categoryQuery = $resolveInfo->fieldASTs[0];
92+
$categoryQuery = $resolveInfo->fieldNodes[0];
9393
$collection = $this->collectionFactory->create();
9494
$this->joinAttributesRecursively($collection, $categoryQuery);
9595
$depth = $this->depthCalculator->calculate($categoryQuery);

0 commit comments

Comments
 (0)