Add more tests. Refs #125

johnkary · amacneil · commit a9f01ba48b4c · 2013-09-17T20:01:10.000+10:00
diff --git a/src/Omnipay/PayPal/Message/AbstractRequest.php b/src/Omnipay/PayPal/Message/AbstractRequest.php
@@ -16,6 +16,8 @@
  */
 abstract class AbstractRequest extends \Omnipay\Common\Message\AbstractRequest
 {
+    const API_VERSION = '85.0';
+
     protected $liveEndpoint = 'https://api-3t.paypal.com/nvp';
     protected $testEndpoint = 'https://api-3t.sandbox.paypal.com/nvp';
 
@@ -93,7 +95,7 @@ protected function getBaseData($method)
     {
         $data = array();
         $data['METHOD'] = $method;
-        $data['VERSION'] = '85.0';
+        $data['VERSION'] = static::API_VERSION;
         $data['USER'] = $this->getUsername();
         $data['PWD'] = $this->getPassword();
         $data['SIGNATURE'] = $this->getSignature();
diff --git a/tests/Omnipay/CardSave/GatewayTest.php b/tests/Omnipay/CardSave/GatewayTest.php
@@ -32,6 +32,9 @@ public function setUp()
                 'expiryMonth' => '12',
                 'expiryYear' => '2016',
                 'cvv' => '123',
+                'issueNumber' => '5',
+                'startMonth' => '4',
+                'startYear' => '2013',
             )),
         );
     }
diff --git a/tests/Omnipay/CardSave/Message/ResponseTest.php b/tests/Omnipay/CardSave/Message/ResponseTest.php
@@ -11,10 +11,20 @@
 
 namespace Omnipay\CardSave\Message;
 
+use Mockery as m;
 use Omnipay\TestCase;
 
 class ResponseTest extends TestCase
 {
+    /**
+     * @expectedException \Omnipay\Common\Exception\InvalidResponseException
+     */
+    public function testPurchaseWithoutStatusCode()
+    {
+        $httpResponse = $this->getMockHttpResponse('PurchaseFailureWithoutStatusCode.txt');
+        new Response($this->getMockRequest(), $httpResponse->getBody());
+    }
+
     public function testPurchaseSuccess()
     {
         $httpResponse = $this->getMockHttpResponse('PurchaseSuccess.txt');
@@ -23,6 +33,7 @@ public function testPurchaseSuccess()
         $this->assertTrue($response->isSuccessful());
         $this->assertEquals('130215141054377801316798', $response->getTransactionReference());
         $this->assertSame('AuthCode: 672167', $response->getMessage());
+        $this->assertEmpty($response->getRedirectUrl());
     }
 
     public function testPurchaseFailure()
@@ -34,4 +45,25 @@ public function testPurchaseFailure()
         $this->assertSame('', $response->getTransactionReference());
         $this->assertSame('Input variable errors', $response->getMessage());
     }
+
+    public function testRedirect()
+    {
+        $httpResponse = $this->getMockHttpResponse('PurchaseRedirect.txt');
+
+        $request = m::mock('\Omnipay\Common\Message\AbstractRequest');
+        $request->shouldReceive('getReturnUrl')->once()->andReturn('http://store.example.com/');
+
+        $response = new Response($request, $httpResponse->getBody());
+
+        $this->assertTrue($response->isRedirect());
+        $this->assertSame('POST', $response->getRedirectMethod());
+        $this->assertSame('http://some.redirect.com/', $response->getRedirectUrl());
+
+        $expectedData = array(
+            'PaReq' => 'Some PaREQ',
+            'TermUrl' => 'http://store.example.com/',
+            'MD' => '130215141054377801316798',
+        );
+        $this->assertEquals($expectedData, $response->getRedirectData());
+    }
 }
