Test improvement

Author: dercoder

src/Omnipay/Paysafecard/Message/CompletePurchaseRequest.php

@@ -26,13 +26,6 @@ protected function getMethod()
         return 'executeDebit';
     }
 
-    public function setFetchTransactionRequest(FetchTransactionRequest $request)
-    {
-        $this->fetchTransaction = $request;
-
-        return $this;
-    }
-
     /**
      * Get the data for this request.
      *
@@ -119,11 +112,9 @@ public function getData()
      */
     public function sendData($data)
     {
-        if (!$this->fetchTransaction) {
-            $this->fetchTransaction = new FetchTransactionRequest($this->httpClient, $this->httpRequest);
-        }
+        $fetchTransaction = new FetchTransactionRequest($this->httpClient, $this->httpRequest);
 
-        $response = $this->fetchTransaction->initialize(array(
+        $response = $fetchTransaction->initialize(array(
             'testMode' => $this->getTestMode(),
             'username' => $this->getUsername(),
             'password' => $this->getPassword(),

tests/Omnipay/Paysafecard/Message/CompletePurchaseRequestTest.php

@@ -16,17 +16,12 @@ public function setUp()
         $httpCompletePurchaseResponse = $this->getMockHttpResponse('CompletePurchaseSuccess.txt');
         $httpFetchTransactionResponse = $this->getMockHttpResponse('FetchTransactionPending.txt');
 
-        $mockCompletePurchasePlugin = new \Guzzle\Plugin\Mock\MockPlugin();
-        $mockCompletePurchasePlugin->addResponse($httpCompletePurchaseResponse);
-
-        $mockFetchTransactionPlugin = new \Guzzle\Plugin\Mock\MockPlugin();
-        $mockFetchTransactionPlugin->addResponse($httpFetchTransactionResponse);
-
-        $httpCompletePurchaseClient = new HttpClient();
-        $httpCompletePurchaseClient->addSubscriber($mockCompletePurchasePlugin);
+        $mockPlugin = new \Guzzle\Plugin\Mock\MockPlugin();
+        $mockPlugin->addResponse($httpFetchTransactionResponse);
+        $mockPlugin->addResponse($httpCompletePurchaseResponse);
 
-        $httpFetchTransactionClient = new HttpClient();
-        $httpFetchTransactionClient->addSubscriber($mockFetchTransactionPlugin);
+        $httpClient = new HttpClient();
+        $httpClient->addSubscriber($mockPlugin);
 
         $httpRequest = new HttpRequest(array(
             'mtid' => 'TX9997888',
@@ -35,14 +30,11 @@ public function setUp()
             'currency' => 'EUR'
         ));
 
-        $this->request = new CompletePurchaseRequest($httpCompletePurchaseClient, $httpRequest);
+        $this->request = new CompletePurchaseRequest($httpClient, $httpRequest);
         $this->request->initialize(array(
             'username' => 'SOAP_USERNAME',
             'password' => 'oJ2rHLBVSbD5iGfT'
         ));
-
-        $fetchTransaction = new FetchTransactionRequest($httpFetchTransactionClient, new HttpRequest());
-        $this->request->setFetchTransactionRequest($fetchTransaction);
     }
 
     public function testExceptions()