Skip to content

Commit

Permalink
Version 1.2.6-p2
Browse files Browse the repository at this point in the history
  • Loading branch information
magento packaging service committed Aug 4, 2023
1 parent 5726b2e commit 88b368e
Show file tree
Hide file tree
Showing 93 changed files with 1,127 additions and 770 deletions.
12 changes: 7 additions & 5 deletions Inventory/composer.json
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
{
"name": "magento/module-inventory",
"description": "N/A",
"require": {
"php": "~8.1.0||~8.2.0",
"magento/framework": "*",
"magento/module-inventory-api": "*"
},
"type": "magento2-module",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"version": "1.2.4",
"require": {
"php": "~8.1.0||~8.2.0",
"magento/framework": "*",
"magento/module-inventory-api": "1.2.*"
},
"autoload": {
"files": [
"registration.php"
Expand All @@ -20,3 +21,4 @@
}
}
}

2 changes: 2 additions & 0 deletions InventoryAdminUi/Test/Mftf/Suite/InventoryMultiModeSuite.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<suite name="InventoryMultiModeSuite">
<before>
<actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSYWYG"/>
<actionGroup ref="AdminEnableGuestCheckoutActionGroup" stepKey="enableGuestCheckout"/>
<magentoCLI command="config:set {{TurnOnManageStockConfig.path}} {{TurnOnManageStockConfig.value}}" stepKey="enableStockManagement"/>
<magentoCron groups="index" stepKey="reindex"/>
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
Expand All @@ -25,6 +26,7 @@
</exclude>
<after>
<actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSYWYG"/>
<actionGroup ref="AdminDisableGuestCheckoutActionGroup" stepKey="disableGuestCheckout"/>
<magentoCLI command="config:set {{TurnOffManageStockConfig.path}} {{TurnOffManageStockConfig.value}}" stepKey="disableStockManagement"/>
<magentoCron groups="index" stepKey="reindex"/>
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
Expand Down
2 changes: 2 additions & 0 deletions InventoryAdminUi/Test/Mftf/Suite/InventorySingleModeSuite.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<suite name="InventorySingleModeSuite">
<before>
<actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSYWYG"/>
<actionGroup ref="AdminEnableGuestCheckoutActionGroup" stepKey="enableGuestCheckout"/>
<magentoCLI command="config:set {{TurnOnManageStockConfig.path}} {{TurnOnManageStockConfig.value}}" stepKey="enableStockManagement"/>
<magentoCron groups="index" stepKey="reindex"/>
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
Expand All @@ -25,6 +26,7 @@
</exclude>
<after>
<actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSYWYG"/>
<actionGroup ref="AdminDisableGuestCheckoutActionGroup" stepKey="disableGuestCheckout"/>
<magentoCLI command="config:set {{TurnOffManageStockConfig.path}} {{TurnOffManageStockConfig.value}}" stepKey="disableStockManagement"/>
<magentoCron groups="index" stepKey="reindex"/>
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
Expand Down
4 changes: 2 additions & 2 deletions InventoryAdminUi/Test/Mftf/Test/AdminUserApplyMinMaxQtyForSimpleProductOnTestSourceTest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@
<amOnPage url="{{StorefrontProductPage.url($$product.custom_attributes[url_key]$$)}}" stepKey="navigateToPDP"/>
<fillField selector="{{StorefrontProductPageSection.qtyInput}}" userInput="1" stepKey="fillProductQtyLowerThanAllowed"/>
<click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCartLowerThenAllowedQty"/>
<waitForElementVisible selector="#qty-error" time="30" stepKey="witForLowQtyAdded"/>
<see selector="#qty-error" userInput="The fewest you may purchase is 5." stepKey="seeLowQtyErrorMessage"/>
<waitForElementVisible selector="//div[@data-ui-id='message-error']//div" time="30" stepKey="witForLowQtyAdded"/>
<see selector="//div[@data-ui-id='message-error']//div" userInput="The fewest you may purchase is 5." stepKey="seeLowQtyErrorMessage"/>
<!--Try to add product ot cart with greater qty than allowed.-->
<fillField selector="{{StorefrontProductPageSection.qtyInput}}" userInput="6" stepKey="fillProductQtyGreaterThanAllowed"/>
<click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCartGreaterThenAllowedQty"/>
Expand Down
188 changes: 95 additions & 93 deletions ...WebsiteWithSimpleProductWithManageStockNoInAdvancedInventorySettingsOnProductPageTest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,106 +8,108 @@

