Merge remote-tracking branch 'mainline/2.4-develop' into 2.4-develop-pr7

Author: serhii-balko

app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterJSMinificationTest.xml

@@ -18,19 +18,18 @@
             <severity value="MAJOR"/>
             <group value="backend"/>
             <group value="mtf_migrated"/>
-            <skip>
-                <issueId value="MC-17140"/>
-            </skip>
         </annotations>
         <before>
             <magentoCLI command="config:set {{MinifyJavaScriptFilesEnableConfigData.path}} {{MinifyJavaScriptFilesEnableConfigData.value}}" stepKey="enableJsMinification"/>
+            <magentoCLI command="cache:clean config" stepKey="cleanCache"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
         <after>
             <magentoCLI command="config:set {{MinifyJavaScriptFilesDisableConfigData.path}} {{MinifyJavaScriptFilesDisableConfigData.value}}" stepKey="disableJsMinification"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
-
+        <see userInput="Dashboard" selector="{{AdminHeaderSection.pageTitle}}" stepKey="seeDashboardTitle"/>
+        <waitForPageLoad stepKey="waitForPageLoadOnDashboard"/>
         <actionGroup ref="AssertAdminSuccessLoginActionGroup" stepKey="loggedInSuccessfully"/>
         <actionGroup ref="AssertAdminPageIsNot404ActionGroup" stepKey="dontSee404Page"/>
     </test>

app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleAndConfigurableProductTest.xml

@@ -17,9 +17,6 @@
             <testCaseId value="MC-14770"/>
             <group value="CatalogRule"/>
             <group value="mtf_migrated"/>
-            <skip>
-                <issueId value="MC-17140"/>
-            </skip>
          </annotations>
         <before>
             <!-- Login as Admin -->

app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductAndFixedMethodTest.xml

@@ -17,9 +17,6 @@
             <testCaseId value="MC-14771"/>
             <group value="CatalogRule"/>
             <group value="mtf_migrated"/>
-            <skip>
-                <issueId value="MC-17140"/>
-            </skip>
         </annotations>
         <before>
             <!-- Login as Admin -->

app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductForNewCustomerGroupTest.xml

@@ -17,9 +17,6 @@
             <testCaseId value="MC-14772"/>
             <group value="CatalogRule"/>
             <group value="mtf_migrated"/>
-            <skip>
-                <issueId value="MC-17140"/>
-            </skip>
         </annotations>
         <before>
             <!-- Login as Admin -->

dev/tests/integration/framework/Magento/TestFramework/Event/Transaction.php

@@ -4,11 +4,11 @@
  * See COPYING.txt for license details.
  */
 
+namespace Magento\TestFramework\Event;
+
 /**
  * Database transaction events manager
  */
-namespace Magento\TestFramework\Event;
-
 class Transaction
 {
     /**
@@ -86,14 +86,29 @@ protected function _processTransactionRequests($eventName, \PHPUnit\Framework\Te
      * Start transaction and fire 'startTransaction' event
      *
      * @param \PHPUnit\Framework\TestCase $test
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     protected function _startTransaction(\PHPUnit\Framework\TestCase $test)
     {
         if (!$this->_isTransactionActive) {
             $this->_getConnection()->beginTransparentTransaction();
             $this->_isTransactionActive = true;
             try {
+                /**
+                 * Add any warning during transaction execution as a failure.
+                 */
+                set_error_handler(
+                    function ($errNo, $errStr, $errFile, $errLine) use ($test) {
+                        $errMsg = sprintf("%s: %s in %s:%s.", "Warning", $errStr, $errFile, $errLine);
+                        $test->getTestResultObject()->addError($test, new \PHPUnit\Framework\Warning($errMsg), 0);
+
+                        // Allow error to be handled by next error handler
+                        return false;
+                    },
+                    E_WARNING
+                );
                 $this->_eventManager->fireEvent('startTransaction', [$test]);
+                restore_error_handler();
             } catch (\Exception $e) {
                 $test->getTestResultObject()->addFailure(
                     $test,

dev/tests/integration/phpunit.xml.dist

@@ -78,8 +78,6 @@
     </php>
     <!-- Test listeners -->
     <listeners>
-        <listener class="Magento\TestFramework\Event\PhpUnit"/>
-        <listener class="Magento\TestFramework\ErrorLog\Listener"/>
         <listener class="Yandex\Allure\Adapter\AllureAdapter">
             <arguments>
                 <string>var/allure-results</string> <!-- XML files output directory -->
@@ -127,5 +125,8 @@
                 </array>
             </arguments>
         </listener>
+        <!-- Run after AllureAdapter to allow it to initialize properly -->
+        <listener class="Magento\TestFramework\Event\PhpUnit"/>
+        <listener class="Magento\TestFramework\ErrorLog\Listener"/>
     </listeners>
 </phpunit>