Merge remote-tracking branch 'vz/MC-33203' into MC-33203

Author: VladimirZaets

app/code/Magento/AdminAnalytics/Test/Unit/Condition/CanViewNotificationTest.php

@@ -11,28 +11,27 @@
 use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\App\CacheInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
-/**
- * Class CanViewNotificationTest
- */
-class CanViewNotificationTest extends \PHPUnit\Framework\TestCase
+class CanViewNotificationTest extends TestCase
 {
     /** @var CanViewNotification */
     private $canViewNotification;
 
-    /** @var  Logger|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  Logger|MockObject */
     private $viewerLoggerMock;
 
-    /** @var ProductMetadataInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var ProductMetadataInterface|MockObject */
     private $productMetadataMock;
 
-    /** @var  Log|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  Log|MockObject */
     private $logMock;
 
-    /** @var  $cacheStorageMock \PHPUnit_Framework_MockObject_MockObject|CacheInterface */
+    /** @var  $cacheStorageMock MockObject|CacheInterface */
     private $cacheStorageMock;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->cacheStorageMock = $this->getMockBuilder(CacheInterface::class)
             ->getMockForAbstractClass();

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

@@ -28,6 +28,7 @@
                 <field key="firstname">John1</field>
                 <field key="lastname">Doe1</field>
             </createData>
+            <magentoCron stepKey="runCronIndex" groups="index"/>
         </before>
         <after>
             <!-- Reset admin order filter -->

app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml

@@ -30,6 +30,7 @@
             <createData entity="Simple_US_Customer" stepKey="customer"/>
             <createData entity="BraintreeConfig" stepKey="BraintreeConfigurationData"/>
             <createData entity="CustomBraintreeConfigurationData" stepKey="CustomBraintreeConfigurationData"/>
+            <magentoCron stepKey="runCronIndex" groups="index"/>
         </before>
 
         <after>

app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest.xml

@@ -33,6 +33,7 @@
 
             <!--Create New Customer-->
             <createData stepKey="createCustomer" entity="Simple_US_Customer"/>
+            <magentoCron stepKey="runCronIndex" groups="index"/>
         </before>
 
 

app/code/Magento/Braintree/Test/Mftf/Test/CretateAdminOrderWithOnlinePaymentIncludingTaxAndDiscountTest.xml

@@ -43,6 +43,8 @@
                 <field key="group_id">3</field>
             </createData>
 
+            <magentoCron stepKey="runCronIndex" groups="index"/>
+
             <!--Login as Admin User-->
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>

app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiDynamicBundleProductActionGroup.xml

@@ -61,5 +61,7 @@
             <requiredEntity createDataKey="createBundleOption1_2"/>
             <requiredEntity createDataKey="simpleProduct4"/>
         </createData>
+
+        <magentoCron stepKey="runCronIndex" groups="index"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiDynamicBundleProductAllOptionTypesActionGroup.xml

@@ -70,5 +70,6 @@
             <requiredEntity createDataKey="createBundleRadioButtonsOption"/>
             <requiredEntity createDataKey="simpleProduct2"/>
         </createData>
+        <magentoCron stepKey="runCronIndex" groups="index"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiFixedBundleProductActionGroup.xml

@@ -61,5 +61,6 @@
             <requiredEntity createDataKey="createBundleOption1_2"/>
             <requiredEntity createDataKey="simpleProduct4"/>
         </createData>
+        <magentoCron stepKey="runCronIndex" groups="index"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleItemsTest.xml

@@ -25,6 +25,7 @@
             <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
             <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
             <createData entity="SimpleProduct2" stepKey="simpleProduct3"/>
+            <magentoCron stepKey="runCronIndex" groups="index"/>
             <!--Admin login-->
             <actionGroup stepKey="loginToAdminPanel" ref="AdminLoginActionGroup"/>
         </before>

app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleProductToCartFromWishListPageTest.xml

@@ -50,6 +50,8 @@
                 <requiredEntity createDataKey="bundleOption"/>
                 <requiredEntity createDataKey="createSimpleProduct2"/>
             </createData>
+            <magentoCron stepKey="runCronIndex" groups="index"/>
+
             <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="goToProductEditPage">
                 <argument name="productId" value="$$createProduct.id$$"/>
             </actionGroup>