Merge branch '2.4-develop' into 1.5.0-beta1-develop-sync-with-2.4-develop

Author: magento-devops-queue-mgr-svc

app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3SyncZeroByteFilesTest.xml

@@ -44,11 +44,11 @@
             <!-- Disable AWS S3 Remote Storage -->
             <magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage"/>
         </after>
-        <magentoCLI command="remote-storage:sync" timeout="120" stepKey="syncRemoteStorage"/>
-        <assertEquals stepKey="assertConfigTest">
-            <expectedResult type="string">Uploading media files to remote storage.\n- empty.jpg\nEnd of upload.</expectedResult>
+        <magentoCLI command="remote-storage:sync" timeout="200" stepKey="syncRemoteStorage"/>
+        <comment userInput="checking remote-storage:sync" stepKey="assertConfigTest"/>
+        <assertStringContainsString stepKey="checkingRemoteStorageSync">
+            <expectedResult type="string">Uploading media files to remote storage</expectedResult>
             <actualResult type="variable">$syncRemoteStorage</actualResult>
-        </assertEquals>
-
+        </assertStringContainsString>
     </test>
 </tests>

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

@@ -16,6 +16,7 @@
             <argument name="categoryName" type="string"/>
         </arguments>
 
+        <waitForElementVisible selector="{{StorefrontHeaderSection.NavigationCategoryByName(categoryName)}}" stepKey="waitForCatName" time="120"/>
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(categoryName)}}"
                     stepKey="seeCatergoryInStoreFront"/>
     </actionGroup>

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

@@ -42,15 +42,17 @@
         <click selector="{{StorefrontHeaderSection.mobileMenuToggle}}" stepKey="openSideMenu"/>
         <waitForElementClickable selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createParentCategory.name$$)}}" stepKey="waitForCategoryMenuClickable" />
         <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createParentCategory.name$$)}}" stepKey="expandCategoryMenu"/>
-        <waitForPageLoad stepKey="waitForSearchResult"/>
+        <waitForPageLoad stepKey="waitForSearchResult" time="60"/>
 
         <!-- Assert the category expanded successfully -->
         <actionGroup ref="StorefrontAssertCategoryNameIsShownInMenuActionGroup" stepKey="verifySubCatMenuItemIsVisibleInTheSidebar">
             <argument name="categoryName" value="$$createSubCategory.name$$"/>
         </actionGroup>
 
         <!-- Open the subcategory and assert it opened successfully -->
+        <waitForElementClickable selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createSubCategory.name$$)}}" stepKey="waitForSubCategory" time="90"/>
         <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createSubCategory.name$$)}}" stepKey="openSubCategory"/>
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="waitForCategoryName" time="90"/>
         <see userInput="$$createSubCategory.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="assertCategoryName"/>
     </test>
 </tests>

composer.json

@@ -40,7 +40,6 @@
         "colinmollenhour/credis": "^1.13",
         "colinmollenhour/php-redis-session-abstract": "^1.5",
         "composer/composer": "^2.0, !=2.2.16",
-        "doctrine/annotations": "^2.0",
         "elasticsearch/elasticsearch": "~7.17.0 || ~8.5.0",
         "ezyang/htmlpurifier": "^4.16",
         "guzzlehttp/guzzle": "^7.5",
@@ -98,7 +97,7 @@
         "friendsofphp/php-cs-fixer": "^3.22",
         "lusitanian/oauth": "^0.8",
         "magento/magento-coding-standard": "*",
-        "magento/magento2-functional-testing-framework": "^4.4.2",
+        "magento/magento2-functional-testing-framework": "^4.6",
         "pdepend/pdepend": "^2.10",
         "phpmd/phpmd": "^2.12",
         "phpstan/phpstan": "^1.9",