Merge branch '2.4-develop' into graphql-SetShippingMethodsOnCart-remove-redundant-logic

Author: avattam06

app/code/Magento/Catalog/Model/FilterProductCustomAttribute.php

@@ -8,21 +8,21 @@
 namespace Magento\Catalog\Model;
 
 /**
- * Filter custom attributes for product using the blacklist
+ * Filter custom attributes for product using the excluded list
  */
 class FilterProductCustomAttribute
 {
     /**
      * @var array
      */
-    private $blackList;
+    private $excludedList;
 
     /**
-     * @param array $blackList
+     * @param array $excludedList
      */
-    public function __construct(array $blackList = [])
+    public function __construct(array $excludedList = [])
     {
-        $this->blackList = $blackList;
+        $this->excludedList = $excludedList;
     }
 
     /**
@@ -33,6 +33,6 @@ public function __construct(array $blackList = [])
      */
     public function execute(array $attributes): array
     {
-        return array_diff_key($attributes, array_flip($this->blackList));
+        return array_diff_key($attributes, array_flip($this->excludedList));
     }
 }

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

@@ -14,6 +14,7 @@
             <title value="Check for Configurable Product the default option doesn't appear."/>
             <description value="Check for Configurable Product the default option doesn't appear on the list options product when an option use."/>
             <testCaseId value="MC-35074"/>
+            <severity value="CRITICAL"/>
         </annotations>
         <before>
             <createData entity="ApiCategory" stepKey="createCategory"/>

app/code/Magento/CatalogInventory/etc/di.xml

@@ -37,7 +37,7 @@
     </type>
     <type name="Magento\Catalog\Model\FilterProductCustomAttribute">
         <arguments>
-            <argument name="blackList" xsi:type="array">
+            <argument name="excludedList" xsi:type="array">
                 <item name="quantity_and_stock_status" xsi:type="string">quantity_and_stock_status</item>
             </argument>
         </arguments>

app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefronElementVisibleActionGroup.xml

@@ -16,7 +16,8 @@
             <argument name="selector" type="string"/>
             <argument name="userInput" type="string"/>
         </arguments>
-        
+
+        <waitForElementVisible selector="{{selector}}" time="60" stepKey="waitForElementVisible"/>
         <see selector="{{selector}}" userInput="{{userInput}}" stepKey="assertElement"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontCheckoutCartItemsActionGroup.xml

@@ -19,6 +19,7 @@
             <argument name="qty" type="string"/>
         </arguments>
 
+        <waitForElementVisible selector="{{CheckoutCartProductSection.productName}}" time="60" stepKey="waitForProductNameVisible"/>
         <see selector="{{CheckoutCartProductSection.productName}}" userInput="{{productName}}"  stepKey="seeProductNameInCheckoutSummary"/>
         <see selector="{{CheckoutCartProductSection.ProductPriceByName(productName)}}" userInput="{{productPrice}}" stepKey="seeProductPriceInCart"/>
         <see selector="{{CheckoutCartProductSection.productSubtotalByName(productName)}}" userInput="{{subtotal}}" stepKey="seeSubtotalPrice"/>

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddBundleDynamicProductToShoppingCartTest.xml

@@ -9,6 +9,7 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StorefrontAddBundleDynamicProductToShoppingCartTest">
         <annotations>
+            <features value="Checkout"/>
             <stories value="Shopping Cart"/>
             <title value="Add bundle dynamic product to the cart"/>
             <description value="Add bundle dynamic product to the cart"/>
@@ -18,6 +19,7 @@
         </annotations>
 
         <before>
+            <magentoCLI command="config:set {{DisableFreeShippingConfigData.path}} {{DisableFreeShippingConfigData.value}}" stepKey="disableFreeShipping"/>
             <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
             <magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRateDefaultPrice"/>
             <createData entity="SimpleSubCategory" stepKey="createSubCategory"/>
@@ -46,19 +48,23 @@
                 <requiredEntity createDataKey="createBundleOption1_1"/>
                 <requiredEntity createDataKey="simpleProduct2"/>
             </createData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminCartPriceRuleDeleteAllActionGroup" stepKey="deleteAllRules"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value="cataloginventory_stock"/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
             <deleteData createDataKey="simpleProduct2" stepKey="deleteProduct2"/>
             <deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
             <deleteData createDataKey="createSubCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAsAdmin"/>
         </after>
 
         <!--Open Product page in StoreFront -->
         <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKeyActionGroup" stepKey="openProductPageAndVerifyProduct">
