Skip to content

Commit d9eb9b4

Browse files
viktymviktym
committed
Merge remote-tracking branch 'magento2/2.3-develop' into MC-17502
2 parents 17ce132 + bcfe16f commit d9eb9b4

File tree

280 files changed

+6315
-2451
lines changed

Some content is hidden

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

280 files changed

+6315
-2451
lines changed

‎.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The Magento 2 development team or community maintainers will review all issues a
1111
During the review we might require clarifications from the contributor.
1212
If there is no response from the contributor within two weeks, the pull request will be closed.
1313

14-
For more detialed information on contribution please read our [beginners guide](https://github.com/magento/magento2/wiki/Getting-Started).
14+
For more detailed information on contribution please read our [beginners guide](https://github.com/magento/magento2/wiki/Getting-Started).
1515

1616
## Contribution requirements
1717

‎app/code/Magento/AdminNotification/Model/Feed.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
*/
66
namespace Magento\AdminNotification\Model;
77

8+
use Magento\Framework\Escaper;
9+
use Magento\Framework\App\ObjectManager;
810
use Magento\Framework\Config\ConfigOptionsListConstants;
911

1012
/**
@@ -26,7 +28,7 @@ class Feed extends \Magento\Framework\Model\AbstractModel
2628
const XML_LAST_UPDATE_PATH = 'system/adminnotification/last_update';
2729

2830
/**
29-
* @var \Magento\Framework\Escaper
31+
* @var Escaper
3032
*/
3133
private $escaper;
3234

@@ -82,7 +84,7 @@ class Feed extends \Magento\Framework\Model\AbstractModel
8284
* @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
8385
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
8486
* @param array $data
85-
* @param \Magento\Framework\Escaper|null $escaper
87+
* @param Escaper|null $escaper
8688
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
8789
*/
8890
public function __construct(
@@ -97,7 +99,7 @@ public function __construct(
9799
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
98100
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
99101
array $data = [],
100-
\Magento\Framework\Escaper $escaper = null
102+
Escaper $escaper = null
101103
) {
102104
parent::__construct($context, $registry, $resource, $resourceCollection, $data);
103105
$this->_backendConfig = $backendConfig;
@@ -106,8 +108,8 @@ public function __construct(
106108
$this->_deploymentConfig = $deploymentConfig;
107109
$this->productMetadata = $productMetadata;
108110
$this->urlBuilder = $urlBuilder;
109-
$this->escaper = $escaper ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
110-
\Magento\Framework\Escaper::class
111+
$this->escaper = $escaper ?? ObjectManager::getInstance()->get(
112+
Escaper::class
111113
);
112114
}
113115

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,7 @@
1313
<element name="adminUserAccountText" type="text" selector=".page-header .admin-user-account-text" />
1414
<!-- Legacy heading section. Mostly used for admin 404 and 403 pages -->
1515
<element name="pageHeading" type="text" selector=".page-content .page-heading"/>
16+
<!-- Used for page not found error -->
17+
<element name="pageNotFoundTitle" type="text" selector=".page-title span"/>
1618
</section>
1719
</sections>

‎app/code/Magento/Backend/Test/Mftf/Test/AdminLoginTest.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,8 @@
2020
<group value="login"/>
2121
</annotations>
2222

23-
<amOnPage url="{{AdminLoginPage.url}}" stepKey="amOnAdminLoginPage"/>
24-
<fillField selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" stepKey="fillUsername"/>
25-
<fillField selector="{{AdminLoginFormSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
26-
<click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickOnSignIn"/>
27-
<closeAdminNotification stepKey="closeAdminNotification"/>
23+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2824
<seeInCurrentUrl url="{{AdminLoginPage.url}}" stepKey="seeAdminLoginUrl"/>
25+
<actionGroup ref="logout" stepKey="logoutFromAdmin"/>
2926
</test>
3027
</tests>

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminProductBundleCreationTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
<deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
3232
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
3333
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
34+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndexPage"/>
35+
<actionGroup ref="deleteProductsIfTheyExist" stepKey="deleteAllProducts"/>
3436
<actionGroup ref="logout" stepKey="logout"/>
3537
</after>
3638
<!-- go to bundle product creation page-->

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductDetailsTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
<deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
3333
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
3434
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
35+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndexPage"/>
36+
<actionGroup ref="deleteProductsIfTheyExist" stepKey="deleteAllProducts"/>
3537
<actionGroup ref="logout" stepKey="logout"/>
3638
</after>
3739
<!-- go to bundle product creation page-->

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@
1212
*/
1313
namespace Magento\Catalog\Block\Adminhtml\Product;
1414

15+
use Magento\Framework\Escaper;
16+
1517
/**
1618
* Class Edit
1719
*/
1820
class Edit extends \Magento\Backend\Block\Widget
1921
{
2022
/**
21-
* @var \Magento\Framework\Escaper
23+
* @var Escaper
2224
*/
2325
private $escaper;
2426

@@ -55,7 +57,7 @@ class Edit extends \Magento\Backend\Block\Widget
5557
* @param \Magento\Eav\Model\Entity\Attribute\SetFactory $attributeSetFactory
5658
* @param \Magento\Framework\Registry $registry
5759
* @param \Magento\Catalog\Helper\Product $productHelper
58-
* @param \Magento\Framework\Escaper $escaper
60+
* @param Escaper $escaper
5961
* @param array $data
6062
*/
6163
public function __construct(
@@ -64,7 +66,7 @@ public function __construct(
6466
\Magento\Eav\Model\Entity\Attribute\SetFactory $attributeSetFactory,
6567
\Magento\Framework\Registry $registry,
6668
\Magento\Catalog\Helper\Product $productHelper,
67-
\Magento\Framework\Escaper $escaper,
69+
Escaper $escaper,
6870
array $data = []
6971
) {
7072
$this->_productHelper = $productHelper;

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminFillProductAttributePropertiesActionGroup">
11+
<arguments>
12+
<argument name="attributeName" type="string"/>
13+
<argument name="attributeType" type="string"/>
14+
</arguments>
15+
<fillField selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{attributeName}}" stepKey="fillDefaultLabel"/>
16+
<selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="{{attributeType}}" stepKey="selectInputType"/>
17+
</actionGroup>
18+
</actionGroups>

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

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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminOpenAttributeSetByNameActionGroup">
11+
<arguments>
12+
<argument name="attributeSetName" type="string" defaultValue="Default"/>
13+
</arguments>
14+
<click selector="{{AdminProductAttributeSetGridSection.AttributeSetName(attributeSetName)}}" stepKey="chooseAttributeSet"/>
15+
<waitForPageLoad stepKey="waitForAttributeSetPageLoad"/>
16+
</actionGroup>
17+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenAttributeSetGridPageActionGroup.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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminOpenAttributeSetGridPageActionGroup">
11+
<amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSetPage"/>
12+
<waitForPageLoad stepKey="waitForAttributeSetPageLoad"/>
13+
</actionGroup>
14+
</actionGroups>

0 commit comments

Comments
 (0)