MAGETWO-46014: delayed error messages

Author: slavvka

dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php

@@ -44,7 +44,10 @@ public function testAddAction()
             )
         );
 
-        $this->assertSessionMessages($this->contains('Simple Product 1 Name'), MessageInterface::TYPE_SUCCESS);
+        $this->assertSessionMessages(
+            $this->equalTo(['You added product Simple Product 1 Name to the comparison list.']),
+            MessageInterface::TYPE_SUCCESS
+        );
 
         $this->assertRedirect();
 
@@ -68,7 +71,10 @@ public function testRemoveAction()
         $product = $this->productRepository->get('simple_product_2');
         $this->dispatch('catalog/product_compare/remove/product/' . $product->getEntityId());
 
-        $this->assertSessionMessages($this->contains('Simple Product 2 Name'), MessageInterface::TYPE_SUCCESS);
+        $this->assertSessionMessages(
+            $this->equalTo(['You removed product Simple Product 2 Name from the comparison list.']),
+            MessageInterface::TYPE_SUCCESS
+        );
 
         $this->assertRedirect();
         $restProduct = $this->productRepository->get('simple_product_1');
@@ -82,7 +88,10 @@ public function testRemoveActionWithSession()
         $this->dispatch('catalog/product_compare/remove/product/' . $product->getEntityId());
         $secondProduct = $this->productRepository->get('simple_product_2');
 
-        $this->assertSessionMessages($this->contains('Simple Product 1 Name'), MessageInterface::TYPE_SUCCESS);
+        $this->assertSessionMessages(
+            $this->equalTo(['You removed product Simple Product 1 Name from the comparison list.']),
+            MessageInterface::TYPE_SUCCESS
+        );
 
         $this->assertRedirect();
 
@@ -122,7 +131,7 @@ public function testClearAction()
         $this->dispatch('catalog/product_compare/clear');
 
         $this->assertSessionMessages(
-            $this->contains('You cleared the comparison list.'), 
+            $this->equalTo(['You cleared the comparison list.']),
             MessageInterface::TYPE_SUCCESS
         );
 
@@ -141,10 +150,9 @@ public function testRemoveActionProductNameXss()
         $this->dispatch('catalog/product_compare/remove/product/' . $product->getEntityId() . '?nocookie=1');
 
         $this->assertSessionMessages(
-            $this->logicalNot($this->contains('<script>alert("xss");</script>'))
-        );
-        $this->assertSessionMessages(
-            $this->contains('&lt;script&gt;alert(&quot;xss&quot;);&lt;/script&gt;'),
+            $this->equalTo(
+                ['You removed product &lt;script&gt;alert(&quot;xss&quot;);&lt;/script&gt; from the comparison list.']
+            ),
             MessageInterface::TYPE_SUCCESS
         );
     }

dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php

@@ -83,29 +83,26 @@ public function testItemColumnBlock()
      */
     public function testAddActionProductNameXss()
     {
-        $this->dispatch('wishlist/index/add/product/1?nocookie=1');
-        $messages = $this->_messages->getMessages()->getItems();
-        $isProductNamePresent = false;
+        /** @var \Magento\Framework\Data\Form\FormKey $formKey */
+        $formKey = $this->_objectManager->get('Magento\Framework\Data\Form\FormKey');
+        $this->getRequest()->setPostValue([
+            'form_key' => $formKey->getFormKey(),
+        ]);
 
-        /** @var InterpretationStrategyInterface $interpretationStrategy */
-        $interpretationStrategy = $this->_objectManager->create(
-            'Magento\Framework\View\Element\Message\InterpretationStrategyInterface'
+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create('Magento\Catalog\Api\ProductRepositoryInterface');
+
+        $product = $productRepository->get('product-with-xss');
+
+        $this->dispatch('wishlist/index/add/product/' . $product->getId() . '?nocookie=1');
+
+        $this->assertSessionMessages(
+            $this->equalTo(
+                ['You removed product <script>alert("xss");</script> from the comparison list.']
+            ),
+            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
         );
-        foreach ($messages as $message) {
-            if (
-                strpos(
-                    $interpretationStrategy->interpret($message),
-                    '<script>alert("xss");</script>'
-                ) !== false
-            ) {
-                $isProductNamePresent = true;
-            }
-            $this->assertNotContains(
-                '<script>alert("xss");</script>',
-                $interpretationStrategy->interpret($message)
-            );
-        }
-        $this->assertTrue($isProductNamePresent, 'Product name was not found in session messages');
     }
 
     /**