Merge remote-tracking branch 'origin/MC-33554' into 2.4.1-develop-pr25

Author: serhii-balko

app/code/Magento/Customer/Model/CustomerExtractor.php

@@ -93,13 +93,15 @@ public function extract(
             $customerData,
             \Magento\Customer\Api\Data\CustomerInterface::class
         );
-        
+
         $store = $this->storeManager->getStore();
         $storeId = $store->getId();
-        
+
         if ($isGroupIdEmpty) {
+            $groupId = isset($customerData['group_id']) ? $customerData['group_id']
+                : $this->customerGroupManagement->getDefaultGroup($storeId)->getId();
             $customerDataObject->setGroupId(
-                $this->customerGroupManagement->getDefaultGroup($storeId)->getId()
+                $groupId
             );
         }
 

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

@@ -121,14 +121,27 @@ protected function setUp(): void
         );
     }
 
-    public function testExtract()
+    /**
+     * @param int $storeId
+     * @param int $websiteId
+     * @param array $customerData
+     * @dataProvider getDataProvider
+     * @return void
+     */
+    public function testExtract(int $storeId, int $websiteId, array $customerData)
     {
-        $customerData = [
-            'firstname' => 'firstname',
-            'lastname' => 'firstname',
-            'email' => 'email.example.com',
-        ];
+        $this->initializeExpectation($storeId, $websiteId, $customerData);
 
+        $this->assertSame($this->customerData, $this->customerExtractor->extract('form-code', $this->request));
+    }
+
+    /**
+     * @param int $storeId
+     * @param int $websiteId
+     * @param array $customerData
+     */
+    private function initializeExpectation(int $storeId, int $websiteId, array $customerData): void
+    {
         $this->formFactory->expects($this->once())
             ->method('create')
             ->with('customer', 'form-code')
@@ -156,17 +169,54 @@ public function testExtract()
             ->willReturn($this->store);
         $this->store->expects($this->once())
             ->method('getId')
-            ->willReturn(1);
+            ->willReturn($storeId);
         $this->store->expects($this->once())
             ->method('getWebsiteId')
-            ->willReturn(1);
+            ->willReturn($websiteId);
         $this->customerData->expects($this->once())
             ->method('setWebsiteId')
-            ->with(1);
+            ->with($websiteId);
         $this->customerData->expects($this->once())
             ->method('setStoreId')
-            ->with(1);
+            ->with($storeId);
+    }
 
-        $this->assertSame($this->customerData, $this->customerExtractor->extract('form-code', $this->request));
+    /**
+     * @return array
+     */
+    public function getDataProvider()
+    {
+        return [
+            'extract data when group id is null' => [
+                1,
+                1,
+                [
+                    'firstname' => 'firstname-1',
+                    'lastname' => 'firstname-1',
+                    'email' => 'email-1.example.com',
+                    'group_id' => null
+                ]
+            ],
+            'extract data when group id is not null and default' => [
+                1,
+                2,
+                [
+                    'firstname' => 'firstname-2',
+                    'lastname' => 'firstname-3',
+                    'email' => 'email-2.example.com',
+                    'group_id' => 1
+                ]
+            ],
+            'extract data when group id is different from default' => [
+                1,
+                1,
+                [
+                    'firstname' => 'firstname-3',
+                    'lastname' => 'firstname-3',
+                    'email' => 'email-3.example.com',
+                    'group_id' => 2
+                ]
+            ],
+        ];
     }
 }