diff --git a/tests/Omnipay/CardSave/Mock/PurchaseFailureWithoutStatusCode.txt b/tests/Omnipay/CardSave/Mock/PurchaseFailureWithoutStatusCode.txt
@@ -0,0 +1,10 @@
+HTTP/1.1 200 OK
+Cache-Control: private, max-age=0
+Content-Length: 689
+Content-Type: text/xml; charset=utf-8
+Node: VENUS
+X-Powered-By: ASP.NET
+X-AspNet-Version: 4.0.30319
+Date: Fri, 15 Feb 2013 14:06:34 GMT
+
+<?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><soap:Body><CardDetailsTransactionResponse xmlns="https://www.thepaymentgateway.net/"><CardDetailsTransactionResult AuthorisationAttempted="False"><Message>Input variable errors</Message><ErrorMessages><MessageDetail><Detail>Required variable (PaymentMessage.TransactionDetails.OrderID) is missing</Detail></MessageDetail></ErrorMessages></CardDetailsTransactionResult><TransactionOutputData /></CardDetailsTransactionResponse></soap:Body></soap:Envelope>
diff --git a/tests/Omnipay/CardSave/Mock/PurchaseRedirect.txt b/tests/Omnipay/CardSave/Mock/PurchaseRedirect.txt
@@ -0,0 +1,10 @@
+HTTP/1.1 200 OK
+Cache-Control: private, max-age=0
+Content-Length: 944
+Content-Type: text/xml; charset=utf-8
+Node: VENUS
+X-Powered-By: ASP.NET
+X-AspNet-Version: 4.0.30319
+Date: Fri, 15 Feb 2013 14:10:53 GMT
+
+<?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><soap:Body><CardDetailsTransactionResponse xmlns="https://www.thepaymentgateway.net/"><CardDetailsTransactionResult AuthorisationAttempted="True"><StatusCode>3</StatusCode><Message>AuthCode: 672167</Message></CardDetailsTransactionResult><TransactionOutputData CrossReference="130215141054377801316798"><AuthCode>672167</AuthCode><ThreeDSecureOutputData><ACSURL>http://some.redirect.com/</ACSURL><PaREQ>Some PaREQ</PaREQ></ThreeDSecureOutputData><ThreeDSecureAuthenticationCheckResult>NOT_ENROLLED</ThreeDSecureAuthenticationCheckResult><GatewayEntryPoints><GatewayEntryPoint EntryPointURL="https://gw1.cardsaveonlinepayments.com:4430/" Metric="100" /><GatewayEntryPoint EntryPointURL="https://gw2.cardsaveonlinepayments.com:4430/" Metric="200" /></GatewayEntryPoints></TransactionOutputData></CardDetailsTransactionResponse></soap:Body></soap:Envelope>
diff --git a/tests/Omnipay/Netaxept/Message/CompletePurchaseRequestTest.php b/tests/Omnipay/Netaxept/Message/CompletePurchaseRequestTest.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Omnipay\Netaxept\Message;
+
+use Omnipay\TestCase;
+
+class CompletePurchaseRequestTest extends TestCase
+{
+    /**
+     * @var \Symfony\Component\HttpFoundation\Request
+     */
+    private $httpRequest;
+
+    /**
+     * @var \Omnipay\Netaxept\Message\CompletePurchaseRequest
+     */
+    private $request;
+
+    public function setUp()
+    {
+        $client = $this->getHttpClient();
+        $this->httpRequest = $this->getHttpRequest();
+
+        $this->request = new CompletePurchaseRequest($client, $this->httpRequest);
+    }
+
+    /**
+     * @expectedException \Omnipay\Common\Exception\InvalidResponseException
+     */
+    public function testGetDataThrowsExceptionWithoutResponseCode()
+    {
+        $this->httpRequest->query->set('transactionId', 'TRANS-123');
+
+        $this->request->getData();
+    }
+
+    /**
+     * @expectedException \Omnipay\Common\Exception\InvalidResponseException
+     */
+    public function testGetDataThrowsExceptionWithoutTransactionId()
+    {
+        $this->httpRequest->query->set('responseCode', 'ABC-123');
+
+        $this->request->getData();
+    }
+}
diff --git a/tests/Omnipay/Netaxept/Message/PurchaseRequestTest.php b/tests/Omnipay/Netaxept/Message/PurchaseRequestTest.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Omnipay\Netaxept\Message;
+
+use Omnipay\Common\CreditCard;
+use Omnipay\TestCase;
+
+class PurchaseRequestTest extends TestCase
+{
+    /**
+     * @var \Omnipay\Netaxept\Message\PurchaseRequest
+     */
+    private $request;
+
+    public function setUp()
+    {
+        $client = $this->getHttpClient();
+        $request = $this->getHttpRequest();
+
+        $this->request = new PurchaseRequest($client, $request);
+    }
+
+    public function testGetDataWithCard()
+    {
+        $this->request->setMerchantId('MERCH-123');
+        $this->request->setPassword('PASSWORD-123');
+        $this->request->setAmount('1.23');
+        $this->request->setCurrency('USD');
+        $this->request->setTransactionId('ABC-123');
+        $this->request->setReturnUrl('http://return.domain.com/');
+
+        $card = new CreditCard(array(
+            'firstName' => 'John',
+            'lastName' => 'Doe',
+            'email' => 'test@email.com',
+            'phone' => '555-555-5555',
+            'address1' => '123 NW Blvd',
+            'address2' => 'Lynx Lane',
+            'postcode' => '66605',
+            'city' => 'Topeka',
+            'country' => 'USA',
+        ));
+        $this->request->setCard($card);
+
+        $expected = array(
+            'merchantId' => 'MERCH-123',
+            'token' => 'PASSWORD-123',
+            'serviceType' => 'B',
+            'orderNumber' => 'ABC-123',
+            'currencyCode' => 'USD',
+            'amount' => 123,
+            'redirectUrl' => 'http://return.domain.com/',
+            'customerFirstName' => 'John',
+            'customerLastName' => 'Doe',
+            'customerEmail' => 'test@email.com',
+            'customerPhoneNumber' => '555-555-5555',
+            'customerAddress1' => '123 NW Blvd',
+            'customerAddress2' => 'Lynx Lane',
+            'customerPostcode' => '66605',
+            'customerTown' => 'Topeka',
+            'customerCountry' => 'USA',
+        );
+
+        $this->assertEquals($expected, $this->request->getData());
+    }
+}
diff --git a/tests/Omnipay/Netaxept/Message/ResponseTest.php b/tests/Omnipay/Netaxept/Message/ResponseTest.php
@@ -33,6 +33,8 @@ public function testPurchaseFailure()
 
         $this->assertFalse($response->isSuccessful());
         $this->assertFalse($response->isRedirect());
