resolve conflict, link check added

Author: engcom-Echo

app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerAddProductToCartFromWishlistUsingSidebarActionGroup.xml

@@ -19,5 +19,6 @@
         <click selector="{{StorefrontCustomerWishlistSidebarSection.ProductAddToCartByName(product.name)}}" stepKey="AddProductToCartFromWishlistUsingSidebarClickAddToCartFromWishlist"/>
         <waitForElement selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="AddProductToCartFromWishlistUsingSidebarWaitForSuccessMessage"/>
         <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added {{product.name}} to your shopping cart." stepKey="AddProductToCartFromWishlistUsingSidebarSeeProductNameAddedToCartFromWishlist"/>
+        <seeLink userInput="shopping cart" stepKey="seeLinkInSuccessMsg"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php

@@ -10,8 +10,8 @@
 use Magento\Catalog\Helper\Product as ProductHelper;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Exception as ProductException;
-use Magento\Checkout\Model\Cart as CheckoutCart;
 use Magento\Checkout\Helper\Cart as CartHelper;
+use Magento\Checkout\Model\Cart as CheckoutCart;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\Response\RedirectInterface;
@@ -620,14 +620,8 @@ protected function prepareExecuteWithQuantityArray($isAjax = false)
             ->method('getName')
             ->willReturn($productName);
 
-        $this->escaperMock->expects($this->once())
-            ->method('escapeHtml')
-            ->with($productName, null)
-            ->willReturn($productName);
-
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccessMessage')
-            ->with('You added ' . $productName . ' to your shopping cart.', null)
+            ->method('addComplexSuccessMessage')
             ->willReturnSelf();
 
         $this->cartHelperMock->expects($this->once())

dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/CartTest.php

@@ -69,7 +69,8 @@ public function testAddSimpleProductToCart(): void
         $item = $this->getWishlistByCustomerId->getItemBySku(1, 'simple-1');
         $this->assertNotNull($item);
         $this->performAddToCartRequest(['item' => $item->getId(), 'qty' => 3]);
-        $message = sprintf('You added %s to your shopping cart.', $item->getName());
+        $message = sprintf("\n" . 'You added %s to your ' .
+            '<a href="http://localhost/index.php/checkout/cart/">shopping cart</a>.', $item->getName());
         $this->assertSessionMessages($this->equalTo([(string)__($message)]), MessageInterface::TYPE_SUCCESS);
         $this->assertCount(0, $this->getWishlistByCustomerId->execute(1)->getItemCollection());
         $cart = $this->cartFactory->create();