Merge branch 'develop' into AC-13039

Author: cod62627

Inventory/Test/Unit/Model/SourceItem/Validator/SkuValidatorTest.php

@@ -61,7 +61,7 @@ protected function setUp(): void
     /**
      * @return array
      */
-    public function sourceDataProvider(): array
+    public static function sourceDataProvider(): array
     {
         return [
             [

InventoryAdminUi/Test/Mftf/Test/AddProductToCartAfterCancelOrderConfigurableProductCustomStockTest.xml

@@ -115,7 +115,7 @@
         <fillField selector="{{StorefrontProductPageSection.qtyInput}}" userInput="{{101ProductQty.value}}" stepKey="fillQuantity"/>
         <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCart"/>
         <waitForElementVisible selector="{{StorefrontProductPageSection.errorMsg}}" stepKey="waitForErrorMessage"/>
-        <see selector="{{StorefrontProductPageSection.errorMsg}}" userInput="The requested qty is not available" stepKey="verifyErrorMessage"/>
+        <see selector="{{StorefrontProductPageSection.errorMsg}}" userInput="Not enough items for sale" stepKey="verifyErrorMessage"/>
         <!--Add configurable to cart with proper quantity-->
         <actionGroup ref="StorefrontAddConfigurableProductToTheCartActionGroup" stepKey="addConfigurableProductToCartWithProperQty">
             <argument name="urlKey" value="$configurableProduct.custom_attributes[url_key]$" />

InventoryAdminUi/Test/Mftf/Test/AddProductToCartAfterCancelOrderDownloadableProductCustomStockTest.xml

@@ -83,7 +83,7 @@
         <fillField selector="{{StorefrontProductPageSection.qtyInput}}" userInput="{{101ProductQty.value}}" stepKey="fillQuantity"/>
         <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCart"/>
         <waitForElementVisible selector="{{StorefrontProductPageSection.errorMsg}}" stepKey="waitForErrorMessage"/>
-        <see selector="{{StorefrontProductPageSection.errorMsg}}" userInput="The requested qty is not available" stepKey="verifyErrorMessage"/>
+        <see selector="{{StorefrontProductPageSection.errorMsg}}" userInput="Not enough items for sale" stepKey="verifyErrorMessage"/>
         <!--Add downloadable product with proper quantity.-->
         <actionGroup ref="StorefrontAddProductToCartWithQtyActionGroup" stepKey="addProductToCartWithProperQty">
             <argument name="productQty" value="{{defaultProductQty.value}}"/>

InventoryAdminUi/Test/Mftf/Test/AddProductToCartAfterCancelOrderSimpleProductCustomStockTest.xml

@@ -87,7 +87,7 @@
         <fillField selector="{{StorefrontProductPageSection.qtyInput}}" userInput="{{101ProductQty.value}}" stepKey="fillQuantity"/>
         <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCart"/>
         <waitForElementVisible selector="{{StorefrontProductPageSection.errorMsg}}" stepKey="waitForErrorMessage"/>
-        <see selector="{{StorefrontProductPageSection.errorMsg}}" userInput="The requested qty is not available" stepKey="verifyErrorMessage"/>
+        <see selector="{{StorefrontProductPageSection.errorMsg}}" userInput="Not enough items for sale" stepKey="verifyErrorMessage"/>
         <!--Add simple product with proper quantity.-->
         <actionGroup ref="StorefrontAddProductToCartWithQtyActionGroup" stepKey="addProductToCartWithProperQty">
             <argument name="productQty" value="{{defaultProductQty.value}}"/>

InventoryAdminUi/Test/Mftf/Test/AddProductToCartAfterOrderPlacementSimpleProductCustomStockTest.xml

@@ -79,7 +79,7 @@
         <fillField selector="{{StorefrontProductPageSection.qtyInput}}" userInput="{{defaultProductQty.value}}" stepKey="fillQuantity"/>
         <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCart"/>
         <waitForElementVisible selector="{{StorefrontProductPageSection.errorMsg}}" stepKey="waitForErrorMessage"/>
-        <see selector="{{StorefrontProductPageSection.errorMsg}}" userInput="The requested qty is not available" stepKey="verifyErrorMessage"/>
+        <see selector="{{StorefrontProductPageSection.errorMsg}}" userInput="Not enough items for sale" stepKey="verifyErrorMessage"/>
         <!--Add simple product with proper quantity.-->
         <actionGroup ref="StorefrontAddProductToCartWithQtyActionGroup" stepKey="addProductToCartWithProperQty">
             <argument name="productQty" value="{{defaultProductQtyBoughtWith5Pieces.value}}"/>

InventoryCache/Test/Unit/Model/CacheFlushProcessorTest.php

@@ -125,7 +125,7 @@ public function testProcess(
     /**
      * @return array
      */
-    public function processDataProvider(): array
+    public static function processDataProvider(): array
     {
         return [
             [[1], ['sku1' => [1 => true]], ['sku1' => [1 => true]], [], 0],

InventoryCatalog/Test/Integration/Catalog/Block/Product/ListProduct/SortingTest.php

@@ -218,24 +218,24 @@ public static function productListWithShowOutOfStockSortOrderDataProvider(): arr
     {
         return [
             'default_order_price_asc' => [
-                'sort' => 'price',
+                'sortBy' => 'price',
                 'direction' => 'ASC',
-                'expectation' => ['simple_1', 'simple_2', 'configurable2', 'configurable1'],
+                'expected' => ['simple_1', 'simple_2', 'configurable2', 'configurable1'],
             ],
             'default_order_price_desc' => [
-                'sort' => 'price',
+                'sortBy' => 'price',
                 'direction' => 'DESC',
-                'expectation' => ['configurable2', 'simple_2', 'simple_1', 'configurable1'],
+                'expected' => ['configurable2', 'simple_2', 'simple_1', 'configurable1'],
             ],
             'default_order_name_asc' => [
-                'sort' => 'name',
+                'sortBy' => 'name',
                 'direction' => 'ASC',
-                'expectation' => ['configurable2', 'simple_1', 'simple_2', 'configurable1'],
+                'expected' => ['configurable2', 'simple_1', 'simple_2', 'configurable1'],
             ],
             'default_order_name_desc' => [
-                'sort' => 'name',
+                'sortBy' => 'name',
                 'direction' => 'DESC',
-                'expectation' => ['simple_2', 'simple_1', 'configurable2', 'configurable1'],
+                'expected' => ['simple_2', 'simple_1', 'configurable2', 'configurable1'],
             ],
         ];
     }

InventoryCatalog/Test/Integration/NegativeMinQtyTest.php

@@ -162,7 +162,7 @@ public function testIsProductSalableForRequestedQtyWithBackordersEnabledGlobally
      *
      * @return array
      */
-    public function isProductSalableForRequestedQtyWithBackordersEnabledGloballyDataProvider(): array
+    public static function isProductSalableForRequestedQtyWithBackordersEnabledGloballyDataProvider(): array
     {
         return [
             'salable_qty' => ['SKU-1', 10, 13, true],

InventoryConfigurableProduct/Test/Api/ConfigurableProductShouldBeInStockWhenChildProductInStockTest.php

@@ -235,7 +235,7 @@ public function testUpdateConfigurableStockStatusUsingStockItemAPI(string $fixtu
         self::assertEquals(1, $collection->count());
     }
 
-    public function updateConfigurableStockStatusUsingStockItemAPIDataProvider(): array
+    public static function updateConfigurableStockStatusUsingStockItemAPIDataProvider(): array
     {
         return [
             ['simple'],

InventoryConfigurableProduct/Test/Integration/Plugin/InventoryCatalog/UpdateInventoryTest.php

@@ -119,7 +119,7 @@ public function testMassUpdateConfigurableProductsStockStatus(array $products):
     /**
      * @return array[]
      */
-    public function massUpdateConfigurableProductsStockStatusDataProvider(): array
+    public static function massUpdateConfigurableProductsStockStatusDataProvider(): array
     {
         return [
             [['sp1', 'sp2', 'sp3', 'sp4', 'cp1', 'cp2']],