MC-31251: Wishlist configurations enabled/disabled

Author: dimonovp

dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php

@@ -11,6 +11,7 @@
 use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\TestFramework\TestCase\AbstractController;
+use Magento\Framework\Escaper;
 
 /**
  * Load customer data test class.
@@ -26,6 +27,9 @@ class LoadTest extends AbstractController
     /** @var SerializerInterface */
     private $json;
 
+    /** @var Escaper */
+    private $escaper;
+
     /**
      * @inheritdoc
      */
@@ -35,6 +39,7 @@ protected function setUp()
 
         $this->customerSession = $this->_objectManager->get(Session::class);
         $this->json = $this->_objectManager->get(SerializerInterface::class);
+        $this->escaper = $this->_objectManager->get(Escaper::class);
     }
 
     /**
@@ -52,9 +57,8 @@ protected function tearDown()
      */
     public function testLoadInvalidSection(): void
     {
-        $expected = [
-            'message' => 'The "section<invalid" section source isn't supported.',
-        ];
+        $message = $this->escaper->escapeHtml('The "section<invalid" section source isn\'t supported.');
+        $expected = ['message' => $message];
         $this->dispatch(
             '/customer/section/load/?sections=section<invalid&force_new_section_timestamp=false&_=147066166394'
         );

dev/tests/integration/testsuite/Magento/Wishlist/Block/Catalog/Product/ProductList/Item/AddTo/WishlistTest.php

@@ -14,7 +14,7 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * Test button add to wish list link on category page.
+ * Checks add to wishlist button on category page.
  *
  * @magentoAppArea frontend
  * @magentoDbIsolation enabled
@@ -40,7 +40,7 @@ protected function setUp()
         $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
         $this->productRepository->cleanCache();
         $this->block = $this->objectManager->get(LayoutInterface::class)
-            ->addBlock(Wishlist::class)->setTemplate('Magento_Wishlist::catalog/product/list/addto/wishlist.phtml');
+            ->createBlock(Wishlist::class)->setTemplate('Magento_Wishlist::catalog/product/list/addto/wishlist.phtml');
     }
 
     /**
@@ -51,7 +51,8 @@ protected function setUp()
     public function testAddToWishListVisible(): void
     {
         $product = $this->productRepository->get('simple2');
-        $this->assertContains('Add to Wish List', strip_tags($this->block->setProduct($product)->toHtml()));
+        $html = $this->block->setProduct($product)->toHtml();
+        $this->assertEquals('Add to Wish List', trim(strip_tags($html)));
     }
 
     /**

dev/tests/integration/testsuite/Magento/Wishlist/Block/Catalog/Product/View/AddTo/WishlistTest.php

@@ -13,17 +13,21 @@
 use Magento\Framework\Registry;
 use Magento\Framework\View\LayoutInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Helper\Xpath;
 use PHPUnit\Framework\TestCase;
 
 /**
- * Test button add to wish list link on product page.
+ * Checks add to wishlist button on product page.
  *
  * @magentoAppArea frontend
  * @magentoDbIsolation enabled
  * @magentoAppIsolation disabled
  */
 class WishlistTest extends TestCase
 {
+    private const ADD_TO_WISHLIST_XPATH = "//a[@data-action='add-to-wishlist']"
+    . "/span[contains(text(), 'Add to Wish List')]";
+
     /** @var ObjectManagerInterface */
     private $objectManager;
 
@@ -46,7 +50,7 @@ protected function setUp()
         $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
         $this->productRepository->cleanCache();
         $this->block = $this->objectManager->get(LayoutInterface::class)
-            ->addBlock(Wishlist::class)->setTemplate('Magento_Wishlist::catalog/product/view/addto/wishlist.phtml');
+            ->createBlock(Wishlist::class)->setTemplate('Magento_Wishlist::catalog/product/view/addto/wishlist.phtml');
     }
 
     /**
@@ -68,7 +72,10 @@ public function testAddToWishListVisible(): void
     {
         $product = $this->productRepository->get('simple2');
         $this->registerProduct($product);
-        $this->assertContains('Add to Wish List', strip_tags($this->block->toHtml()));
+        $this->assertEquals(
+            1,
+            Xpath::getElementsCountForXpath(self::ADD_TO_WISHLIST_XPATH, $this->block->toHtml())
+        );
     }
 
     /**
@@ -81,7 +88,10 @@ public function testAddToWishListNotVisible(): void
     {
         $product = $this->productRepository->get('simple2');
         $this->registerProduct($product);
-        $this->assertNotContains('Add to Wish List', strip_tags($this->block->toHtml()));
+        $this->assertEquals(
+            0,
+            Xpath::getElementsCountForXpath(self::ADD_TO_WISHLIST_XPATH, $this->block->toHtml())
+        );
     }
 
     /**

dev/tests/integration/testsuite/Magento/Wishlist/Block/Customer/SidebarTest.php

@@ -40,9 +40,9 @@ protected function setUp()
         $this->objectManager = Bootstrap::getObjectManager();
         $productMetadataInterface = $this->objectManager->get(ProductMetadataInterface::class);
         if ($productMetadataInterface->getEdition() !== ProductMetadata::EDITION_NAME) {
-            $this->markTestSkipped('Skipped, because this logic is rewritten on Enterprise edition.');
+            $this->markTestSkipped('Skipped, because this logic is rewritten on EE.');
         }
-        $this->page = $this->objectManager->get(Page::class);
+        $this->page = $this->objectManager->create(Page::class);
     }
 
     /**

dev/tests/integration/testsuite/Magento/Wishlist/Block/Customer/WishlistTest.php

@@ -23,7 +23,6 @@
  */
 class WishlistTest extends TestCase
 {
-
     private const ITEMS_COUNT_XPATH = "//div[contains(@class, 'pager')]//span[contains(@class, 'toolbar-number')"
     . " and contains(text(), '%s Item')]";
 
@@ -44,7 +43,7 @@ protected function setUp()
         parent::setUp();
 
         $this->objectManager = Bootstrap::getObjectManager();
-        $this->page = $this->objectManager->get(Page::class);
+        $this->page = $this->objectManager->create(Page::class);
         $this->customerSession = $this->objectManager->get(Session::class);
     }
 

dev/tests/integration/testsuite/Magento/Wishlist/Block/LinkTest.php

@@ -33,7 +33,7 @@ class LinkTest extends TestCase
     protected function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
-        $this->block = $this->objectManager->get(LayoutInterface::class)->addBlock(Link::class);
+        $this->block = $this->objectManager->get(LayoutInterface::class)->createBlock(Link::class);
     }
 
     /**

dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_product_qty_three.php

@@ -6,12 +6,12 @@
 declare(strict_types=1);
 
 use Magento\Wishlist\Model\WishlistFactory;
-use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Serialize\SerializerInterface;
 
 require __DIR__ . '/../../../Magento/Customer/_files/customer.php';
 require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
 
-$json = $objectManager->get(Json::class);
+$json = $objectManager->get(SerializerInterface::class);
 $wishlistFactory = $objectManager->get(WishlistFactory::class);
 $wishlist = $wishlistFactory->create();
 $wishlist->loadByCustomerId($customer->getId(), true);