Skip to content

Commit c5ba965

Browse files
pawan-adobe-securitypawan-adobe-security
authored
Merge pull request #500 from magento-cia/cia-2.4.8-beta1-develop-2.4-develop-sync-08152024
Cia 2.4.8 beta1 develop 2.4 develop sync 08152024
2 parents 9f6fe80 + 57d7685 commit c5ba965

File tree

126 files changed

+1911
-190
lines changed

Some content is hidden

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

126 files changed

+1911
-190
lines changed

‎Inventory/Test/Integration/Source/Validator/CodeValidatorTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function testValidation($sourceCode, $errorCount, $errorStrings)
6363
/**
6464
* @return array
6565
*/
66-
public function dataProvider()
66+
public static function dataProvider()
6767
{
6868
return [
6969
'valid code string' => [

‎Inventory/Test/Integration/Source/Validator/NameValidatorTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function testValidation($value, $errorCount, $errorStrings)
6363
/**
6464
* @return array
6565
*/
66-
public function dataProvider()
66+
public static function dataProvider()
6767
{
6868
return [
6969
'valid code string' => [

‎InventoryAdminUi/Test/Integration/Ui/DataProvider/StockDataProviderTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function testGetDataForListingDataStock($stockName, $assignedSources): vo
5656
/**
5757
* @return array
5858
*/
59-
public function listingDataStockDataProvider(): array
59+
public static function listingDataStockDataProvider(): array
6060
{
6161
return [[
6262
'Global-stock',

‎InventoryAdminUi/Test/Mftf/ActionGroup/AdminAssertSalableQtySingleStockModeActionGroup.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<argument name="quantity" type="string" defaultValue="{{defaultProductQty.value}}"/>
1717
<argument name="stockName" type="string" defaultValue="{{_defaultStock.name}}"/>
1818
</arguments>
19-
<see selector="{{AdminProductGridSection.quantity('1')}}" userInput="{{quantity}}" stepKey="checkProductQty"/>
20-
<see selector="{{AdminProductGridSection.singleStockSalableQuantity('1', stockName)}}" userInput="{{quantity}}" stepKey="checkSalableQty"/>
19+
<waitForText selector="{{AdminProductGridSection.quantity('1')}}" userInput="{{quantity}}" stepKey="checkProductQty"/>
20+
<waitForText selector="{{AdminProductGridSection.singleStockSalableQuantity('1', stockName)}}" userInput="{{quantity}}" stepKey="checkSalableQty"/>
2121
</actionGroup>
2222
</actionGroups>
2323

‎InventoryAdminUi/Test/Mftf/ActionGroup/AdminSetByDefaultNotifyQuantityBelowActionGroup.xml‎

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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9+
<actionGroup name="AdminSetByDefaultNotifyQuantityBelowActionGroup">
10+
<annotations>
11+
<description>Admin set by default Notify Quantity Below on Inventory page.</description>
12+
</annotations>
13+
14+
<magentoCLI command="config:set {{ByDefaultNotifyQuantityBelow.path}} {{ByDefaultNotifyQuantityBelow.value}}" stepKey="setByDefaultAmount"/>
15+
</actionGroup>
16+
</actionGroups>

‎InventoryAdminUi/Test/Mftf/ActionGroup/AdminSetCustomNotifyQuantityBelowActionGroup.xml‎

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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9+
<actionGroup name="AdminSetCustomNotifyQuantityBelowActionGroup">
10+
<annotations>
11+
<description>Admin set Custom Notify Quantity Below on Inventory page.</description>
12+
</annotations>
13+
14+
<magentoCLI command="config:set {{CustomNotifyQuantityBelow.path}} {{CustomNotifyQuantityBelow.value}}" stepKey="setCustomAmount"/>
15+
</actionGroup>
16+
</actionGroups>

‎InventoryAdminUi/Test/Mftf/ActionGroup/AdminSwitchWebsiteNoConfirmationActionGroup.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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminSwitchWebsiteNoConfirmationActionGroup" extends="AdminSwitchWebsiteActionGroup">
11+
<remove keyForRemoval="waitingForInformationModal"/>
12+
<remove keyForRemoval="confirmStoreSwitch"/>
13+
</actionGroup>
14+
</actionGroups>

‎InventoryAdminUi/Test/Mftf/Data/CatalogInventoryConfigData.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,14 @@
9898
<data key="path">cataloginventory/item_options/notify_stock_qty</data>
9999
<data key="value">0</data>
100100
</entity>
101+
<entity name="CustomNotifyQuantityBelow">
102+
<data key="path">cataloginventory/item_options/notify_stock_qty</data>
103+
<data key="value">101</data>
104+
</entity>
105+
<entity name="ByDefaultNotifyQuantityBelow">
106+
<data key="path">cataloginventory/item_options/notify_stock_qty</data>
107+
<data key="value">1</data>
108+
</entity>
101109
<entity name="OfflineDistanceProviderForDistanceBasedSSA">
102110
<data key="path">cataloginventory/source_selection_distance_based/provider</data>
103111
<data key="value">offline</data>

‎InventoryAdminUi/Test/Mftf/Suite/IndexersByScheduleOnlyMultiModeTestSuite.xml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
9+
<suite name="IndexersByScheduleOnlyMultiModeTestSuite">
10+
<before>
11+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/>
12+
<actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSYWYG"/>
13+
<!-- Enable Stock Management -->
14+
<magentoCLI command="config:set {{TurnOnManageStockConfig.path}} {{TurnOnManageStockConfig.value}}" stepKey="enableStockManagement"/>
15+
<!-- Set Index mode "Update by Schedule" -->
16+
<magentoCLI command="indexer:set-mode" arguments="schedule" stepKey="setIndexerModeToUpdateBySchedule" />
17+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="runIndexCronJobs">
18+
<argument name="indices" value=""/>
19+
</actionGroup>
20+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
21+
<argument name="tags" value="config full_page"/>
22+
</actionGroup>
23+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
24+
</before>
25+
<include>
26+
<group name="indexers_by_schedule_mode_only_multi_mode"/>
27+
</include>
28+
<after>
29+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/>
30+
<actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSYWYG"/>
31+
<!-- Disable Stock Management -->
32+
<magentoCLI command="config:set {{TurnOffManageStockConfig.path}} {{TurnOffManageStockConfig.value}}" stepKey="disableStockManagement"/>
33+
<!-- Set Index mode "Update on Save" -->
34+
<magentoCLI command="indexer:set-mode" arguments="realtime" stepKey="setIndexerModeToUpdateOnSave" />
35+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="runIndexCronJobs">
36+
<argument name="indices" value=""/>
37+
</actionGroup>
38+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
39+
<argument name="tags" value="config full_page"/>
40+
</actionGroup>
41+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
42+
</after>
43+
</suite>
44+
</suites>

‎InventoryAdminUi/Test/Mftf/Suite/InventoryB2bSingleModeSuite.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<exclude>
2525
<group name="skip"/>
2626
<group name="multi_mode"/>
27+
<group name="indexers_by_schedule_mode_only_multi_mode"/>
2728
</exclude>
2829
<after>
2930
<actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSYWYG"/>

0 commit comments

Comments
 (0)