Merge branch '2.4-develop' into stability_control

Author: magento-devops-queue-mgr-svc

app/code/Magento/AwsS3/Test/Mftf/Helper/DummyMetadataCache.php

@@ -83,11 +83,4 @@ public function updateMetadata(string $path, array $objectMetadata, bool $persis
     public function storeFileNotExists(string $path): void
     {
     }
-
-    /**
-     * @inheirtDoc
-     */
-    public function storeDirNotExists(string $path): void
-    {
-    }
 }

app/code/Magento/AwsS3/Test/Mftf/Helper/S3FileAssertions.php

@@ -26,11 +26,6 @@ class S3FileAssertions extends Helper
      */
     private $driver;
 
-    /**
-     * @var AwsS3V3Adapter
-     */
-    private $adapter;
-
     /**
      * Call the parent constructor then create the AwsS3 driver from environment variables
      *
@@ -70,7 +65,6 @@ public function __construct(ModuleContainer $moduleContainer, ?array $config = n
         $s3Driver = new AwsS3($adapter, new MockTestLogger(), $objectUrl, $metadataProvider);
 
         $this->driver = $s3Driver;
-        $this->adapter = $adapter;
     }
 
     /**
@@ -202,11 +196,10 @@ public function assertGlobbedFileExists($path, $pattern, $message = ''): void
      * @return void
      *
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @throws \League\Flysystem\FilesystemException
      */
     public function assertDirectoryExists($path, $message = ''): void
     {
-        $this->assertTrue($this->adapter->directoryExists($path), "Failed asserting $path exists. " . $message);
+        $this->assertTrue($this->driver->isDirectory($path), "Failed asserting $path exists. " . $message);
     }
 
     /**

app/code/Magento/AwsS3/Test/Unit/Driver/AwsS3Test.php

@@ -439,8 +439,8 @@ public function testSearchDirectory(): void
         $this->metadataProviderMock->expects(self::any())->method('getMetadata')
             ->willReturnMap([
                 ['path', ['type' => AwsS3::TYPE_DIR]],
-                ['path/1', ['type' => AwsS3::TYPE_DIR]],
-                ['path/2', ['type' => AwsS3::TYPE_DIR]],
+                ['path/1', ['type' => AwsS3::TYPE_FILE]],
+                ['path/2', ['type' => AwsS3::TYPE_FILE]],
             ]);
         $this->adapterMock->expects(self::atLeastOnce())->method('listContents')
             ->willReturn(new \ArrayIterator($subPaths));

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateProductAttributeWithSaveAndEditActionGroup.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminCreateProductAttributeWithSaveAndEditActionGroup" extends="CreateProductAttributeActionGroup">
+        <annotations>
+            <description>Clicks on 'Add New Attribute'. Fills in the Attribute Details (Label, Input Type and Value Required). Clicks on Save.</description>
+        </annotations>
+        <remove keyForRemoval="saveAttribute"/>
+        <click stepKey="saveAndEditAttribute" selector="{{AttributePropertiesSection.SaveAndEdit}}"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection/AttributePropertiesSection.xml

@@ -33,5 +33,6 @@
         <element name="dropdownNthOptionDelete" type="button" selector="tbody[data-role='options-container'] tr:nth-child({{var}}) button[title='Delete']" parameterized="true"/>
         <element name="attributeLabelValidationError" type="text" selector=".field-attribute_label .mage-error"/>
         <element name="AttributeCode" type="input" selector="#attribute_code"/>
+        <element name="defaultRadioButton" type="radio" selector="//*[@id='swatch_window_option_option_{{position}}']/parent::td/parent::tr/td[@class='col-default']" parameterized="true"/>
     </section>
 </sections>

app/code/Magento/CatalogInventory/Test/Mftf/Section/AdminInventoryProductStockOptionsConfigSection.xml

@@ -12,5 +12,8 @@
         <element name="maxSaleQtyInherit" type="checkbox" selector="#cataloginventory_item_options_max_sale_qty_inherit" timeout="30"/>
         <element name="maxSaleQty" type="input" selector="#cataloginventory_item_options_max_sale_qty"/>
         <element name="maxSaleQtyError" type="input" selector="#cataloginventory_item_options_max_sale_qty-error"/>
+        <element name="notifyQty" type="input" selector="//input[@id='cataloginventory_item_options_notify_stock_qty']"/>
+        <element name="saveConfig" type="button" selector="//span[text()='Save Config']"/>
+        <element name="systemValue" type="input" selector="//input[@id='cataloginventory_item_options_notify_stock_qty_inherit']"/>
     </section>
 </sections>

app/code/Magento/Checkout/Test/Mftf/Data/CountryData.xml

@@ -42,4 +42,9 @@
             <item>United Kingdom</item>
         </array>
     </entity>
+    <entity name="WesternEurope" type="countryArray">
+        <array key="country">
+            <item>Belgium</item>
+        </array>
+    </entity>
 </entities>

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

@@ -69,9 +69,11 @@
         <!-- Click next button to open payment section -->
         <actionGroup ref="StorefrontGuestCheckoutProceedToPaymentStepActionGroup" stepKey="clickNext"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForShipmentPageLoad"/>
+        <waitForElementClickable selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="waitForElementSelectPaymentSolutionToBeClickable"/>
         <uncheckOption selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="selectPaymentSolution"/>
 
         <!-- Change the address -->
+        <waitForElementClickable selector="{{CheckoutPaymentSection.editAddress}}" stepKey="waitForEditAddressElementToBeClickable"/>
         <click selector="{{CheckoutPaymentSection.editAddress}}" stepKey="editAddress"/>
         <waitForElementVisible selector="{{CheckoutPaymentSection.addressDropdown}}" stepKey="waitForDropDownToBeVisible"/>
         <see selector="{{CheckoutPaymentSection.addressDropdownSelected}}" userInput="{{US_Address_NY.street[0]}}" stepKey="seeDefaultBillingAddressStreet"/>

app/code/Magento/Config/Test/Mftf/ActionGroup/UnselectStatesForStatesOptionsActionGroup.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="UnselectStatesForStatesOptionsActionGroup">
+        <annotations>
+            <description>Goes to the 'Configuration' page for 'General'. Selects the provided States under 'State is Required for'. Clicks on the Save button.</description>
+        </annotations>
+        <arguments>
+            <argument name="countries" type="entity"/>
+        </arguments>
+        <amOnPage url="{{AdminConfigGeneralPage.url}}" stepKey="navigateToAdminConfigGeneralPage"/>
+        <conditionalClick selector="{{StateOptionsSection.stateOptions}}" dependentSelector="{{StateOptionsSection.countriesWithRequiredRegions}}" visible="false" stepKey="expandStateOptionsTab"/>
+        <waitForAjaxLoad stepKey="waitForAjax"/>
+        <scrollTo selector="{{StateOptionsSection.countriesWithRequiredRegions}}" stepKey="scrollToForm"/>
+        <unselectOption selector="{{StateOptionsSection.countriesWithRequiredRegions}}" parameterArray="[{{countries.country}}]" stepKey="selectCountriesWithRequiredRegion"/>
+        <click selector="#save" stepKey="saveConfig"/>
+        <waitForPageLoad stepKey="waitForSavingConfig"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml

@@ -22,5 +22,7 @@
         <element name="numberOfAddresses" type="text" selector=".toolbar-number"/>
         <element name="shippingAddress" type="text" selector="//div[contains(@class,'box box-shipping-address')]//div/address"/>
         <element name="billingAddress" type="text" selector="//div[contains(@class,'box box-billing-address')]//div/address"/>
+        <element name="changeBillingAddress" type="button" selector="//div[@class='box box-address-billing']//div[@class='box-actions']//a"/>
+        <element name="changeShippingAddress" type="button" selector="//div[@class='box box-address-shipping']//div[@class='box-actions']//a"/>
     </section>
 </sections>