Merge remote-tracking branch 'origin/MAGETWO-42728' into BUGS

Author: slavvka

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

@@ -122,17 +122,15 @@ public function getData()
         /** @var Customer $customer */
         foreach ($items as $customer) {
             $result['customer'] = $customer->getData();
+            unset($result['address']);
 
-            $addresses = [];
             /** @var Address $address */
             foreach ($customer->getAddresses() as $address) {
                 $addressId = $address->getId();
                 $address->load($addressId);
-                $addresses[$addressId] = $address->getData();
-                $this->prepareAddressData($addressId, $addresses, $result['customer']);
+                $result['address'][$addressId] = $address->getData();
+                $this->prepareAddressData($addressId, $result['address'], $result['customer']);
             }
-            $result['address'] = $addresses;
-
             $this->loadedData[$customer->getId()] = $result;
         }
 

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

@@ -246,4 +246,90 @@ function ($origName) {
 
         return [$attributeMock];
     }
+
+    public function testGetData()
+    {
+        $customer = $this->getMockBuilder('Magento\Customer\Model\Customer')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $address = $this->getMockBuilder('Magento\Customer\Model\Address')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $collectionMock = $this->getMockBuilder('Magento\Customer\Model\Resource\Customer\Collection')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $collectionMock->expects($this->once())
+            ->method('addAttributeToSelect')
+            ->with('*');
+
+        $this->customerCollectionFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($collectionMock);
+
+        $collectionMock->expects($this->once())
+            ->method('getItems')
+            ->willReturn([$customer]);
+        $customer->expects($this->once())
+            ->method('getData')
+            ->willReturn([
+                'email' => 'test@test.ua',
+                'default_billing' => 2,
+                'default_shipping' => 2,
+            ]);
+        $customer->expects($this->once())
+            ->method('getAddresses')
+            ->willReturn([$address]);
+        $address->expects($this->atLeastOnce())
+            ->method('getId')
+            ->willReturn(2);
+        $address->expects($this->once())
+            ->method('load')
+            ->with(2)
+            ->willReturnSelf();
+        $address->expects($this->once())
+            ->method('getData')
+            ->willReturn([
+                'firstname' => 'firstname',
+                'lastname' => 'lastname',
+                'street' => "street\nstreet",
+            ]);
+
+        $helper = new ObjectManager($this);
+        $dataProvider = $helper->getObject(
+            '\Magento\Customer\Model\Customer\DataProvider',
+            [
+                'name' => 'test-name',
+                'primaryFieldName' => 'primary-field-name',
+                'requestFieldName' => 'request-field-name',
+                'eavValidationRules' => $this->eavValidationRulesMock,
+                'customerCollectionFactory' => $this->customerCollectionFactoryMock,
+                'eavConfig' => $this->getEavConfigMock()
+            ]
+        );
+        $this->assertEquals(
+            [
+                '' => [
+                    'customer' => [
+                        'email' => 'test@test.ua',
+                        'default_billing' => 2,
+                        'default_shipping' => 2,
+                    ],
+                    'address' => [
+                        2 => [
+                            'firstname' => 'firstname',
+                            'lastname' => 'lastname',
+                            'street' => [
+                                'street',
+                                'street',
+                            ],
+                            'default_billing' => 2,
+                            'default_shipping' => 2,
+                        ]
+                    ]
+                ]
+            ],
+            $dataProvider->getData()
+        );
+    }
 }