Skip to content

Commit e005d8c

Browse files
svitjasvitja
committed
Merge remote-tracking branch 'origin/2.3-develop' into MC-20070
2 parents 133c412 + 84c71b5 commit e005d8c

File tree

80 files changed

+1324
-229
lines changed

Some content is hidden

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

80 files changed

+1324
-229
lines changed

‎app/code/Magento/Backend/Block/Media/Uploader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ protected function _construct()
8787

8888
$this->setId($this->getId() . '_Uploader');
8989

90-
$uploadUrl = $this->_urlBuilder->addSessionParam()->getUrl('adminhtml/*/upload');
90+
$uploadUrl = $this->_urlBuilder->getUrl('adminhtml/*/upload');
9191
$this->getConfig()->setUrl($uploadUrl);
9292
$this->getConfig()->setParams(['form_key' => $this->getFormKey()]);
9393
$this->getConfig()->setFileField('file');

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ protected function _prepareLayout()
9595
);
9696

9797
$this->getUploader()->getConfig()->setUrl(
98-
$this->_urlBuilder->addSessionParam()->getUrl('catalog/product_gallery/upload')
98+
$this->_urlBuilder->getUrl('catalog/product_gallery/upload')
9999
)->setFileField(
100100
'image'
101101
)->setFilters(

‎app/code/Magento/Catalog/Model/Product/Url.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,10 @@ public function getUrlInStore(\Magento\Catalog\Model\Product $product, $params =
101101
*/
102102
public function getProductUrl($product, $useSid = null)
103103
{
104-
if ($useSid === null) {
105-
$useSid = $this->sidResolver->getUseSessionInUrl();
106-
}
107-
108104
$params = [];
109105
if (!$useSid) {
110106
$params['_nosid'] = true;
111107
}
112-
113108
return $this->getUrl($product, $params);
114109
}
115110

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AddRelatedProductBySkuActionGroup">
12+
<annotations>
13+
<description>Adds the provided Product SKU as a Related Product on the Admin Product creation/edit page.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="sku"/>
17+
</arguments>
18+
19+
<!--Scroll up to avoid error-->
20+
<scrollTo selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDropdown}}" x="0" y="-100" stepKey="scrollTo"/>
21+
<conditionalClick selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDropdown}}" dependentSelector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDependent}}" visible="false" stepKey="openDropDownIfClosedRelatedUpSellCrossSell"/>
22+
<click selector="{{AdminProductFormRelatedUpSellCrossSellSection.AddRelatedProductsButton}}" stepKey="clickAddRelatedProductButton"/>
23+
<conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
24+
<click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
25+
<fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{sku}}" stepKey="fillProductSkuFilter"/>
26+
<click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
27+
<waitForPageLoad stepKey="waitForPageToLoad"/>
28+
<click selector="{{AdminProductModalSlideGridSection.productGridXRowYColumnButton('1', '1')}}" stepKey="selectProduct"/>
29+
<click selector="{{AdminAddRelatedProductsModalSection.AddSelectedProductsButton}}" stepKey="addRelatedProductSelected"/>
30+
<waitForElementNotVisible selector="{{AdminAddRelatedProductsModalSection.AddSelectedProductsButton}}" stepKey="waitForElementNotVisible"/>
31+
</actionGroup>
32+
</actionGroups>

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AddUpSellProductBySkuActionGroup" extends="AddRelatedProductBySkuActionGroup">
12+
<annotations>
13+
<description>EXTENDS: AddRelatedProductBySkuActionGroup. Add the provided Product as an Up Sell Product.</description>
14+
</annotations>
15+
16+
<click selector="{{AdminProductFormRelatedUpSellCrossSellSection.AddUpSellProductsButton}}" stepKey="clickAddRelatedProductButton"/>
17+
<conditionalClick selector="{{AdminAddUpSellProductsModalSection.Modal}} {{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminAddUpSellProductsModalSection.Modal}} {{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
18+
<click selector="{{AdminAddUpSellProductsModalSection.Modal}} {{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
19+
<fillField selector="{{AdminAddUpSellProductsModalSection.Modal}} {{AdminProductGridFilterSection.skuFilter}}" userInput="{{sku}}" stepKey="fillProductSkuFilter"/>
20+
<click selector="{{AdminAddUpSellProductsModalSection.Modal}} {{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
21+
<waitForPageLoad stepKey="waitForPageToLoad"/>
22+
<click selector="{{AdminAddUpSellProductsModalSection.Modal}}{{AdminProductModalSlideGridSection.productGridXRowYColumnButton('1', '1')}}" stepKey="selectProduct"/>
23+
<click selector="{{AdminAddUpSellProductsModalSection.AddSelectedProductsButton}}" stepKey="addRelatedProductSelected"/>
24+
<waitForPageLoad stepKey="waitForPageToLoad1"/>
25+
</actionGroup>
26+
</actionGroups>

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

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,10 @@
7373
<fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{categoryEntity.name_lwr}}" stepKey="enterURLKey"/>
7474
</actionGroup>
7575

