ACP2E-2070: Wrong X-Magento-Vary after logging-in to the customer account

Author: o-iegorov

app/code/Magento/Customer/Test/Unit/Model/SessionTest.php

@@ -9,6 +9,7 @@
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\Context as CustomerContext;
 use Magento\Customer\Model\Customer;
 use Magento\Customer\Model\CustomerFactory;
 use Magento\Customer\Model\ResourceModel\Customer as ResourceCustomer;
@@ -118,6 +119,9 @@ public function testSetCustomerAsLoggedIn(): void
     {
         $customer = $this->createMock(Customer::class);
         $customerDto = $this->getMockForAbstractClass(CustomerInterface::class);
+        $customer->expects($this->any())
+            ->method('getGroupId')
+            ->willReturn(1);
         $customer->expects($this->any())
             ->method('getDataModel')
             ->willReturn($customerDto);
@@ -129,6 +133,10 @@ public function testSetCustomerAsLoggedIn(): void
                 ['customer_data_object_login', ['customer' => $customerDto]]
             );
 
+        $this->_httpContextMock->expects($this->once())
+            ->method('setValue')
+            ->with(CustomerContext::CONTEXT_GROUP, self::callback(fn($value): bool => $value === '1'), 0);
+
         $_SESSION = [];
         $this->_model->setCustomerAsLoggedIn($customer);
         $this->assertSame($customer, $this->_model->getCustomer());
@@ -348,4 +356,17 @@ public function testGetCustomerForRegisteredUser(): void
 
         $this->assertSame($customerMock, $this->_model->getCustomer());
     }
+
+    public function testSetCustomer(): void
+    {
+        $customer = $this->createMock(Customer::class);
+        $customer->expects($this->any())
+            ->method('getGroupId')
+            ->willReturn(1);
+        $this->_httpContextMock->expects($this->once())
+            ->method('setValue')
+            ->with(CustomerContext::CONTEXT_GROUP, self::callback(fn($value): bool => $value === '1'), 0);
+
+        $this->_model->setCustomer($customer);
+    }
 }