<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
<test name="AdminUserCreateOrderFromCustomWebsiteWithSimpleProductWithManageStockNoInAdvancedInventorySettingsOnProductPageTest">
<annotations>
<stories value="Admin user create order from Custom websit"/>
<title value="Admin user create order from Custom website with Simple product with Manage Stock = No in Advanced Inventory settings on product page"/>
<description value="Admin user create order from Custom website with Simple product with Manage Stock = No in Advanced Inventory settings on product page"/>
<testCaseId value="https://app.hiptest.com/projects/69435/test-plan/folders/419534/scenarios/3565390"/>
<severity value="CRITICAL"/>
<group value="msi"/>
<group value="multi_mode"/>
</annotations>
<test name="AdminUserCreateOrderFromCustomWebsiteWithSimpleProductWithManageStockNoInAdvancedInventorySettingsOnProductPageTest">
<annotations>
<stories value="Admin user create order from Custom websit"/>
<title value="Admin user create order from Custom website with Simple product with Manage Stock = No in Advanced Inventory settings on product page"/>
<description value="Admin user create order from Custom website with Simple product with Manage Stock = No in Advanced Inventory settings on product page"/>
<testCaseId value="https://app.hiptest.com/projects/69435/test-plan/folders/419534/scenarios/3565390"/>
<severity value="CRITICAL"/>
<group value="msi"/>
<group value="multi_mode"/>
</annotations>

<before>
<createData entity="FullSource1" stepKey="additionalSource"/>
<createData entity="BasicMsiStock1" stepKey="additionalStock"/>
<createData entity="SourceStockLinked1" stepKey="linkSourceStock">
<requiredEntity createDataKey="additionalStock"/>
<requiredEntity createDataKey="additionalSource"/>
</createData>
<createData entity="SimpleSubCategory" stepKey="createCategory1"/>
<createData entity="SimpleMsiProduct" stepKey="simpleProduct"/>
<actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdmin1"/>
<before>
<createData entity="FullSource1" stepKey="additionalSource"/>
<createData entity="BasicMsiStock1" stepKey="additionalStock"/>
<createData entity="SourceStockLinked1" stepKey="linkSourceStock">
<requiredEntity createDataKey="additionalStock"/>
<requiredEntity createDataKey="additionalSource"/>
</createData>
<createData entity="SimpleSubCategory" stepKey="createCategory1"/>
<createData entity="SimpleMsiProduct" stepKey="simpleProduct"/>
<actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdmin1"/>

<actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="adminCreateNewWebsite">
<argument name="newWebsiteName" value="{{NewWebSiteData.name}}"/>
<argument name="websiteCode" value="{{NewWebSiteData.code}}"/>
</actionGroup>
<actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="adminCreateNewStore">
<argument name="website" value="{{NewWebSiteData.name}}"/>
<argument name="storeGroupName" value="{{NewStoreData.name}}"/>
<argument name="storeGroupCode" value="{{NewStoreData.code}}"/>
</actionGroup>
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="adminCreateNewStoreView">
<argument name="StoreGroup" value="NewStoreData"/>
<argument name="customStore" value="customStore"/>
</actionGroup>
<actionGroup ref="AdminCreateCustomerWithWebsiteGroupAndAddressActionGroup" stepKey="adminCreateCustomerCustomWebsite">
<argument name="customerData" value="Simple_US_Customer"/>
<argument name="website" value="{{NewWebSiteData.name}}"/>
<argument name="storeView" value="{{customStore.name}}"/>
</actionGroup>
<!--Assign Custom Stock to Additional Website.-->
<actionGroup ref="AssignWebsiteToStockActionGroup" stepKey="assignStockToAdditionalWebsite">
<argument name="stockName" value="{{BasicMsiStock1.name}}"/>
<argument name="websiteName" value="{{NewWebSiteData.name}}"/>
</actionGroup>
<magentoCLI command="config:set {{StorefrontEnableAddStoreCodeToUrls.path}} {{StorefrontEnableAddStoreCodeToUrls.value}}" stepKey="addStoreCodeToUrlEnable"/>
<magentoCLI command="indexer:reindex" stepKey="doReindex"/>
</before>
<after>
<!--Assign Default Stock to Default Website.-->
<actionGroup ref="AssignWebsiteToStockActionGroup" stepKey="assignMainWebsiteToDefaultStock">
<argument name="stockName" value="{{_defaultStock.name}}"/>
<argument name="websiteName" value="{{_defaultWebsite.name}}"/>
</actionGroup>
<actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="DeleteWebsite" after="deleteProduct">
<argument name="websiteName" value="{{NewWebSiteData.name}}"/>
</actionGroup>
<actionGroup ref="DisableSourceActionGroup" stepKey="disableCreatedSource">
<argument name="sourceCode" value="$$additionalSource.source[source_code]$$"/>
</actionGroup>
<deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
<deleteData createDataKey="createCategory1" stepKey="deleteCategory"/>
<magentoCLI command="config:set {{StorefrontDisableAddStoreCodeToUrls.path}} {{StorefrontDisableAddStoreCodeToUrls.value}}" stepKey="addStoreCodeToUrlDisable"/>
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
<magentoCLI command="cache:flush" stepKey="flushCache"/>
</after>
<actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="adminCreateNewWebsite">
<argument name="newWebsiteName" value="{{NewWebSiteData.name}}"/>
<argument name="websiteCode" value="{{NewWebSiteData.code}}"/>
</actionGroup>
<actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="adminCreateNewStore">
<argument name="website" value="{{NewWebSiteData.name}}"/>
<argument name="storeGroupName" value="{{NewStoreData.name}}"/>
<argument name="storeGroupCode" value="{{NewStoreData.code}}"/>
</actionGroup>
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="adminCreateNewStoreView">
<argument name="StoreGroup" value="NewStoreData"/>
<argument name="customStore" value="customStore"/>
</actionGroup>
<actionGroup ref="AdminCreateCustomerWithWebsiteGroupAndAddressActionGroup" stepKey="adminCreateCustomerCustomWebsite">
<argument name="customerData" value="Simple_US_Customer"/>
<argument name="website" value="{{NewWebSiteData.name}}"/>
<argument name="storeView" value="{{customStore.name}}"/>
</actionGroup>
<!--Assign Custom Stock to Additional Website.-->
<actionGroup ref="AssignWebsiteToStockActionGroup" stepKey="assignStockToAdditionalWebsite">
<argument name="stockName" value="{{BasicMsiStock1.name}}"/>
<argument name="websiteName" value="{{NewWebSiteData.name}}"/>
</actionGroup>
<magentoCLI command="config:set {{StorefrontEnableAddStoreCodeToUrls.path}} {{StorefrontEnableAddStoreCodeToUrls.value}}" stepKey="addStoreCodeToUrlEnable"/>
<magentoCLI command="indexer:reindex" stepKey="doReindex"/>
</before>
<after>
<!--Assign Default Stock to Default Website.-->
<actionGroup ref="AssignWebsiteToStockActionGroup" stepKey="assignMainWebsiteToDefaultStock">
<argument name="stockName" value="{{_defaultStock.name}}"/>
<argument name="websiteName" value="{{_defaultWebsite.name}}"/>
</actionGroup>
<actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="DeleteWebsite" after="deleteProduct">
<argument name="websiteName" value="{{NewWebSiteData.name}}"/>
</actionGroup>
<actionGroup ref="DisableSourceActionGroup" stepKey="disableCreatedSource">
<argument name="sourceCode" value="$$additionalSource.source[source_code]$$"/>
</actionGroup>
<deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
<deleteData createDataKey="createCategory1" stepKey="deleteCategory"/>
<magentoCLI command="config:set {{StorefrontDisableAddStoreCodeToUrls.path}} {{StorefrontDisableAddStoreCodeToUrls.value}}" stepKey="addStoreCodeToUrlDisable"/>
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
<magentoCLI command="cache:flush" stepKey="flushCache"/>
</after>

<!-- Assign product to custom website -->
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="openProductGrid"/>
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProduct1">
<argument name="product" value="$$simpleProduct$$"/>
</actionGroup>
<!-- Assign product to custom website -->
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="openProductGrid"/>
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProduct1">
<argument name="product" value="$$simpleProduct$$"/>
</actionGroup>