76-
<!-- Save category form -->
76+
<!--
77+
NOTICE: saveCategoryForm is deprecated.
78+
Please use SaveCategoryFormActionGroup instead.
79+
-->
7780
<actionGroup name="saveCategoryForm">
7881
<annotations>
7982
<description>Requires navigation to the Category creation/edit page. Checks that the url contains the AdminCategoryPage url. Saves the Category.</description>
@@ -139,7 +142,10 @@
139142
</assertRegExp>
140143
</actionGroup>
141144

142-
<!-- Action to navigate to Media Gallery. Used in tests to cleanup uploaded images -->
145+
<!--
146+
NOTICE: navigateToMediaGallery is deprecated.
147+
Please use NavigateToMediaGalleryActionGroup instead.
148+
-->
143149
<actionGroup name="navigateToMediaGallery">
144150
<annotations>
145151
<description>Navigates to the category page and Opens the Media Gallery.</description>
@@ -170,7 +176,10 @@
170176
<seeInTitle userInput="{{categoryEntity.name}}" stepKey="seeCategoryNameInTitle"/>
171177
</actionGroup>
172178

173-
<!--Actions to delete category-->
179+
<!--
180+
NOTICE: DeleteCategory is deprecated.
181+
Please use DeleteCategoryActionGroup instead.
182+
-->
174183
<actionGroup name="DeleteCategory">
175184
<annotations>
176185
<description>Navigates to the category page and deletes the specified category.</description>
@@ -321,6 +330,10 @@
321330
<waitForPageLoad stepKey="waitForStoreViewChangeLoad"/>
322331
</actionGroup>
323332

333+
<!--
334+
NOTICE: navigateToCreatedCategory is deprecated.
335+
Please use NavigateToCreatedCategoryActionGroup instead.
336+
-->
324337
<actionGroup name="navigateToCreatedCategory">
325338
<annotations>
326339
<description>Navigates to category page, selects a category by specified category.</description>

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

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,10 @@
251251
<dontSeeElement selector="{{AdminProductImagesSection.imageFile(image.filename)}}" stepKey="seeImage"/>
252252
</actionGroup>
253253

254-
<!--Fill fields for simple product in a category in Admin-->
254+
<!--
255+
NOTICE: FillAdminSimpleProductForm is deprecated.
256+
Please use FillAdminSimpleProductFormActionGroup instead.
257+
-->
255258
<actionGroup name="FillAdminSimpleProductForm">
256259
<annotations>
257260
<description>Goes to the Admin Product grid page. Clicks on Add. Fills the provided Product details (Name, SKU, Price, Quantity, Category and URL). Clicks on Save. Validates that the Product details are present and correct.</description>
@@ -383,7 +386,10 @@
383386
<see selector="{{element}}" userInput="{{expectedText}}" stepKey="assertText"/>
384387
</actionGroup>
385388

386-
<!--Related products-->
389+
<!--
390+
NOTICE: addRelatedProductBySku is deprecated.
391+
Please use AddRelatedProductBySkuActionGroup instead.
392+
-->
387393
<actionGroup name="addRelatedProductBySku">
388394
<annotations>
389395
<description>Adds the provided Product SKU as a Related Product on the Admin Product creation/edit page.</description>
@@ -643,6 +649,10 @@
643649
<click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategory"/>
644650
</actionGroup>
645651

652+
<!--
653+
NOTICE: expandAdminProductSection is deprecated.
654+
Please use ExpandAdminProductSectionActionGroup instead.
655+
-->
646656
<actionGroup name="expandAdminProductSection">
647657
<annotations>
648658
<description>Expand the provided Section Selector based on the provided dependant Section Selector.</description>
@@ -658,6 +668,10 @@
658668
<waitForPageLoad time="30" stepKey="waitForSectionToExpand"/>
659669
</actionGroup>
660670

