Skip to content

Commit eeb7433

Browse files
jiten-pateljiten-patel
authored
Merge branch '2.4-develop' into issue-27051
2 parents c1a01fc + 6b6f428 commit eeb7433

File tree

971 files changed

+24506
-5179
lines changed

Some content is hidden

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

971 files changed

+24506
-5179
lines changed

‎app/code/Magento/AdvancedSearch/Test/Mftf/ActionGroup/AdminFillSearchTermActionGroup.xml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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="AdminFillSearchTermActionGroup">
12+
<annotations>
13+
<description>Fills the search terms form with sample data.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="searchQuery" type="string"/>
17+
<argument name="store" type="string"/>
18+
<argument name="redirectUrl" type="string"/>
19+
<argument name="suggestedTerms" type="string"/>
20+
</arguments>
21+
<!-- Fill form fields -->
22+
<fillField selector="{{AdminSearchTermsPageFormFieldsSection.query_text}}" userInput="{{searchQuery}}" stepKey="fillFieldSearchQuery"/>
23+
<selectOption selector="{{AdminSearchTermsPageFormFieldsSection.store_id}}" userInput="{{store}}" stepKey="selectStoreView"/>
24+
<fillField selector="{{AdminSearchTermsPageFormFieldsSection.redirect}}" userInput="{{redirectUrl}}" stepKey="fillFieldRedirectUrl"/>
25+
<selectOption selector="{{AdminSearchTermsPageFormFieldsSection.display_in_terms}}" userInput="{{suggestedTerms}}" stepKey="selectSuggestedTerms" />
26+
</actionGroup>
27+
</actionGroups>

‎app/code/Magento/AdvancedSearch/Test/Mftf/ActionGroup/AdminOpenNewSearchTermsPageActionGroup.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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminOpenNewSearchTermsPageActionGroup">
12+
<annotations>
13+
<description>Navigate to search terms form page.</description>
14+
</annotations>
15+
<amOnPage url="{{AdminSearchTermsFormPage.url}}" stepKey="amOnSearchTermsForm"/>
16+
<waitForPageLoad stepKey="waitForPageLoad1"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/AdvancedSearch/Test/Mftf/ActionGroup/AdminSaveSearchTermActionGroup.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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminSaveSearchTermActionGroup">
12+
<annotations>
13+
<description>Save a new search term from Magento admin.</description>
14+
</annotations>
15+
<!-- Click save action and verify success message -->
16+
<click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveSearchButton"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/AdvancedSearch/Test/Mftf/Data/SearchTermsData.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+
9+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="SearchTerms">
12+
<data key="searchQuery" unique="suffix">books</data>
13+
<data key="store">Default Store View</data>
14+
<data key="redirectUrl">http://sample.com</data>
15+
<data key="suggestedTerms">1</data>
16+
</entity>
17+
</entities>

‎app/code/Magento/AdvancedSearch/Test/Mftf/Page/AdminSearchTermsFormPage.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="urn:magento:mftf:Page/etc/PageObject.xsd">
11+
<page name="AdminSearchTermsFormPage" url="search/term/new/" area="admin" module="Magento_AdvancedSearch">
12+
<section name="AdminSearchTermsPageFormFieldsSection"/>
13+
</page>
14+
</pages>

‎app/code/Magento/AdvancedSearch/Test/Mftf/Section/AdminSearchTermsPageFormFieldsSection.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+
9+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminSearchTermsPageFormFieldsSection">
12+
<element name="query_text" type="input" selector="#query_text"/>
13+
<element name="store_id" type="select" selector="#store_id"/>
14+
<element name="redirect" type="input" selector="#redirect"/>
15+
<element name="display_in_terms" type="select" selector="#display_in_terms"/>
16+
</section>
17+
</sections>

