#29549: Scheduled price rule time zone correction - integration test fix.

Author: engcom-Foxtrot

dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/Product/PriceTest.php

@@ -21,6 +21,7 @@ class PriceTest extends \PHPUnit\Framework\TestCase
      * @var \Magento\Framework\ObjectManagerInterface
      */
     private $objectManager;
+
     /**
      * @var Rule
      */
@@ -95,15 +96,11 @@ public function testPriceForSecondStore():void
     {
         $websiteId = $this->websiteRepository->get('test')->getId();
         $simpleProduct = $this->productRepository->get('simple');
-        $simpleProduct->setPriceCalculation(true);
         $this->assertEquals('simple', $simpleProduct->getSku());
-        $this->assertFalse(
-            $this->resourceRule->getRulePrice(new \DateTime(), $websiteId, 1, $simpleProduct->getId())
-        );
         $this->indexerBuilder->reindexById($simpleProduct->getId());
         $this->assertEquals(
-            $this->resourceRule->getRulePrice(new \DateTime(), $websiteId, 1, $simpleProduct->getId()),
-            25
+            25,
+            $this->resourceRule->getRulePrice(new \DateTime(), $websiteId, 1, $simpleProduct->getId())
         );
     }
 

dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_two_stores.php

@@ -10,11 +10,23 @@
     $website->save();
 }
 $websiteId = $website->getId();
+
+$storeGroup = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Group::class);
+if (!$storeGroup->load('fixture_second_store_group', 'code')->getId()) {
+    $storeGroup->setCode('fixture_second_store_group')
+        ->setName('Fixture Second Store Group')
+        ->setWebsite($website);
+    $storeGroup->save();
+
+    $website->setDefaultGroupId($storeGroup->getId());
+    $website->save();
+}
+
 $store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
 if (!$store->load('fixture_second_store', 'code')->getId()) {
     $groupId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
         \Magento\Store\Model\StoreManagerInterface::class
-    )->getWebsite()->getDefaultGroupId();
+    )->getWebsite('test')->getDefaultGroupId();
     $store->setCode(
         'fixture_second_store'
     )->setWebsiteId(
@@ -35,7 +47,7 @@
 if (!$store->load('fixture_third_store', 'code')->getId()) {
     $groupId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
         \Magento\Store\Model\StoreManagerInterface::class
-    )->getWebsite()->getDefaultGroupId();
+    )->getWebsite('test')->getDefaultGroupId();
     $store->setCode(
         'fixture_third_store'
     )->setWebsiteId(

dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_two_stores_rollback.php

@@ -15,6 +15,14 @@
 if ($websiteId) {
     $website->delete();
 }
+
+$storeGroup = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Group::class);
+/** @var $storeGroup \Magento\Store\Model\Group */
+$storeGroupId = $storeGroup->load('fixture_second_store_group', 'code')->getId();
+if ($storeGroupId) {
+    $storeGroup->delete();
+}
+
 $store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
 if ($store->load('fixture_second_store', 'code')->getId()) {
     $store->delete();