671+
<!--
672+
NOTICE: navigateToCreatedProductEditPage is deprecated.
673+
Please use NavigateToCreatedProductEditPageActionGroup instead.
674+
-->
661675
<actionGroup name="navigateToCreatedProductEditPage">
662676
<annotations>
663677
<description>Goes to the Admin Product grid page. Filters the Product grid based on the provided Product details (SKU). Edits the provided Product. Validates that the Product SKU is present and correct.</description>
@@ -685,6 +699,10 @@
685699
<seeInField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{product.sku}}" stepKey="seeProductSKU"/>
686700
</actionGroup>
687701

702+
<!--
703+
NOTICE: addUpSellProductBySku is deprecated.
704+
Please use AddUpSellProductBySkuActionGroup instead.
705+
-->
688706
<actionGroup name="addUpSellProductBySku" extends="addRelatedProductBySku">
689707
<annotations>
690708
<description>EXTENDS: addRelatedProductBySku. Add the provided Product as an Up Sell Product.</description>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<!--
12+
NOTICE: navigateToCreatedProductAttribute is deprecated.
13+
Please use NavigateToCreatedProductAttributeActionGroup instead.
14+
-->
1115
<actionGroup name="navigateToCreatedProductAttribute">
1216
<annotations>
1317
<description>Goes to the Product Attributes grid page. Filters the grid based on the provided Product Attribute. Clicks on the 1st row.</description>
@@ -184,6 +188,11 @@
184188
<seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="waitForSuccessMessage"/>
185189
</actionGroup>
186190

191+
<!--
192+
NOTICE: deleteProductAttributeByLabel is deprecated.
193+
Please use deleteProductAttributeByLabelActionGroup instead.
194+
-->
195+
187196
<actionGroup name="deleteProductAttributeByLabel">
188197
<annotations>
189198
<description>Goes to the Admin Product Attributes grid page. Filters the grid for the provided Product Attribute (Label). Deletes the Product Attribute from the grid. Validates that the Success Message is present.</description>
@@ -254,6 +263,10 @@
254263
<click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
255264
</actionGroup>
256265

266+
<!--
267+
NOTICE: saveProductAttribute is deprecated.
268+
Please use SaveProductAttributeActionGroup instead.
269+
-->
257270
<actionGroup name="saveProductAttribute">
258271
<annotations>
259272
<description>Clicks on Save. Validates that the Success Message is present.</description>
@@ -265,6 +278,10 @@
265278
<seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
266279
</actionGroup>
267280

281+
<!--
282+
NOTICE: confirmChangeInputTypeModal is deprecated.
283+
Please use ConfirmChangeInputTypeModalActionGroup instead.
284+
-->
268285
<actionGroup name="confirmChangeInputTypeModal">
269286
<annotations>
270287
<description>Clicks on the Confirm button for the 'Product Data My Be Lost' modal.</description>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,10 @@
387387
<conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial2"/>
388388
</actionGroup>
389389

390+
<!--
391+
NOTICE: NavigateToAndResetProductGridToDefaultView is deprecated.
392+
Please use NavigateToAndResetProductGridToDefaultViewActionGroup instead.
393+
-->
390394
<actionGroup name="NavigateToAndResetProductGridToDefaultView" extends="resetProductGridToDefaultView">
391395
<annotations>
392396
<description>EXTENDS: resetProductGridToDefaultView. Adds an action to go to the Admin Products grid page.</description>
@@ -396,6 +400,10 @@
396400
<waitForPageLoad after="goToAdminProductIndexPage" stepKey="waitForProductIndexPageToLoad"/>
397401
</actionGroup>
398402

403+
<!--
404+
NOTICE: NavigateToAndResetProductAttributeGridToDefaultView is deprecated.
405+
Please use NavigateToAndResetProductAttributeGridToDefaultViewActionGroup instead.
406+
-->
399407
<actionGroup name="NavigateToAndResetProductAttributeGridToDefaultView">
400408
<annotations>
401409
<description>Goes to the Product Attributes grid. Clicks on 'Clear Filters'.</description>

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="ConfirmChangeInputTypeModalActionGroup">
12+
<annotations>
13+
<description>Clicks on the Confirm button for the 'Product Data My Be Lost' modal.</description>
14+
</annotations>
15+
16+
<waitForElementVisible selector="{{AdminEditProductAttributesSection.ProductDataMayBeLostConfirmButton}}" stepKey="waitForChangeInputTypeButton"/>
17+
<click selector="{{AdminEditProductAttributesSection.ProductDataMayBeLostConfirmButton}}" stepKey="clickChangeInputTypeButton"/>
18+
<waitForElementNotVisible selector="{{AdminEditProductAttributesSection.ProductDataMayBeLostModal}}" stepKey="waitForChangeInputTypeModalGone"/>
19+
</actionGroup>
20+
</actionGroups>

0 commit comments

Comments
 (0)