test for CreatePaymentMethodRequest.cardholderName

Author: domis86

src/Message/CreatePaymentMethodRequest.php

@@ -14,10 +14,12 @@ class CreatePaymentMethodRequest extends AbstractRequest
     public function getData()
     {
         $data = array(
-            'cardholderName' => $this->getCardholderName(),
             'customerId' => $this->getCustomerId(),
             'paymentMethodNonce' => $this->getToken(),
         );
+        if ($cardholderName = $this->getCardholderName()) {
+            $data['cardholderName'] = $cardholderName;
+        }
         $data += $this->getOptionData();
 
         return $data;

tests/Message/CreatePaymentMethodRequestTest.php

@@ -6,34 +6,59 @@
 
 class CreatePaymentMethodRequestTest extends TestCase
 {
-    /**
-     * @var CreatePaymentMethodRequest
-     */
-    private $request;
-
-    public function setUp()
+    public function testGetData()
     {
-        $this->request = new CreatePaymentMethodRequest($this->getHttpClient(), $this->getHttpRequest(), \Braintree_Configuration::gateway());
-        $this->request->initialize(
+        $request = $this->createPaymentMethodRequest();
+        $request->initialize(
             array(
                 'customerId' => '4815162342',
                 'token' => 'abc123',
                 'verifyCard' => true,
                 'verificationMerchantAccountId' => '123581321',
             )
         );
+
+        $expectedData = array(
+            'customerId' => '4815162342',
+            'paymentMethodNonce' => 'abc123',
+            'options' => array(
+                'verifyCard' => true,
+                'verificationMerchantAccountId' => '123581321',
+            )
+        );
+        $this->assertSame($expectedData, $request->getData());
     }
 
-    public function testGetData()
+    public function testGetDataWithCardholderName()
     {
+        $request = $this->createPaymentMethodRequest();
+        $request->initialize(
+            array(
+                'customerId' => '4815162342',
+                'token' => 'abc123',
+                'cardholderName' => 'John Yolo',
+                'verifyCard' => true,
+                'verificationMerchantAccountId' => '123581321',
+            )
+        );
+
         $expectedData = array(
             'customerId' => '4815162342',
             'paymentMethodNonce' => 'abc123',
+            'cardholderName' => 'John Yolo',
             'options' => array(
                 'verifyCard' => true,
                 'verificationMerchantAccountId' => '123581321',
             )
         );
-        $this->assertSame($expectedData, $this->request->getData());
+        $this->assertSame($expectedData, $request->getData());
+    }
+
+    /**
+     * @return CreatePaymentMethodRequest
+     */
+    private function createPaymentMethodRequest()
+    {
+        return new CreatePaymentMethodRequest($this->getHttpClient(), $this->getHttpRequest(), \Braintree_Configuration::gateway());
     }
 }