Skip to content

Commit 8bd37e2

Browse files
nvshivakumarnvshivakumar
committed
Merge branch '2.4-develop' into MC-42938
2 parents 41997b0 + 112c038 commit 8bd37e2

File tree

93 files changed

+937
-121
lines changed

Some content is hidden

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

93 files changed

+937
-121
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
<description>Checks if Dashboard is displayed properly</description>
1414
</annotations>
1515

16-
<seeElement selector="{{AdminDashboardSection.dashboardDiagramOrderContentTab}}" stepKey="seeOrderContentTab"/>
17-
<seeElement selector="{{AdminDashboardSection.dashboardDiagramContent}}" stepKey="seeDiagramContent"/>
16+
<waitForElementVisible selector="{{AdminDashboardSection.dashboardDiagramOrderContentTab}}" stepKey="seeOrderContentTab"/>
17+
<waitForElementVisible selector="{{AdminDashboardSection.dashboardDiagramContent}}" stepKey="seeDiagramContent"/>
1818
<click selector="{{AdminDashboardSection.dashboardDiagramAmounts}}" stepKey="clickDashboardAmount"/>
19-
<waitForLoadingMaskToDisappear stepKey="waitForDashboardAmountLoading"/>
20-
<seeElement selector="{{AdminDashboardSection.dashboardDiagramAmountsContentTab}}" stepKey="seeDiagramAmountContent"/>
21-
<seeElement selector="{{AdminDashboardSection.dashboardDiagramTotals}}" stepKey="seeAmountTotals"/>
19+
<waitForPageLoad stepKey="waitForDashboardAmountLoading"/>
20+
<waitForElementVisible selector="{{AdminDashboardSection.dashboardDiagramAmountsContentTab}}" stepKey="seeDiagramAmountContent"/>
21+
<waitForElementVisible selector="{{AdminDashboardSection.dashboardDiagramTotals}}" stepKey="seeAmountTotals"/>
2222
<dontSeeJsError stepKey="dontSeeJsError"/>
2323
</actionGroup>
2424
</actionGroups>

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88

9-
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="AdminCheckDashboardWithChartsTest">
1212
<annotations>
@@ -22,6 +22,9 @@
2222
</annotations>
2323
<before>
2424
<magentoCLI command="config:set admin/dashboard/enable_charts 1" stepKey="setEnableCharts"/>
25+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
26+
<argument name="tags" value="config full_page"/>
27+
</actionGroup>
2528
<createData entity="SimpleProduct2" stepKey="createProduct">
2629
<field key="price">150</field>
2730
</createData>
@@ -43,11 +46,15 @@
4346
</before>
4447
<after>
4548
<magentoCLI command="config:set admin/dashboard/enable_charts 0" stepKey="setDisableChartsAsDefault"/>
49+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
50+
<argument name="tags" value="config full_page"/>
51+
</actionGroup>
4652
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
4753
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
4854
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4955
</after>
5056

57+
<waitForElementVisible selector="{{AdminDashboardSection.dashboardTotals('Quantity')}}" stepKey="waitForQuantityBefore"/>
5158
<grabTextFrom selector="{{AdminDashboardSection.dashboardTotals('Quantity')}}" stepKey="grabQuantityBefore"/>
5259

5360
<updateData createDataKey="createCustomerCart" entity="CustomerOrderPaymentMethod" stepKey="sendCustomerPaymentInformation">
@@ -60,8 +67,9 @@
6067
<requiredEntity createDataKey="createCustomerCart"/>
6168
</createData>
6269

63-
<reloadPage stepKey="refreshPage"/>
70+
<actionGroup ref="ReloadPageActionGroup" stepKey="refreshPage"/>
6471
<actionGroup ref="AssertAdminDashboardDisplayedWithNoErrorsActionGroup" stepKey="assertAdminDashboardNotBroken"/>
72+
<waitForElementVisible selector="{{AdminDashboardSection.dashboardTotals('Quantity')}}" stepKey="waitForQuantityAfter"/>
6573
<grabTextFrom selector="{{AdminDashboardSection.dashboardTotals('Quantity')}}" stepKey="grabQuantityAfter"/>
6674
<assertGreaterThan stepKey="checkQuantityWasChanged">
6775
<actualResult type="const">$grabQuantityAfter</actualResult>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@
1616
<argument name="image" defaultValue="ProductImage"/>
1717
</arguments>
1818