<actionGroup ref="OpenProductForEditByClickingRowXColumnYInProductGridActionGroup" stepKey="openFirstProductForEdit"/>
<actionGroup ref="AssignSourceToProductActionGroup" stepKey="assignTestSourceToCreatedProduct" >
<argument name="sourceCode" value="$$additionalSource.source[source_code]$$"/>
</actionGroup>
<actionGroup ref="OpenProductForEditByClickingRowXColumnYInProductGridActionGroup" stepKey="openFirstProductForEdit"/>
<actionGroup ref="AssignSourceToProductActionGroup" stepKey="assignTestSourceToCreatedProduct" >
<argument name="sourceCode" value="$$additionalSource.source[source_code]$$"/>
</actionGroup>

<actionGroup ref="AdminFillSourceQtyOnProductEditPageActionGroup" stepKey="fillProductQtyPerSource">
<argument name="sourceCode" value="$$additionalSource.source[source_code]$$"/>
<argument name="qty" value="20" />
</actionGroup>
<actionGroup ref="AdminFillSourceQtyOnProductEditPageActionGroup" stepKey="fillProductQtyPerSource">
<argument name="sourceCode" value="$$additionalSource.source[source_code]$$"/>
<argument name="qty" value="20" />
</actionGroup>

<actionGroup ref="AdminChangeManageStockStatusOnProductEditPageActionGroup" stepKey="disableMangeStockOnProductEditPage">
<argument name="manageStock" value="No"/>
</actionGroup>
<actionGroup ref="AdminChangeManageStockStatusOnProductEditPageActionGroup" stepKey="disableMangeStockOnProductEditPage">
<argument name="manageStock" value="No"/>
</actionGroup>

<actionGroup ref="AddWebsiteToProductActionGroup" stepKey="assignProductToAdditionalWebsite" >
<argument name="website" value="{{NewWebSiteData.name}}"/>
</actionGroup>
<actionGroup ref="AddWebsiteToProductActionGroup" stepKey="assignProductToAdditionalWebsite" >
<argument name="website" value="{{NewWebSiteData.name}}"/>
</actionGroup>

<actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="createNewOrderForCustomer">
<argument name="customer" value="Simple_US_Customer"/>
<argument name="storeView" value="customStore"/>
</actionGroup>
<actionGroup ref="AdminNavigateToNewOrderPageExistingCustomerActionGroup" stepKey="createNewOrderForCustomer">
<argument name="customer" value="Simple_US_Customer"/>
</actionGroup>
<actionGroup ref="AdminSelectStoreDuringOrderCreationActionGroup" stepKey="selectCustomStore">
<argument name="storeView" value="customStore"/>
</actionGroup>

<actionGroup ref="AddSimpleProductToOrderActionGroup" stepKey="addSimpleProductToTheOrder">
<argument name="product" value="$$simpleProduct$$"/>
</actionGroup>
<actionGroup ref="OrderSelectFlatRateShippingActionGroup" stepKey="orderSelectFlatRateShippingMethod"/>
<actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
</test>
<actionGroup ref="AddSimpleProductToOrderActionGroup" stepKey="addSimpleProductToTheOrder">
<argument name="product" value="$$simpleProduct$$"/>
</actionGroup>
<actionGroup ref="OrderSelectFlatRateShippingActionGroup" stepKey="orderSelectFlatRateShippingMethod"/>
<actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
</test>
</tests>
5 changes: 3 additions & 2 deletions .../Test/Mftf/Test/AdminUserCreateOrderWithSimpleProductOnTestStockFromCustomWebsiteTest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,9 @@
</after>

<!--- Place order. -->
<actionGroup ref="NavigateToNewOrderPageNewCustomerActionGroup" stepKey="createNewOrderForCustomer">
<argument name="storeView" value="customStore"/>
<actionGroup ref="AdminNavigateToNewOrderPageNewCustomerActionGroup" stepKey="createNewOrderForCustomer"/>
<actionGroup ref="AdminSelectStoreDuringOrderCreationActionGroup" stepKey="selectCustomStore">
<argument name="storeView" value="customStore" />
</actionGroup>
<waitForPageLoad stepKey="waitForPageLoad"/>
<fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Msi_US_Customer.email}}" stepKey="fillEmailField"/>
Expand Down
Loading

0 comments on commit 88b368e

Please sign in to comment.