MC-22569: Storefront: Check special/tier/group/rule/option price for product

Author: IvanPletnyov

dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListProduct/CheckProductPriceTest.php

@@ -50,8 +50,8 @@ class CheckProductPriceTest extends TestCase
     protected function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
-        $this->pageFactory = $this->objectManager->create(PageFactory::class);
-        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $this->pageFactory = $this->objectManager->get(PageFactory::class);
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
         $this->customerSession = $this->objectManager->create(Session::class);
         parent::setUp();
     }
@@ -140,10 +140,7 @@ public function testCheckFixedTierPriceForLoggedUser(): void
     {
         $priceHtml = $this->getProductPriceHtml('simple_product');
         $this->assertFinalPrice($priceHtml, 50.00);
-        $this->assertNotRegExp(
-            '/\$10/',
-            $priceHtml
-        );
+        $this->assertNotRegExp('/\$10/', $priceHtml);
         $this->customerSession->setCustomerId(1);
         try {
             $priceHtml = $this->getProductPriceHtml('simple_product');
@@ -299,7 +296,7 @@ private function getProductPriceHtml(string $sku): string
      */
     private function getListProductBlock(): ListProduct
     {
-        $page = $this->pageFactory->create(PageFactory::class);
+        $page = $this->pageFactory->create();
         $page->addHandle([
             'default',
             'catalog_category_view',

dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_fixed_tier_price_for_logged_user.php

@@ -7,7 +7,6 @@
 
 use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
 use Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory;
-use Magento\Customer\Model\Group;
 use Magento\Store\Api\WebsiteRepositoryInterface;
 
 require __DIR__ . '/product_simple_without_price_configurations.php';

dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_without_price_configurations.php

@@ -12,11 +12,15 @@
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Catalog\Model\Product\Type;
 use Magento\Catalog\Model\Product\Visibility;
+use Magento\Store\Model\WebsiteRepository;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
 
 /** @var ObjectManager $objectManager */
 $objectManager = Bootstrap::getObjectManager();
+/** @var WebsiteRepository $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepository::class);
+$baseWebsite = $websiteRepository->get('base');
 /** @var ProductInterface $productModel */
 $productModel = $objectManager->get(ProductInterface::class);
 /** @var ProductInterfaceFactory $productFactory */
@@ -28,7 +32,7 @@
         'data' => [
             'type_id' => Type::TYPE_SIMPLE,
             'attribute_set_id' => $productModel->getDefaultAttributeSetid(),
-            'website_ids' => [1],
+            'website_ids' => [$baseWebsite->getId()],
             'name' => 'Simple product',
             'sku' => 'simple_product',
             'price' => 50,

dev/tests/integration/testsuite/Magento/CatalogRule/_files/rule_adjust_final_price_to_discount_value_not_logged_user.php

@@ -10,9 +10,13 @@
 use Magento\CatalogRule\Api\Data\RuleInterfaceFactory;
 use Magento\CatalogRule\Model\Indexer\IndexBuilder;
 use Magento\Customer\Model\Group;
+use Magento\Store\Model\WebsiteRepository;
 use Magento\TestFramework\Helper\Bootstrap;
 
 $objectManager = Bootstrap::getObjectManager();
+/** @var WebsiteRepository $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepository::class);
+$baseWebsite = $websiteRepository->get('base');
 /** @var IndexBuilder $indexBuilder */
 $indexBuilder = $objectManager->get(IndexBuilder::class);
 /** @var CatalogRuleRepositoryInterface $catalogRuleRepository */
@@ -26,7 +30,7 @@
             RuleInterface::NAME => 'Test Catalog Rule for not logged user',
             'customer_group_ids' => Group::NOT_LOGGED_IN_ID,
             RuleInterface::DISCOUNT_AMOUNT => 10,
-            'website_ids' => [1],
+            'website_ids' => [$baseWebsite->getId()],
             RuleInterface::SIMPLE_ACTION => 'to_fixed',
             RuleInterface::STOP_RULES_PROCESSING => false,
             RuleInterface::SORT_ORDER => 0,

dev/tests/integration/testsuite/Magento/CatalogRule/_files/rule_adjust_final_price_to_this_percentage_not_logged_user.php

@@ -10,9 +10,13 @@
 use Magento\CatalogRule\Api\Data\RuleInterfaceFactory;
 use Magento\CatalogRule\Model\Indexer\IndexBuilder;
 use Magento\Customer\Model\Group;
+use Magento\Store\Model\WebsiteRepository;
 use Magento\TestFramework\Helper\Bootstrap;
 
 $objectManager = Bootstrap::getObjectManager();
+/** @var WebsiteRepository $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepository::class);
+$baseWebsite = $websiteRepository->get('base');
 /** @var IndexBuilder $indexBuilder */
 $indexBuilder = $objectManager->get(IndexBuilder::class);
 /** @var CatalogRuleRepositoryInterface $catalogRuleRepository */
@@ -26,7 +30,7 @@
             RuleInterface::NAME => 'Test Catalog Rule for not logged user',
             'customer_group_ids' => Group::NOT_LOGGED_IN_ID,
             RuleInterface::DISCOUNT_AMOUNT => 10,
-            'website_ids' => [1],
+            'website_ids' => [$baseWebsite->getId()],
             RuleInterface::SIMPLE_ACTION => 'to_percent',
             RuleInterface::STOP_RULES_PROCESSING => false,
             RuleInterface::SORT_ORDER => 0,

dev/tests/integration/testsuite/Magento/CatalogRule/_files/rule_apply_as_fixed_amount_not_logged_user.php

@@ -10,9 +10,13 @@
 use Magento\CatalogRule\Api\Data\RuleInterfaceFactory;
 use Magento\CatalogRule\Model\Indexer\IndexBuilder;
 use Magento\Customer\Model\Group;
+use Magento\Store\Model\WebsiteRepository;
 use Magento\TestFramework\Helper\Bootstrap;
 
 $objectManager = Bootstrap::getObjectManager();
+/** @var WebsiteRepository $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepository::class);
+$baseWebsite = $websiteRepository->get('base');
 /** @var IndexBuilder $indexBuilder */
 $indexBuilder = $objectManager->get(IndexBuilder::class);
 /** @var CatalogRuleRepositoryInterface $catalogRuleRepository */
@@ -26,7 +30,7 @@
             RuleInterface::NAME => 'Test Catalog Rule for not logged user',
             'customer_group_ids' => Group::NOT_LOGGED_IN_ID,
             RuleInterface::DISCOUNT_AMOUNT => 10,
-            'website_ids' => [1],
+            'website_ids' => [$baseWebsite->getId()],
             RuleInterface::SIMPLE_ACTION => 'by_fixed',
             RuleInterface::STOP_RULES_PROCESSING => false,
             RuleInterface::SORT_ORDER => 0,

dev/tests/integration/testsuite/Magento/CatalogRule/_files/rule_apply_as_percentage_of_original_not_logged_user.php

@@ -10,9 +10,13 @@
 use Magento\CatalogRule\Api\Data\RuleInterfaceFactory;
 use Magento\CatalogRule\Model\Indexer\IndexBuilder;
 use Magento\Customer\Model\Group;
+use Magento\Store\Model\WebsiteRepository;
 use Magento\TestFramework\Helper\Bootstrap;
 
 $objectManager = Bootstrap::getObjectManager();
+/** @var WebsiteRepository $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepository::class);
+$baseWebsite = $websiteRepository->get('base');
 /** @var IndexBuilder $indexBuilder */
 $indexBuilder = $objectManager->get(IndexBuilder::class);
 /** @var CatalogRuleRepositoryInterface $catalogRuleRepository */
@@ -26,7 +30,7 @@
             RuleInterface::NAME => 'Test Catalog Rule for not logged user',
             'customer_group_ids' => Group::NOT_LOGGED_IN_ID,
             RuleInterface::DISCOUNT_AMOUNT => 10,
-            'website_ids' => [1],
+            'website_ids' => [$baseWebsite->getId()],
             RuleInterface::SIMPLE_ACTION => 'by_percent',
             RuleInterface::STOP_RULES_PROCESSING => false,
             RuleInterface::SORT_ORDER => 0,