19+
<waitForElementVisible selector="{{AdminProductImagesSection.productImagesToggle}}" stepKey="waitForImagesSection"/>
1920
<conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductImagesSection"/>
20-
<waitForPageLoad time="30" stepKey="waitForPageRefresh"/>
21+
<waitForPageLoad stepKey="waitForPageRefresh"/>
2122
<waitForElementVisible selector="{{AdminProductImagesSection.imageUploadButton}}" stepKey="seeImageSectionIsReady"/>
2223
<attachFile selector="{{AdminProductImagesSection.imageFileUpload}}" userInput="{{image.file}}" stepKey="uploadFile"/>
24+
<waitForPageLoad stepKey="waitForImageUpload"/>
2325
<waitForElementNotVisible selector="{{AdminProductImagesSection.uploadProgressBar}}" stepKey="waitForUpload"/>
2426
<waitForElementVisible selector="{{AdminProductImagesSection.imageFile(image.fileName)}}" stepKey="waitForThumbnail"/>
2527
</actionGroup>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<arguments>
1616
<argument name="image" defaultValue="{{MagentoLogo.filename}}" type="string"/>
1717
</arguments>
18+
<waitForElementVisible selector="{{AdminProductImagesSection.productImagesToggle}}" stepKey="waitForProductImagesSection"/>
1819
<conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductImagesSection"/>
1920
<waitForPageLoad stepKey="waitForPageLoad"/>
2021
<waitForElementVisible selector="{{AdminProductImagesSection.imageFile(image)}}" stepKey="seeImage"/>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,20 @@
1616
<argument name="image" defaultValue="ProductImage"/>
1717
<argument name="altText" defaultValue="{{ProductImage.title}}" type="string"/>
1818
</arguments>
19+
<waitForElementVisible selector="{{AdminProductImagesSection.productImagesToggle}}" stepKey="waitForImagesSection"/>
1920
<conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageFile(image.fileName)}}" visible="false" stepKey="expandImages"/>
21+
<waitForPageLoad stepKey="waitForImages"/>
2022
<waitForElementVisible selector="{{AdminProductImagesSection.imageFile(image.fileName)}}" stepKey="seeProductImageName"/>
2123
<click selector="{{AdminProductImagesSection.imageFile(image.fileName)}}" stepKey="clickProductImage"/>
24+
<waitForPageLoad stepKey="waitForImageDetails"/>
2225
<waitForElementVisible selector="{{AdminProductImagesSection.altText}}" stepKey="seeAltTextSection"/>
2326
<grabValueFrom selector="{{AdminProductImagesSection.altText}}" stepKey="actualAltText"/>
2427
<assertEquals stepKey="assertAltText">
2528
<expectedResult type="string">{{altText}}</expectedResult>
2629
<actualResult type="variable">actualAltText</actualResult>
2730
</assertEquals>
2831
<click selector="{{AdminSlideOutDialogSection.closeButton}}" stepKey="clickCloseButton"/>
32+
<waitForPageLoad stepKey="waitForClose"/>
33+
<waitForElementNotVisible selector="{{AdminProductImagesSection.altText}}" stepKey="waitForDetailsGone"/>
2934
</actionGroup>
3035
</actionGroups>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,16 @@
1616
<argument name="image" defaultValue="ProductImage"/>
1717
<argument name="altText" defaultValue="{{ProductImage.title}}" type="string"/>
1818
</arguments>
19+
<waitForElementVisible selector="{{AdminProductImagesSection.productImagesToggle}}" stepKey="waitForImagesSection"/>
1920
<conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageFile(image.fileName)}}" visible="false" stepKey="expandImages"/>
21+
<waitForPageLoad stepKey="waitForImages"/>
2022
<waitForElementVisible selector="{{AdminProductImagesSection.imageFile(image.fileName)}}" stepKey="seeProductImageName"/>
2123
<click selector="{{AdminProductImagesSection.imageFile(image.fileName)}}" stepKey="clickProductImage"/>
24+
<waitForPageLoad stepKey="waitForImageDetails"/>
2225
<waitForElementVisible selector="{{AdminProductImagesSection.altText}}" stepKey="seeAltTextSection"/>
2326
<fillField selector="{{AdminProductImagesSection.altText}}" userInput="{{altText}}" stepKey="fillAltTextSection"/>
2427
<click selector="{{AdminSlideOutDialogSection.closeButton}}" stepKey="clickCloseButton"/>
28+
<waitForPageLoad stepKey="waitForClose"/>
29+
<waitForElementNotVisible selector="{{AdminProductImagesSection.altText}}" stepKey="waitForDetailsGone"/>
2530
</actionGroup>
2631
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminVerifyCreateCloseCreateCustomProductAttributeTest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
<actionGroup ref="AdminDeleteProductAttributeByLabelActionGroup" stepKey="deleteCreatedAttribute">
3333
<argument name="productAttributeLabel" value="{{ProductAttributeFrontendLabel.label}}"/>
3434
</actionGroup>
35+
<!-- Reindex after deleting product attribute -->
36+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
37+
<argument name="indices" value=""/>
38+
</actionGroup>
3539
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminPanel"/>
3640
</after>
3741
<actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="navigateToProductPage">

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminVerifyCreateCustomProductAttributeTest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
<actionGroup ref="AdminDeleteProductAttributeByLabelActionGroup" stepKey="deleteCreatedAttribute">
3333
<argument name="productAttributeLabel" value="{{ProductAttributeFrontendLabel.label}}"/>
3434
</actionGroup>
35+
<!-- Reindex after deleting product attribute -->
36+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
37+
<argument name="indices" value=""/>
38+
</actionGroup>
3539
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminPanel"/>
3640
</after>
3741
<actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="navigateToProductPage">

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCheckNoAppearDefaultOptionConfigurableProductTest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
<actionGroup ref="AdminDeleteProductAttributeByLabelActionGroup" stepKey="deleteAttribute">
2626
<argument name="productAttributeLabel" value="{{colorProductAttribute.default_label}}" />
2727
</actionGroup>
28+
<!-- Reindex after deleting product attribute -->
29+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
30+
<argument name="indices" value=""/>
31+
</actionGroup>
2832
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
2933
</after>
3034

