Updates tests

Author: jesse-mollie

app/code/community/Mollie/Mpm/controllers/ApiController.php

@@ -144,12 +144,15 @@ public function paymentAction ()
 		}
 
 		$order_id = $order->getId();
-		$session = $this->_getCheckout();
 
 		try
 		{
 			// Magento is so awesome, we need to manually remember the quote
-			$session->setMollieQuoteId($session->getQuoteId());
+			$session = $this->_getCheckout();
+			if (is_object($session))
+			{
+				$session->setMollieQuoteId($session->getQuoteId());
+			}
 
 			// Assign required value's
 			$amount      = $this->getAmount($order);
@@ -380,7 +383,7 @@ protected function _restoreCart()
 	{
 		// Put items back in shopping cart
 		$session = $this->_getCheckout();
-		if ($quoteId = $session->getMollieQuoteId()) {
+		if (is_object($session) && $quoteId = $session->getMollieQuoteId()) {
 			$quote = Mage::getModel('sales/quote')->load($quoteId);
 			if ($quote->getId()) {
 				$quote->setIsActive(true)->save();

tests/unittests/Helper/ApiTest.php

@@ -60,7 +60,8 @@ public function testCreatePaymentActionRequiresParameters()
 			'description' => 'Description',
 			'order_id' => 1,
 			'redirect_url' => 'http://customer.local/redirect.php',
-			'method' => 'Method'
+			'method' => 'Method',
+			'issuer' => '',
 		);
 
 		foreach (array('amount', 'redirect_url') as $parameter)
@@ -83,7 +84,8 @@ public function testCreatePaymentActionFailureSetsErrorVariables()
 			'Description',
 			1,
 			'incorrect.url/redirect.php',
-			'Method'
+			'Method',
+			''
 		);
 
 		$this->assertFalse($result);

tests/unittests/controllers/ApiControllerReportActionTest.php

@@ -82,7 +82,7 @@ public function setUp()
 		/*
 		 * Models.
 		 */
-		$this->payment_model = $this->getMock("Mage_Sales_Model_Order_Payment", array("setMethod", "setTransactionId", "setIsTransactionClosed", "addTransaction"));
+		$this->payment_model = $this->getMock("Mage_Sales_Model_Order_Payment", array("setMethod", "setTransactionId", "setIsTransactionClosed", "addTransaction", "getTransaction"));
 		$this->api_model   = $this->getMock("Mollie_Mpm_Model_Api", array("updatePayment"), array(), "", FALSE);
 		$this->order_model   = $this->getMock("stdClass", array("load"));
 

tests/unittests/controllers/ApiControllerReturnActionTest.php

@@ -86,7 +86,7 @@ public function setUp()
 			array("sales/order", $this->order_model),
 		)));
 
-		$this->session = $this->getMock("stdClass", array("getQuote"));
+		$this->session = $this->getMock("stdClass", array("getQuote", "getMollieQuoteId"));
 		$this->quote = $this->getMock("stdClass");
 
 		$this->session->expects($this->any())