‎app/code/Magento/AdvancedSearch/Test/Mftf/Test/AdminAddSearchTermTest.xml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminAddSearchTermTest">
12+
<annotations>
13+
<features value="AdvancedSearch"/>
14+
<stories value="Add a new search term"/>
15+
<title value="Admin should be able to create a new search term"/>
16+
<description value="Admin should be able to create a new search term using search terms grid"/>
17+
<severity value="CRITICAL"/>
18+
<group value="AdvancedSearch"/>
19+
</annotations>
20+
<before>
21+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
22+
</before>
23+
<after>
24+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
25+
</after>
26+
<actionGroup ref="AdminOpenNewSearchTermsPageActionGroup" stepKey="navigateToSearchTermPage"/>
27+
<actionGroup ref="AdminFillSearchTermActionGroup" stepKey="fillNewSearchTermData">
28+
<argument name="searchQuery" value="{{SearchTerms.searchQuery}}"/>
29+
<argument name="store" value="{{SearchTerms.store}}"/>
30+
<argument name="redirectUrl" value="{{SearchTerms.redirectUrl}}"/>
31+
<argument name="suggestedTerms" value="{{SearchTerms.suggestedTerms}}"/>
32+
</actionGroup>
33+
<actionGroup ref="AdminSaveSearchTermActionGroup" stepKey="saveSearchTerm"/>
34+
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSaveSearchTermSuccessMessage">
35+
<argument name="message" value="You saved the search term."/>
36+
<argument name="messageType" value="success"/>
37+
</actionGroup>
38+
</test>
39+
</tests>

‎app/code/Magento/Amqp/Test/Unit/Setup/ConfigOptionsListTest.php

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,16 @@
66

77
namespace Magento\Amqp\Test\Unit\Setup;
88

9+
use Magento\Amqp\Setup\ConnectionValidator;
10+
use Magento\Framework\Config\Data\ConfigData;
911
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
1012
use Magento\Amqp\Setup\ConfigOptionsList;
1113
use Magento\Framework\Setup\Option\TextConfigOption;
1214
use Magento\Framework\App\DeploymentConfig;
15+
use PHPUnit\Framework\MockObject\MockObject;
16+
use PHPUnit\Framework\TestCase;
1317