‎app/code/Magento/CatalogInventory/Model/StockManagement.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,12 @@
1414
use Magento\CatalogInventory\Model\Spi\StockRegistryProviderInterface;
1515
use Magento\Catalog\Api\ProductRepositoryInterface;
1616
use Magento\CatalogInventory\Model\ResourceModel\Stock as ResourceStock;
17+
use Magento\Framework\Exception\LocalizedException;
1718

1819
/**
1920
* Implements a few interfaces for backward compatibility
21+
*
22+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
2023
*/
2124
class StockManagement implements StockManagementInterface, RegisterProductSaleInterface, RevertProductSaleInterface
2225
{
@@ -91,7 +94,8 @@ public function __construct(
9194
* @param string[] $items
9295
* @param int $websiteId
9396
* @return StockItemInterface[]
94-
* @throws \Magento\Framework\Exception\LocalizedException
97+
* @throws StockStateException
98+
* @throws LocalizedException
9599
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
96100
*/
97101
public function registerProductsSale($items, $websiteId = null)
@@ -118,7 +122,7 @@ public function registerProductsSale($items, $websiteId = null)
118122
&& !$this->stockState->checkQty($productId, $orderedQty, $stockItem->getWebsiteId())
119123
) {
120124
$this->getResource()->commit();
121-
throw new \Magento\Framework\Exception\LocalizedException(
125+
throw new StockStateException(
122126
__('Some of the products are out of stock.')
123127
);
124128
}

0 commit comments

Comments
 (0)