Skip to content

Commit c9848b6

Browse files
chittimachittima
committed
Merge branch '2.3-develop' of https://github.com/magento/magento2ce into PR-26-02-2020
2 parents 228516d + dc10ed2 commit c9848b6

File tree

124 files changed

+4205
-814
lines changed

Some content is hidden

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

124 files changed

+4205
-814
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
</annotations>
1515

1616
<seeInCurrentUrl url="{{AdminCategoryPage.url}}" stepKey="seeOnCategoryPage"/>
17+
<scrollToTopOfPage stepKey="scrollToTopOfTheCategoryPage"/>
1718
<click selector="{{AdminMainActionsSection.save}}" stepKey="saveCategory"/>
1819
<waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessageAppears"/>
1920
<see userInput="You saved the category." selector="{{AdminMessagesSection.success}}" stepKey="assertSuccessMessage"/>

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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="AssertStorefrontProductAbsentOnCategoryPageActionGroup">
12+
<annotations>
13+
<description>Navigate to category page and verify product is absent.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="categoryUrlKey" defaultValue="{{_defaultCategory.url_key}}"/>
17+
<argument name="productName" defaultValue="{{SimpleProduct.name}}"/>
18+
</arguments>
19+
20+
<amOnPage url="{{StorefrontCategoryPage.url(categoryUrlKey)}}" stepKey="navigateToCategoryPage"/>
21+
<waitForPageLoad stepKey="waitForCategoryPageLoad"/>
22+
<dontSee selector="{{StorefrontCategoryMainSection.productName}}" userInput="{{productName}}" stepKey="assertProductIsNotPresent"/>
23+
</actionGroup>
24+
</actionGroups>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="StorefrontAssertProductAbsentOnCategoryPageActionGroup">
1212
<annotations>
13-
<description>Navigate to category page and verify product is absent.</description>
13+
<description>DEPRECATED. Please use AssertStorefrontProductAbsentOnCategoryPageActionGroup instead.
14+
Navigate to category page and verify product is absent.</description>
1415
</annotations>
1516
<arguments>
1617
<argument name="category" defaultValue="_defaultCategory"/>

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,28 @@
101101
<entity name="ProductAttributeOptionTwoForExportImport" extends="productAttributeOption2" type="ProductAttributeOption">
102102
<data key="label">option2</data>
103103
</entity>
104+
<entity name="ProductAttributeOption10" type="ProductAttributeOption">
105+
<var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
106+
<data key="label" unique="suffix">3.5</data>
107+
<data key="value" unique="suffix">3.5</data>
108+
<data key="is_default">false</data>
109+
<data key="sort_order">1</data>
110+
<requiredEntity type="StoreLabel">Option12Store1</requiredEntity>
111+
</entity>
112+
<entity name="ProductAttributeOption11" type="ProductAttributeOption">
113+
<var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
114+
<data key="label" unique="suffix">10.12</data>
115+
<data key="value" unique="suffix">10.12</data>
116+
<data key="is_default">false</data>
117+
<data key="sort_order">2</data>
118+
<requiredEntity type="StoreLabel">Option13Store1</requiredEntity>
119+
</entity>
120+
<entity name="ProductAttributeOption12" type="ProductAttributeOption">
121+
<var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
122+
<data key="label" unique="suffix">36</data>
123+
<data key="value" unique="suffix">36</data>
124+
<data key="is_default">false</data>
125+
<data key="sort_order">3</data>
126+
<requiredEntity type="StoreLabel">Option14Store1</requiredEntity>
127+
</entity>
104128
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,16 @@
8080
<data key="store_id">1</data>
8181
<data key="label">Blue</data>
8282
</entity>
83+
<entity name="Option12Store1" type="StoreLabel">
84+
<data key="store_id">1</data>
85+
<data key="label">3.5</data>
86+
</entity>
87+
<entity name="Option13Store1" type="StoreLabel">
88+
<data key="store_id">1</data>
89+
<data key="label">10.12</data>
90+
</entity>
91+
<entity name="Option14Store1" type="StoreLabel">
92+
<data key="store_id">1</data>
93+
<data key="label">36</data>
94+
</entity>
8395
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminProductMultiselectAttributeSection.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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminProductMultiselectAttributeSection">
12+
<element name="option" type="text" selector="//option[contains(@data-title,'{{value}}')]" parameterized="true"/>
13+
</section>
14+
</sections>

‎app/code/Magento/Catalog/ViewModel/Product/Listing/PreparePostData.php

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\Catalog\ViewModel\Product\Listing;
9+
10+
use Magento\Framework\View\Element\Block\ArgumentInterface;
11+
use Magento\Framework\App\ActionInterface;
12+
use Magento\Framework\Url\Helper\Data as UrlHelper;
13+
14+
/**
15+
* Check is available add to compare.
16+
*/
17+
class PreparePostData implements ArgumentInterface
18+
{
19+
/**
20+
* @var UrlHelper
21+
*/
22+
private $urlHelper;
23+
24+
/**
25+
* @param UrlHelper $urlHelper
26+
*/
27+
public function __construct(UrlHelper $urlHelper)
28+
{
29+
$this->urlHelper = $urlHelper;
30+
}
31+
32+
/**
33+
* Wrapper for the PostHelper::getPostData()
34+
*
35+
* @param string $url
36+
* @param array $data
37+
* @return array
38+
*/
39+
public function getPostData(string $url, array $data = []):array
40+
{
41+
if (!isset($data[ActionInterface::PARAM_NAME_URL_ENCODED])) {
42+
$data[ActionInterface::PARAM_NAME_URL_ENCODED] = $this->urlHelper->getEncodedUrl();
43+
}
44+
return ['action' => $url, 'data' => $data];
45+
}
46+
}

‎app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@
176176
<block class="Magento\Catalog\Block\Product\ProductList\Related" name="catalog.product.related" template="Magento_Catalog::product/list/items.phtml">
177177
<arguments>
178178
<argument name="type" xsi:type="string">related</argument>
179+
<argument name="view_model" xsi:type="object">Magento\Catalog\ViewModel\Product\Listing\PreparePostData</argument>
179180
</arguments>
180181
<block class="Magento\Catalog\Block\Product\ProductList\Item\Container" name="related.product.addto" as="addto">
181182
<block class="Magento\Catalog\Block\Product\ProductList\Item\AddTo\Compare"
@@ -186,6 +187,7 @@
186187
<block class="Magento\Catalog\Block\Product\ProductList\Upsell" name="product.info.upsell" template="Magento_Catalog::product/list/items.phtml">
187188
<arguments>
188189
<argument name="type" xsi:type="string">upsell</argument>
190+
<argument name="view_model" xsi:type="object">Magento\Catalog\ViewModel\Product\Listing\PreparePostData</argument>
189191
</arguments>
190192
<block class="Magento\Catalog\Block\Product\ProductList\Item\Container" name="upsell.product.addto" as="addto">
191193
<block class="Magento\Catalog\Block\Product\ProductList\Item\AddTo\Compare"

0 commit comments

Comments
 (0)