ACP2E-341::Product is not getting added in wishlist from product list page and product view page when customer confirms account from confirmation email - Fixed Automation test & Modify Back URL

Author: rimple-saini

app/code/Magento/Wishlist/Plugin/SaveWishlistDataAndAddReferenceKeyToBackUrl.php

@@ -74,7 +74,7 @@ public function beforeNewAccount(
     ): array {
         if (($this->customerSession->getBeforeWishlistRequest() != null)
             && ($customer->getConfirmation() != null)
-            && (strpos($backUrl, 'wishlist/index/add') !== false)
+            && ($backUrl !== null && strpos($backUrl, 'wishlist/index/add') !== false)
         ) {
             $token = $this->dataSerializer->serialize($this->customerSession->getBeforeWishlistRequest());
             $query = [];

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

@@ -185,9 +185,9 @@ public function testCreateCustomerWithEmailConfirmationAfterAddToWishlist(): voi
     {
         $product = $this->productRepository->get('simple');
         $data = [];
-        $data['product'] = (int) $product->getId();
+        $data['product'] = (int)$product->getId();
         $this->customerSession->setBeforeWishlistRequest($data);
-        $email = 'test_example_new31@email.com';
+        $email = 'test_example_new@email.com';
         $this->fillRequestWithCustomerData($email);
         $this->dispatch('customer/account/createPost');
         $this->assertRedirect($this->stringContains('customer/account/index'));
@@ -234,15 +234,15 @@ public function testAddToWishlistOnCustomerConfirmation(): void
         $this->prepareReferer();
         $product = $this->productRepository->get('simple');
         $data = [];
-        $data['product'] = (int) $product->getId();
+        $data['product'] = (int)$product->getId();
         $token = $this->dataSerializer->serialize($data);//Save into Cache
         $customer = $this->customerRepository->get('unconfirmedcustomer@example.com');
         $customer->setConfirmation(null);
         $this->customerRepository->save($customer);
         $this->assertEquals(null, $customer->getConfirmation());
-        $this->customerSession->setCustomerId((int) $customer->getId());
+        $this->customerSession->setCustomerId((int)$customer->getId());
         $this->performAddToWishListRequest(['token' => $token]);
-        $this->assertSuccess((int) $customer->getId(), 1, $product->getName());
+        $this->assertSuccess((int)$customer->getId(), 1, $product->getName());
     }
 
     /**