-            <argument name="product" value="$$createBundleProduct$$"/>
+            <argument name="product" value="$createBundleProduct$"/>
         </actionGroup>
 
         <!--Assert Product Price Range -->
@@ -93,8 +99,8 @@
 
         <!--Assert Product items in cart -->
         <actionGroup ref="AssertStorefrontCheckoutCartItemsActionGroup" stepKey="assertSimpleProduct1ItemsInCheckOutCart">
-            <argument name="productName" value="$$createBundleProduct.name$$"/>
-            <argument name="productSku" value="$$createBundleProduct.sku$$"/>
+            <argument name="productName" value="$createBundleProduct.name$"/>
+            <argument name="productSku" value="$createBundleProduct.sku$"/>
             <argument name="productPrice" value="$50.00"/>
             <argument name="subtotal" value="$100.00" />
             <argument name="qty" value="2"/>
@@ -107,13 +113,13 @@
         </actionGroup>
         <actionGroup ref="AssertStorefrontElementVisibleActionGroup" stepKey="seeProductOptionInCart">
             <argument name="selector" value="{{CheckoutCartProductSection.productOptionLabel}}"/>
-            <argument name="userInput" value="1 x $$simpleProduct2.name$$ $50.00"/>
+            <argument name="userInput" value="1 x $simpleProduct2.name$ $50.00"/>
         </actionGroup>
 
         <!-- Assert Product in Mini Cart -->
         <actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickOnMiniCart"/>
         <actionGroup ref="AssertStorefrontMiniCartItemsActionGroup" stepKey="assertSimpleProduct3MiniCart">
-            <argument name="productName" value="$$createBundleProduct.name$$"/>
+            <argument name="productName" value="$createBundleProduct.name$"/>
             <argument name="productPrice" value="$50.00"/>
             <argument name="cartSubtotal" value="$100.00" />
             <argument name="qty" value="2"/>

app/code/Magento/Customer/Test/Mftf/ActionGroup/CreateCustomerOrderActionGroup.xml

@@ -12,10 +12,6 @@
         <annotations>
             <description>Create Order via API assigned to Customer.</description>
         </annotations>
-        <arguments>
-            <argument name="Customer" />
-            <argument name="Product" />
-        </arguments>
 
         <createData entity="CustomerCart" stepKey="CustomerCart">
             <requiredEntity createDataKey="Customer"/>

app/code/Magento/Developer/Model/Logger/Handler/Debug.php

@@ -21,11 +21,6 @@ class Debug extends \Magento\Framework\Logger\Handler\Debug
      */
     private $state;
 
-    /**
-     * @var ScopeConfigInterface
-     */
-    private $scopeConfig;
-
     /**
      * @var DeploymentConfig
      */
@@ -34,22 +29,19 @@ class Debug extends \Magento\Framework\Logger\Handler\Debug
     /**
      * @param DriverInterface $filesystem
      * @param State $state
-     * @param ScopeConfigInterface $scopeConfig
      * @param DeploymentConfig $deploymentConfig
      * @param string $filePath
      * @throws \Exception
      */
     public function __construct(
         DriverInterface $filesystem,
         State $state,
-        ScopeConfigInterface $scopeConfig,
         DeploymentConfig $deploymentConfig,
         $filePath = null
     ) {
         parent::__construct($filesystem, $filePath);
 
         $this->state = $state;
-        $this->scopeConfig = $scopeConfig;
         $this->deploymentConfig = $deploymentConfig;
     }
 

app/code/Magento/Developer/Model/Logger/Handler/Syslog.php

@@ -29,13 +29,10 @@ class Syslog extends \Magento\Framework\Logger\Handler\Syslog
     private $deploymentConfig;
 
     /**
-     * @param ScopeConfigInterface $scopeConfig Scope config
      * @param DeploymentConfig $deploymentConfig Deployment config
      * @param string $ident The string ident to be added to each message
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
-        ScopeConfigInterface $scopeConfig,
         DeploymentConfig $deploymentConfig,
         string $ident
     ) {

app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/SyslogTest.php

@@ -44,7 +44,6 @@ protected function setUp(): void
         $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
 
         $this->model = new Syslog(
-            $this->scopeConfigMock,
             $this->deploymentConfigMock,
             'Magento'
         );