14-
class ConfigOptionsListTest extends \PHPUnit\Framework\TestCase
18+
class ConfigOptionsListTest extends TestCase
1519
{
1620
/**
1721
* @var ObjectManager
@@ -24,12 +28,12 @@ class ConfigOptionsListTest extends \PHPUnit\Framework\TestCase
2428
private $model;
2529

2630
/**
27-
* @var \Magento\Amqp\Setup\ConnectionValidator|\PHPUnit_Framework_MockObject_MockObject
31+
* @var ConnectionValidator|MockObject
2832
*/
2933
private $connectionValidatorMock;
3034

3135
/**
32-
* @var \Magento\Framework\App\DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject
36+
* @var DeploymentConfig|MockObject
3337
*/
3438
private $deploymentConfigMock;
3539

@@ -38,7 +42,7 @@ class ConfigOptionsListTest extends \PHPUnit\Framework\TestCase
3842
*/
3943
private $options;
4044

41-
protected function setUp()
45+
protected function setUp(): void
4246
{
4347
$this->options = [
4448
ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_HOST => 'host',
@@ -51,18 +55,18 @@ protected function setUp()
5155
];
5256

5357
$this->objectManager = new ObjectManager($this);
54-
$this->connectionValidatorMock = $this->getMockBuilder(\Magento\Amqp\Setup\ConnectionValidator::class)
58+
$this->connectionValidatorMock = $this->getMockBuilder(ConnectionValidator::class)
5559
->disableOriginalConstructor()
5660
->setMethods([])
5761
->getMock();
5862

59-
$this->deploymentConfigMock = $this->getMockBuilder(\Magento\Framework\App\DeploymentConfig::class)
63+
$this->deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
6064
->disableOriginalConstructor()
6165
->setMethods([])
6266
->getMock();
6367

6468
$this->model = $this->objectManager->getObject(
65-
\Magento\Amqp\Setup\ConfigOptionsList::class,
69+
ConfigOptionsList::class,
6670
[
6771
'connectionValidator' => $this->connectionValidatorMock,
6872
]
@@ -135,9 +139,9 @@ public function testCreateConfig($options, $expectedConfigData)
135139
$result = $this->model->createConfig($options, $this->deploymentConfigMock);
136140
$this->assertInternalType('array', $result);
137141
$this->assertNotEmpty($result);
138-
/** @var \Magento\Framework\Config\Data\ConfigData $configData */
142+
/** @var ConfigData $configData */
139143
$configData = $result[0];
140-
$this->assertInstanceOf(\Magento\Framework\Config\Data\ConfigData::class, $configData);
144+
$this->assertInstanceOf(ConfigData::class, $configData);
141145
$this->assertEquals($expectedConfigData, $configData->getData());
142146
}
143147

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
},
77
"require": {
88
"magento/framework": "*",
9+
"magento/framework-message-queue": "*",
910
"magento/framework-bulk": "*",
1011
"magento/module-authorization": "*",
1112
"magento/module-backend": "*",

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminSuccessLoginActionGroup.xml

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

1616
<waitForElementVisible selector="{{AdminHeaderSection.adminUserAccountText}}" stepKey="waitForAdminAccountTextVisible"/>
17+
<seeElement selector="{{AdminHeaderSection.adminUserAccountText}}" stepKey="assertAdminAccountTextElement"/>
1718
</actionGroup>
1819
</actionGroups>

‎app/code/Magento/Backend/Test/Mftf/Data/GeneralLocalConfigsData.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,10 @@
2020
<data key="scope_code">base</data>
2121
<data key="value">en_US</data>
2222
</entity>
23+
<entity name="GeneralLocalCodeConfigsForMexico">
24+
<data key="path">general/locale/code</data>
25+
<data key="scope">websites</data>
26+
<data key="scope_code">base</data>
27+
<data key="value">es_MX</data>
28+
</entity>
2329
</entities>

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@
8383
<waitForLoadingMaskToDisappear stepKey="waitForSearchingOrder"/>
8484
<!-- Create invoice -->
8585
<comment userInput="Create invoice" stepKey="createInvoice"/>
86-
<click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
87-
<waitForPageLoad stepKey="waitForOrderPageToLoad"/>
86+
87+
<actionGroup ref="AdminOrderGridClickFirstRowActionGroup" stepKey="clickOrderRow"/>
8888
<click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceButton"/>
8989
<waitForPageLoad stepKey="waitForInvoicePageToLoad"/>
9090
<see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seeNewInvoiceInPageTitle" after="clickInvoiceButton"/>
@@ -95,8 +95,7 @@
9595
<comment userInput="Create Shipment for the order" stepKey="createShipmentForOrder"/>
9696
<amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage2"/>
9797
<waitForPageLoad time="30" stepKey="waitForOrderListPageLoading"/>
98-
<click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="openOrderPageForShip"/>
99-
<waitForPageLoad stepKey="waitForOrderDetailsPage"/>
98+
<actionGroup ref="AdminOrderGridClickFirstRowActionGroup" stepKey="openOrderPageForShip"/>
10099
<click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
101100
<waitForPageLoad stepKey="waitForShipmentPagePage"/>
102101
<seeInCurrentUrl url="{{AdminShipmentNewPage.url}}" stepKey="seeOrderShipmentUrl"/>

‎app/code/Magento/Backup/Model/ResourceModel/View/CreateViewsBackup.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,6 @@ public function getViewHeader(string $viewName): string
111111
public function getDropViewSql(string $viewName): string
112112
{
113113
$quotedViewName = $this->getConnection()->quoteIdentifier($viewName);
114-
return sprintf('DROP VIEW IF EXISTS %s;\n', $quotedViewName);
114+
return sprintf("DROP VIEW IF EXISTS %s;\n", $quotedViewName);
115115
}
116116
}

‎app/code/Magento/Backup/Test/Mftf/ActionGroup/DeleteBackupActionGroup.xml renamed to ‎app/code/Magento/Backup/Test/Mftf/ActionGroup/AdminBackupDeleteActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="deleteBackup">
11+
<actionGroup name="AdminBackupDeleteActionGroup">
1212
<annotations>
1313
<description>Deletes a Backup using provided Backup Entity.</description>
1414
</annotations>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenCategoriesPageActionGroup.xml renamed to ‎app/code/Magento/Backup/Test/Mftf/ActionGroup/AdminBackupIndexPageOpenActionGroup.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="AdminOpenCategoriesPageActionGroup">
11-
<amOnPage url="{{AdminCategoryPage.url}}" stepKey="onCategoryIndexPage"/>
12-
<waitForPageLoad stepKey="waitForPageLoad" after="onCategoryIndexPage"/>
10+
<actionGroup name="AdminBackupIndexPageOpenActionGroup">
11+
<amOnPage url="{{AdminBackupIndexPage.url}}" stepKey="navigateToBackupIndexPage"/>
12+
<waitForPageLoad stepKey="waitForBackupIndexPageLoad"/>
1313
</actionGroup>
14-
</actionGroups>
14+
</actionGroups>

‎app/code/Magento/Backup/Test/Mftf/ActionGroup/deleteBackupActionGroup.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
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="deleteBackup" extends="AdminBackupDeleteActionGroup" deprecated="Use DeleteBackupActionGroup"/>
12+
</actionGroups>

‎app/code/Magento/Backup/Test/Mftf/Page/BackupIndexPage.xml renamed to ‎app/code/Magento/Backup/Test/Mftf/Page/AdminBackupIndexPage.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
11-
<page name="BackupIndexPage" url="/backup/index/" area="admin" module="Magento_Backup">
11+
<page name="AdminBackupIndexPage" url="/backup/index/" area="admin" module="Magento_Backup">
1212
<section name="AdminMainActionsSection"/>
1313
<section name="AdminGridTableSection"/>
1414
<section name="AdminCreateBackupFormSection"/>

‎app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2727

2828
<!--Go to backup index page-->
29-
<amOnPage url="{{BackupIndexPage.url}}" stepKey="goToBackupPage"/>
30-
<waitForPageLoad stepKey="waitForBackupPage"/>
29+
<actionGroup ref="AdminBackupIndexPageOpenActionGroup" stepKey="navigateToBackupPage"/>
3130

3231
<!--Create system backup-->
3332
<actionGroup ref="CreateSystemBackupActionGroup" stepKey="createSystemBackup"/>
@@ -39,17 +38,17 @@
3938
<actionGroup ref="CreateDatabaseBackupActionGroup" stepKey="createDatabaseBackup"/>
4039

4140
<!--Delete system backup-->
42-
<actionGroup ref="deleteBackup" stepKey="deleteSystemBackup">
41+
<actionGroup ref="AdminBackupDeleteActionGroup" stepKey="deleteSystemBackup">
4342
<argument name="backup" value="SystemBackup"/>
4443
</actionGroup>
4544

4645
<!--Delete database/media backup-->
47-
<actionGroup ref="deleteBackup" stepKey="deleteMediaBackup">
46+
<actionGroup ref="AdminBackupDeleteActionGroup" stepKey="deleteMediaBackup">
4847
<argument name="backup" value="MediaBackup"/>
4948
</actionGroup>
5049

5150
<!--Delete database backup-->
52-
<actionGroup ref="deleteBackup" stepKey="deleteDatabaseBackup">
51+
<actionGroup ref="AdminBackupDeleteActionGroup" stepKey="deleteDatabaseBackup">
5352
<argument name="backup" value="DatabaseBackup"/>
5453
</actionGroup>
5554

0 commit comments

Comments
 (0)