Merge branch 'MAGETWO-28011' of github.corp.ebay.com:magento-firedrakes/magento2ce into MAGETWO-28011

Author: Michael Logvin

app/code/Magento/Customer/Api/Data/CustomerInterface.php

@@ -277,15 +277,15 @@ public function setSuffix($suffix);
      * Get gender
      *
      * @api
-     * @return string|null
+     * @return int|null
      */
     public function getGender();
 
     /**
      * Set gender
      *
      * @api
-     * @param string $gender
+     * @param int $gender
      * @return $this
      */
     public function setGender($gender);

dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php

@@ -93,8 +93,8 @@ public function testToHtml()
         $this->assertNotContains('field-confirmation', $result);
         $this->assertNotContains('_accountconfirmation', $result);
 
-        // Prefix is present but empty
-        $this->assertRegExp('/<input id="_accountprefix"[^>]*value=""/', $result);
+        // Prefix is present and not empty
+        $this->assertRegExp('/<input id="_accountprefix"[^>]*value="Mr."/', $result);
 
         // Does not contain send email controls
         $this->assertNotContains('<input id="_accountsendemail"', $result);

dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php

@@ -95,11 +95,11 @@ public function tearDown()
      */
     public function testGetCustomer()
     {
-        $expectedCustomer = $this->_loadCustomer();
-        $actualCustomer = $this->_block->getCustomer();
-        foreach ($expectedCustomer->__toArray() as $property => $value) {
+        $expectedCustomerData = $this->_loadCustomer()->__toArray();
+        $actualCustomerData = $this->_block->getCustomer()->__toArray();
+        foreach ($expectedCustomerData as $property => $value) {
             $expectedValue = is_numeric($value) ? intval($value) : $value;
-            $actualValue = $actualCustomer->__toArray()[$property];
+            $actualValue = isset($actualCustomerData[$property]) ? $actualCustomerData[$property] : null;
             $actualValue = is_numeric($actualValue) ? intval($actualValue) : $actualValue;
             $this->assertEquals($expectedValue, $actualValue);
         }

dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php

@@ -101,12 +101,17 @@ public function testGetCustomerAttributeMetadata()
             'website_id' => 1,
             'store_id' => 1,
             'group_id' => 1,
+            'prefix' => 'Mr.',
             'firstname' => 'John',
+            'middlename' => 'A',
             'lastname' => 'Smith',
+            'suffix' => 'Esq.',
             'email' => 'customer@example.com',
             'default_billing' => '1',
             'default_shipping' => '1',
             'disable_auto_group_change' => 0,
+            'taxvat' => '12',
+            'gender' => 0
         ];
 
         $customer = $this->customerRepository->getById(1);

dev/tests/integration/testsuite/Magento/Customer/_files/customer.php

@@ -17,17 +17,14 @@
     ->setGroupId(1)
     ->setStoreId(1)
     ->setIsActive(1)
-    ->setCreatedIn('Store Name')
     ->setPrefix('Mr.')
     ->setFirstname('John')
     ->setMiddlename('A')
     ->setLastname('Smith')
     ->setSuffix('Esq.')
-    ->setDob('1970-01-01')
     ->setDefaultBilling(1)
     ->setDefaultShipping(1)
     ->setTaxvat('12')
-    ->setConfirmation('a4fg7h893e39d')
     ->setGender(0);
 $customer->isObjectNew(true);
 $customer->save();