Clean up Sage Pay card brand mapping and add tests. Refs #114 Closes #93 Closes #91

Author: amacneil

src/Omnipay/SagePay/Message/DirectAuthorizeRequest.php

@@ -17,6 +17,10 @@
 class DirectAuthorizeRequest extends AbstractRequest
 {
     protected $action = 'DEFERRED';
+    protected $cardBrandMap = array(
+        'mastercard' => 'mc',
+        'diners_club' => 'dc'
+    );
 
     protected function getBaseAuthorizeData()
     {
@@ -62,23 +66,11 @@ public function getData()
         $data = $this->getBaseAuthorizeData();
         $this->getCard()->validate();
 
-        $cardType = $this->getCard()->getBrand();
-
-        // list of brands SagePay names differently
-        $brands = array(
-            'mastercard' => 'mc',
-            'diners_club' => 'dc'
-        );
-
-        if (isset($brands[$cardType])) {
-            $cardType = $brands[$cardType];
-        }
-
         $data['CardHolder'] = $this->getCard()->getName();
         $data['CardNumber'] = $this->getCard()->getNumber();
         $data['CV2'] = $this->getCard()->getCvv();
         $data['ExpiryDate'] = $this->getCard()->getExpiryDate('my');
-        $data['CardType'] = $cardType;
+        $data['CardType'] = $this->getCardBrand();
 
         if ($this->getCard()->getStartMonth() and $this->getCard()->getStartYear()) {
             $data['StartDate'] = $this->getCard()->getStartDate('my');
@@ -95,4 +87,15 @@ public function getService()
     {
         return 'vspdirect-register';
     }
+
+    protected function getCardBrand()
+    {
+        $brand = $this->getCard()->getBrand();
+
+        if (isset($this->cardBrandMap[$brand])) {
+            return $this->cardBrandMap[$brand];
+        }
+
+        return $brand;
+    }
 }

tests/Omnipay/SagePay/Message/DirectAuthorizeRequestTest.php

@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of the Omnipay package.
+ *
+ * (c) Adrian Macneil <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Omnipay\SagePay\Message;
+
+use Omnipay\TestCase;
+
+class DirectAuthorizeRequestTest extends TestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->request = new DirectAuthorizeRequest($this->getHttpClient(), $this->getHttpRequest());
+        $this->request->initialize(
+            array(
+                'amount' => '12.00',
+                'transactionId' => '123',
+                'card' => $this->getValidCard(),
+            )
+        );
+    }
+
+    public function testGetDataVisa()
+    {
+        $this->request->getCard()->setNumber('4929000000006');
+        $data = $this->request->getData();
+
+        $this->assertSame('visa', $data['CardType']);
+    }
+
+    public function testGetDataMastercard()
+    {
+        $this->request->getCard()->setNumber('5404000000000001');
+        $data = $this->request->getData();
+
+        $this->assertSame('mc', $data['CardType']);
+    }
+
+    public function testGetDataDinersClub()
+    {
+        $this->request->getCard()->setNumber('30569309025904');
+        $data = $this->request->getData();
+
+        $this->assertSame('dc', $data['CardType']);
+    }
+}