+        $this->assertNull($response->getRedirectUrl());
+        $this->assertNull($response->getRedirectData());
         $this->assertNull($response->getTransactionReference());
         $this->assertSame("Missing parameter: 'Order Number'", $response->getMessage());
     }
diff --git a/tests/Omnipay/PayPal/Message/CaptureRequestTest.php b/tests/Omnipay/PayPal/Message/CaptureRequestTest.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Omnipay\PayPal\Message;
+
+use Omnipay\PayPal\Message\CaptureRequest;
+use Omnipay\TestCase;
+
+class CaptureRequestTest extends TestCase
+{
+    /**
+     * @var \Omnipay\PayPal\Message\CaptureRequest
+     */
+    private $request;
+
+    public function setUp()
+    {
+        $client = $this->getHttpClient();
+        $request = $this->getHttpRequest();
+        $this->request = new CaptureRequest($client, $request);
+    }
+
+    public function testGetData()
+    {
+        $this->request->setTransactionReference('ABC-123');
+        $this->request->setAmount('1.23');
+        $this->request->setCurrency('USD');
+        $this->request->setUsername('testuser');
+        $this->request->setPassword('testpass');
+        $this->request->setSignature('SIG');
+        $this->request->setSubject('SUB');
+
+        $expected = array();
+        $expected['METHOD'] = 'DoCapture';
+        $expected['AUTHORIZATIONID'] = 'ABC-123';
+        $expected['AMT'] = '1.23';
+        $expected['CURRENCYCODE'] = 'USD';
+        $expected['COMPLETETYPE'] = 'Complete';
+        $expected['USER'] = 'testuser';
+        $expected['PWD'] = 'testpass';
+        $expected['SIGNATURE'] = 'SIG';
+        $expected['SUBJECT'] = 'SUB';
+        $expected['VERSION'] = CaptureRequest::API_VERSION;
+
+        $this->assertEquals($expected, $this->request->getData());
+    }
+}
diff --git a/tests/Omnipay/PayPal/Message/ExpressAuthorizeRequestTest.php b/tests/Omnipay/PayPal/Message/ExpressAuthorizeRequestTest.php
@@ -11,6 +11,7 @@
 
 namespace Omnipay\PayPal\Message;
 
