MC-40559 : Stabilize Integration Tests

    - Fix Static tests

Author: jcuerdo

app/code/Magento/Catalog/Block/Product/ListProduct.php

@@ -136,7 +136,13 @@ public function getLayer()
      */
     public function getLoadedProductCollection()
     {
-        return $this->_getProductCollection();
+        $collection = $this->_getProductCollection();
+        $categoryId = $this->getLayer()->getCurrentCategory()->getId();
+        foreach ($collection as $product) {
+            $product->setData('category_id', $categoryId);
+        }
+
+        return $collection;
     }
 
     /**

app/code/Magento/Catalog/Model/Product.php

@@ -725,9 +725,14 @@ public function getIdBySku($sku)
      */
     public function getCategoryId()
     {
+        if ($this->hasData('category_id')) {
+            return $this->getData('category_id');
+        }
         $category = $this->_registry->registry('current_category');
-        if ($category && in_array($category->getId(), $this->getCategoryIds())) {
-            return $category->getId();
+        $categoryId = $category ? $category->getId() : null;
+        if ($categoryId && in_array($categoryId, $this->getCategoryIds())) {
+            $this->setData('category_id', $categoryId);
+            return $categoryId;
         }
         return false;
     }

app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php

@@ -10,6 +10,9 @@
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Email\Sender\CreditmemoSender;
 
+/**
+ * Controller for save creditmemo
+ */
 class Save extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
@@ -54,6 +57,7 @@ public function __construct(
 
     /**
      * Save creditmemo
+     *
      * We can save only new creditmemo. Existing creditmemos are not editable
      *
      * @return \Magento\Backend\Model\View\Result\Redirect|\Magento\Backend\Model\View\Result\Forward

app/code/Magento/Wishlist/Model/LocaleQuantityProcessor.php

@@ -7,6 +7,8 @@
 namespace Magento\Wishlist\Model;
 
 /**
+ * Class LocaleQuantityProcessor
+ *
  * @api
  * @since 100.0.2
  */

dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php

@@ -121,12 +121,18 @@ public function testUnsubscribeSubscribe(): void
         $subscriber = $this->subscriberFactory->create();
         $this->assertSame($subscriber, $subscriber->loadByCustomerId(1));
         $this->assertEquals($subscriber, $subscriber->unsubscribe());
-        $this->assertStringContainsString('You have been unsubscribed from the newsletter.', $this->getFilteredRawMessage($this->transportBuilder));
+        $this->assertStringContainsString(
+            'You have been unsubscribed from the newsletter.',
+            $this->getFilteredRawMessage($this->transportBuilder)
+        );
         $this->assertEquals(Subscriber::STATUS_UNSUBSCRIBED, $subscriber->getSubscriberStatus());
         // Subscribe and verify
         $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $subscriber->subscribe('customer@example.com'));
         $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $subscriber->getSubscriberStatus());
-        $this->assertStringContainsString('You have been successfully subscribed to our newsletter.', $this->getFilteredRawMessage($this->transportBuilder));
+        $this->assertStringContainsString(
+            'You have been successfully subscribed to our newsletter.',
+            $this->getFilteredRawMessage($this->transportBuilder)
+        );
     }
 
     /**
@@ -151,11 +157,17 @@ public function testUnsubscribeSubscribeByCustomerId(): void
         // Unsubscribe and verify
         $this->assertSame($subscriber, $subscriber->unsubscribeCustomerById(1));
         $this->assertEquals(Subscriber::STATUS_UNSUBSCRIBED, $subscriber->getSubscriberStatus());
-        $this->assertStringContainsString('You have been unsubscribed from the newsletter.', $this->getFilteredRawMessage($this->transportBuilder));
+        $this->assertStringContainsString(
+            'You have been unsubscribed from the newsletter.',
+            $this->getFilteredRawMessage($this->transportBuilder)
+        );
         // Subscribe and verify
         $this->assertSame($subscriber, $subscriber->subscribeCustomerById(1));
         $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $subscriber->getSubscriberStatus());
-        $this->assertStringContainsString('You have been successfully subscribed to our newsletter.', $this->getFilteredRawMessage($this->transportBuilder));
+        $this->assertStringContainsString(
+            'You have been successfully subscribed to our newsletter.',
+            $this->getFilteredRawMessage($this->transportBuilder)
+        );
     }
 
     /**
@@ -172,7 +184,10 @@ public function testConfirm(): void
         $subscriber->subscribe($customerEmail);
         $subscriber->loadByEmail($customerEmail);
         $subscriber->confirm($subscriber->getSubscriberConfirmCode());
-        $this->assertStringContainsString('You have been successfully subscribed to our newsletter.', $this->getFilteredRawMessage($this->transportBuilder));
+        $this->assertStringContainsString(
+            'You have been successfully subscribed to our newsletter.',
+            $this->getFilteredRawMessage($this->transportBuilder)
+        );
     }
 
     /**