From 59b446956348c8fdb421a1c61174cee018122fda Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Fri, 18 Dec 2020 15:13:00 +0200
Subject: [PATCH] MC-39765: No such entity with addressId, occurs randomly on
 visitors browser. System Log Generated

---
 .../Test/Unit/Observer/EmulateCustomerObserverTest.php    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Persistent/Test/Unit/Observer/EmulateCustomerObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Observer/EmulateCustomerObserverTest.php
index 6c35ade65451b..2df36577b2931 100644
--- a/app/code/Magento/Persistent/Test/Unit/Observer/EmulateCustomerObserverTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Observer/EmulateCustomerObserverTest.php
@@ -131,14 +131,14 @@ public function testExecuteWhenSessionPersistAndCustomerNotLoggedIn()
         $customerMock
             ->expects($this->once())
             ->method('getDefaultShipping')
-            ->willReturn('shippingId');
+            ->willReturn(12345);
         $customerMock
             ->expects($this->once())
             ->method('getDefaultBilling')
-            ->willReturn('billingId');
+            ->willReturn(12346);
         $valueMap = [
-            ['shippingId', $defaultShippingAddressMock],
-            ['billingId', $defaultBillingAddressMock]
+            [12345, $defaultShippingAddressMock],
+            [12346, $defaultBillingAddressMock]
         ];
         $this->addressRepositoryMock->expects($this->any())->method('getById')->willReturnMap($valueMap);
         $this->customerSessionMock