+use Omnipay\Common\CreditCard;
 use Omnipay\TestCase;
 
 class ExpressAuthorizeRequestTest extends TestCase
@@ -29,7 +30,7 @@ public function setUp()
         );
     }
 
-    public function testGetData()
+    public function testGetDataWithoutCard()
     {
         $this->request->initialize(array(
             'amount' => '10.00',
@@ -56,6 +57,67 @@ public function testGetData()
         $this->assertSame('https://www.example.com/header.jpg', $data['HDRIMG']);
     }
 
+    public function testGetDataWitCard()
+    {
+        $this->request->initialize(array(
+            'amount' => '10.00',
+            'currency' => 'AUD',
+            'transactionId' => '111',
+            'description' => 'Order Description',
+            'returnUrl' => 'https://www.example.com/return',
+            'cancelUrl' => 'https://www.example.com/cancel',
+            'notifyUrl' => 'https://www.example.com/notify',
+            'subject' => 'demo@example.com',
+            'headerImageUrl' => 'https://www.example.com/header.jpg',
+        ));
+
+        $card = new CreditCard(array(
+            'name' => 'John Doe',
+            'address1' => '123 NW Blvd',
+            'address2' => 'Lynx Lane',
+            'city' => 'Topeka',
+            'state' => 'KS',
+            'country' => 'USA',
+            'postcode' => '66605',
+            'phone' => '555-555-5555',
+            'email' => 'test@email.com',
+        ));
+        $this->request->setCard($card);
+
+        $expected = array(
+            'METHOD' => 'SetExpressCheckout',
+            'VERSION' => ExpressAuthorizeRequest::API_VERSION,
+            'USER' => null,
+            'PWD' => null,
+            'SIGNATURE' => null,
+            'PAYMENTREQUEST_0_PAYMENTACTION' => 'Authorization',
+            'SOLUTIONTYPE' => null,
+            'LANDINGPAGE' => null,
+            'NOSHIPPING' => 1,
+            'ALLOWNOTE' => 0,
+            'PAYMENTREQUEST_0_AMT' => '10.00',
+            'PAYMENTREQUEST_0_CURRENCYCODE' => 'AUD',
+            'PAYMENTREQUEST_0_INVNUM' => '111',
+            'PAYMENTREQUEST_0_DESC' => 'Order Description',
+            'RETURNURL' => 'https://www.example.com/return',
+            'CANCELURL' => 'https://www.example.com/cancel',
+            'PAYMENTREQUEST_0_NOTIFYURL' => 'https://www.example.com/notify',
+            'SUBJECT' => 'demo@example.com',
+            'HDRIMG' => 'https://www.example.com/header.jpg',
+            'PAYMENTREQUEST_0_SHIPTONAME' => 'John Doe',
+            'PAYMENTREQUEST_0_SHIPTOSTREET' => '123 NW Blvd',
+            'PAYMENTREQUEST_0_SHIPTOSTREET2' => 'Lynx Lane',
+            'PAYMENTREQUEST_0_SHIPTOCITY' => 'Topeka',
+            'PAYMENTREQUEST_0_SHIPTOSTATE' => 'KS',
+            'PAYMENTREQUEST_0_SHIPTOCOUNTRYCODE' => 'USA',
+            'PAYMENTREQUEST_0_SHIPTOZIP' => '66605',
+            'PAYMENTREQUEST_0_SHIPTOPHONENUM' => '555-555-5555',
+            'EMAIL' => 'test@email.com',
+        );
+
+        $this->assertEquals($expected, $this->request->getData());
+    }
+
     public function testHeaderImageUrl()
     {
         $this->assertSame($this->request, $this->request->setHeaderImageUrl('https://www.example.com/header.jpg'));
diff --git a/tests/Omnipay/PayPal/Message/ExpressAuthorizeResponseTest.php b/tests/Omnipay/PayPal/Message/ExpressAuthorizeResponseTest.php
@@ -18,7 +18,8 @@ class ExpressAuthorizeResponseTest extends TestCase
     public function testConstruct()
     {
         // response should decode URL format data
-        $response = new ExpressAuthorizeResponse('example=value&foo=bar');
+        $response = new ExpressAuthorizeResponse($this->getMockRequest(), 'example=value&foo=bar');
+
         $this->assertEquals(array('example' => 'value', 'foo' => 'bar'), $response->getData());
     }
 
@@ -27,10 +28,11 @@ public function testExpressPurchaseSuccess()
         $httpResponse = $this->getMockHttpResponse('ExpressPurchaseSuccess.txt');
         $response = new ExpressAuthorizeResponse($this->getMockRequest(), $httpResponse->getBody());
 
-        $this->assertTrue($response->isSuccessful());
-        $this->assertSame('EC-42721413K79637829', $response->getExpressRedirectToken());
-        $this->assertNull($response->getTransactionReference());
+        $this->assertFalse($response->isSuccessful());
+        $this->assertSame('EC-42721413K79637829', $response->getTransactionReference());
         $this->assertNull($response->getMessage());
+        $this->assertNull($response->getRedirectData());
+        $this->assertSame('GET', $response->getRedirectMethod());
     }
 
     public function testExpressPurchaseFailure()
@@ -39,7 +41,7 @@ public function testExpressPurchaseFailure()
         $response = new ExpressAuthorizeResponse($this->getMockRequest(), $httpResponse->getBody());
 
         $this->assertFalse($response->isSuccessful());
-        $this->assertNull($response->getExpressRedirectToken());
+        $this->assertNull($response->getTransactionReference());
         $this->assertNull($response->getTransactionReference());
         $this->assertSame('This transaction cannot be processed. The amount to be charged is zero.', $response->getMessage());
     }
diff --git a/tests/Omnipay/PayPal/Message/ExpressCompleteAuthorizeRequestTest.php b/tests/Omnipay/PayPal/Message/ExpressCompleteAuthorizeRequestTest.php
diff --git a/tests/Omnipay/PayPal/Message/RefundRequestTest.php b/tests/Omnipay/PayPal/Message/RefundRequestTest.php

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,8 @@ public function testPurchaseFailure()`
`33`	`33`
`34`	`34`	`$this->assertFalse($response->isSuccessful());`
`35`	`35`	`$this->assertFalse($response->isRedirect());`
	`36`	`+ $this->assertNull($response->getRedirectUrl());`
	`37`	`+ $this->assertNull($response->getRedirectData());`
`36`	`38`	`$this->assertNull($response->getTransactionReference());`
`37`	`39`	`$this->assertSame("Missing parameter: 'Order Number'", $response->getMessage());`
`38`	`40`	`}`