Skip to content

Commit 81f8978

Browse files
merge magento/2.3-develop into magento-tsg/2.3-develop-pr44
2 parents 847b028 + 645941c commit 81f8978

File tree

60 files changed

+1434
-205
lines changed

Some content is hidden

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

60 files changed

+1434
-205
lines changed

app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="LoggedInCheckoutFillNewBillingAddressActionGroup1">
8282
<argument name="Address" value="US_Address_NY"/>
8383
</actionGroup>
84-
<click selector="{{CheckoutPaymentSection.addressAction('Save Address')}}" stepKey="SaveAddress"/>
84+
<click selector="{{CheckoutPaymentSection.addressAction('Ship here')}}" stepKey="SaveAddress"/>
8585
<waitForPageLoad stepKey="waitForPageLoad9"/>
8686
<click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext1"/>
8787
<waitForPageLoad stepKey="waitForPageLoad10"/>

app/code/Magento/Catalog/Controller/Adminhtml/Product/Search.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99
namespace Magento\Catalog\Controller\Adminhtml\Product;
1010

1111
use Magento\Catalog\Api\Data\ProductInterface;
12+
use Magento\Framework\App\Action\HttpGetActionInterface;
1213

1314
/**
1415
* Controller to search product for ui-select component
1516
*/
16-
class Search extends \Magento\Backend\App\Action
17+
class Search extends \Magento\Backend\App\Action implements HttpGetActionInterface
1718
{
1819
/**
1920
* Authorization level of a basic admin session
@@ -48,6 +49,8 @@ public function __construct(
4849
}
4950

5051
/**
52+
* Execute product search.
53+
*
5154
* @return \Magento\Framework\Controller\ResultInterface
5255
*/
5356
public function execute() : \Magento\Framework\Controller\ResultInterface
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminCreateRecentlyProductsWidgetActionGroup" extends="AdminCreateWidgetActionGroup">
11+
<selectOption selector="{{AdminCatalogProductWidgetSection.productAttributesToShow}}" parameterArray="['Name', 'Image', 'Price']" stepKey="selectAllProductAttributes"/>
12+
<selectOption selector="{{AdminCatalogProductWidgetSection.productButtonsToShow}}" parameterArray="['Add to Cart', 'Add to Compare', 'Add to Wishlist']" stepKey="selectAllProductButtons"/>
13+
<click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveWidget"/>
14+
<waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForSuccessMessageAppears"/>
15+
<see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
16+
</actionGroup>
17+
</actionGroups>
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
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+
<!-- Check the product in recently viewed widget -->
12+
<actionGroup name="StorefrontAssertProductInRecentlyViewedWidgetActionGroup">
13+
<arguments>
14+
<argument name="product"/>
15+
</arguments>
16+
<waitForElementVisible selector="{{StorefrontWidgetsSection.widgetRecentlyViewedProductsGrid}}" stepKey="waitWidgetRecentlyViewedProductsGrid"/>
17+
<see selector="{{StorefrontWidgetsSection.widgetRecentlyViewedProductsGrid}}" userInput="{{product.name}}" stepKey="seeProductInRecentlyViewedWidget"/>
18+
</actionGroup>
19+
20+
<!-- Check the product in recently compared widget -->
21+
<actionGroup name="StorefrontAssertProductInRecentlyComparedWidgetActionGroup">
22+
<arguments>
23+
<argument name="product"/>
24+
</arguments>
25+
<waitForElementVisible selector="{{StorefrontWidgetsSection.widgetRecentlyComparedProductsGrid}}" stepKey="waitWidgetRecentlyComparedProductsGrid"/>
26+
<see selector="{{StorefrontWidgetsSection.widgetRecentlyComparedProductsGrid}}" userInput="{{product.name}}" stepKey="seeProductInRecentlyComparedWidget"/>
27+
</actionGroup>
28+
29+
<!-- Check the product in recently ordered widget -->
30+
<actionGroup name="StorefrontAssertProductInRecentlyOrderedWidgetActionGroup">
31+
<arguments>
32+
<argument name="product"/>
33+
</arguments>
34+
<waitForElementVisible selector="{{StorefrontWidgetsSection.widgetRecentlyOrderedProductsGrid}}" stepKey="waitWidgetRecentlyOrderedProductsGrid"/>
35+
<see selector="{{StorefrontWidgetsSection.widgetRecentlyOrderedProductsGrid}}" userInput="{{product.name}}" stepKey="seeProductInRecentlyOrderedWidget"/>
36+
</actionGroup>
37+
</actionGroups>
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
10+
<entity name="EnableSynchronizeWidgetProductsWithBackendStorage" type="catalog_recently_products">
11+
<requiredEntity type="synchronize_with_backend">EnableCatalogRecentlyProductsSynchronize</requiredEntity>
12+
</entity>
13+
14+
<entity name="EnableCatalogRecentlyProductsSynchronize" type="synchronize_with_backend">
15+
<data key="value">1</data>
16+
</entity>
17+
18+
<entity name="DisableSynchronizeWidgetProductsWithBackendStorage" type="catalog_recently_products">
19+
<requiredEntity type="synchronize_with_backend">DefaultCatalogRecentlyProductsSynchronize</requiredEntity>
20+
</entity>
21+
22+
<entity name="DefaultCatalogRecentlyProductsSynchronize" type="synchronize_with_backend">
23+
<data key="value">0</data>
24+
</entity>
25+
</entities>

app/code/Magento/Catalog/Test/Mftf/Data/WidgetsData.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,24 @@
1212
<data key="type">Catalog Product Link</data>
1313
<data key="template">Product Link Block Template</data>
1414
</entity>
15+
<entity name="RecentlyComparedProductsWidget" type="widget">
16+
<data key="type">Recently Compared Products</data>
17+
<data key="design_theme">Magento Luma</data>
18+
<data key="name" unique="suffix">Recently Compared Products</data>
19+
<array key="store_ids">
20+
<item>All Store Views</item>
21+
</array>
22+
<data key="display_on">All Pages</data>
23+
<data key="container">Sidebar Additional</data>
24+
</entity>
25+
<entity name="RecentlyViewedProductsWidget" type="widget">
26+
<data key="type">Recently Viewed Products</data>
27+
<data key="design_theme">Magento Luma</data>
28+
<data key="name" unique="suffix">Recently Viewed Products</data>
29+
<array key="store_ids">
30+
<item>All Store Views</item>
31+
</array>
32+
<data key="display_on">All Pages</data>
33+
<data key="container">Sidebar Additional</data>
34+
</entity>
1535
</entities>
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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+
<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
9+
<operation name="CatalogRecentlyProductsConfiguration" dataType="catalog_recently_products" type="create"
10+
auth="adminFormKey" url="/admin/system_config/save/section/catalog/" method="POST" successRegex="/messages-message-success/">
11+
<object key="groups" dataType="catalog_recently_products">
12+
<object key="recently_products" dataType="catalog_recently_products">
13+
<object key="fields" dataType="catalog_recently_products">
14+
<object key="synchronize_with_backend" dataType="synchronize_with_backend">
15+
<field key="value">integer</field>
16+
</object>
17+
</object>
18+
</object>
19+
</object>
20+
</operation>
21+
</operations>

app/code/Magento/Catalog/Test/Mftf/Page/AdminNewWidgetPage.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
1111
<page name="AdminNewWidgetPage" url="admin/widget_instance/new/" area="admin" module="Magento_Widget">
1212
<section name="AdminNewWidgetSelectProductPopupSection"/>
13+
<section name="AdminCatalogProductWidgetSection"/>
1314
</page>
1415
</pages>
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
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="AdminCatalogProductWidgetSection">
12+
<element name="productAttributesToShow" type="multiselect" selector="select[name='parameters[show_attributes][]']"/>
13+
<element name="productButtonsToShow" type="multiselect" selector="select[name='parameters[show_buttons][]']"/>
14+
</section>
15+
</sections>
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="StorefrontWidgetsSection">
12+
<element name="widgetRecentlyViewedProductsGrid" type="block" selector=".block.widget.block-viewed-products-grid"/>
13+
<element name="widgetRecentlyComparedProductsGrid" type="block" selector=".block.widget.block-compared-products-grid"/>
14+
<element name="widgetRecentlyOrderedProductsGrid" type="block" selector=".block.block-reorder"/>
15+
</section>
16+
</sections>

0 commit comments

Comments
 (0)