fix unit tests and array set up

kristof-ringleff · kristof-ringleff · commit e76f322954b0 · 2015-04-19T14:50:16.000-07:00
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php
@@ -68,7 +68,7 @@ public function send(Creditmemo $creditmemo, $notify = true, $comment = '')
         $formattedBillingAddress = $this->addressRenderer->format($order->getBillingAddress(), 'html');
 
         $transport = new \Magento\Framework\Object(
-            ['templateVars' =>
+            ['template_vars' =>
                  [
                      'order'                    => $order,
                      'creditmemo'               => $creditmemo,
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
@@ -86,15 +86,16 @@ public function send(Creditmemo $creditmemo, $notify = true, $comment = '')
         $formattedBillingAddress = $this->addressRenderer->format($order->getBillingAddress(), 'html');
 
         $transport = new \Magento\Framework\Object(
-            ['templateVars' =>
+            ['template_vars' =>
                  [
-                     'order'                    => $order,
-                     'creditmemo'               => $creditmemo,
-                     'comment'                  => $comment,
-                     'billing'                  => $order->getBillingAddress(),
-                     'store'                    => $order->getStore(),
+                     'order' => $creditmemo->getOrder(),
+                     'creditmemo' => $creditmemo,
+                     'comment' => $comment,
+                     'billing' => $order->getBillingAddress(),
+                     'payment_html' => $this->getPaymentHtml($order),
+                     'store' => $order->getStore(),
                      'formattedShippingAddress' => $formattedShippingAddress,
-                     'formattedBillingAddress'  => $formattedBillingAddress,
+                     'formattedBillingAddress' => $formattedBillingAddress
                  ]
             ]
         );
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php
@@ -68,7 +68,7 @@ public function send(Invoice $invoice, $notify = true, $comment = '')
         $formattedBillingAddress = $this->addressRenderer->format($order->getBillingAddress(), 'html');
 
         $transport = new \Magento\Framework\Object(
-            ['templateVars' =>
+            ['template_vars' =>
                  [
                      'order'                    => $order,
                      'invoice'                  => $invoice,
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
@@ -86,7 +86,7 @@ public function send(Invoice $invoice, $notify = true, $comment = '')
         $formattedBillingAddress = $this->addressRenderer->format($order->getBillingAddress(), 'html');
 
         $transport = new \Magento\Framework\Object(
-            ['templateVars' =>
+            ['template_vars' =>
                  [
                      'order'                    => $order,
                      'invoice'                  => $invoice,
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/OrderCommentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/OrderCommentSender.php
@@ -66,7 +66,7 @@ public function send(Order $order, $notify = true, $comment = '')
         $formattedBillingAddress = $this->addressRenderer->format($order->getBillingAddress(), 'html');
 
         $transport = new \Magento\Framework\Object(
-            ['templateVars' =>
+            ['template_vars' =>
                  [
                      'order'                    => $order,
                      'comment'                  => $comment,
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php
@@ -91,7 +91,7 @@ public function send(Order $order)
     protected function prepareTemplate(Order $order)
     {
         $transport = new \Magento\Framework\Object(
-            ['templateVars' =>
+            ['template_vars' =>
                  [
                      'order'                    => $order,
                      'billing'                  => $order->getBillingAddress(),
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php
@@ -68,7 +68,7 @@ public function send(Shipment $shipment, $notify = true, $comment = '')
         $formattedBillingAddress = $this->addressRenderer->format($order->getBillingAddress(), 'html');
 
         $transport = new \Magento\Framework\Object(
-            ['templateVars' =>
+            ['template_vars' =>
                  [
                      'order'                    => $order,
                      'shipment'                 => $shipment,
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
@@ -86,7 +86,7 @@ public function send(Shipment $shipment, $notify = true, $comment = '')
         $formattedBillingAddress = $this->addressRenderer->format($order->getBillingAddress(), 'html');
 
         $transport = new \Magento\Framework\Object(
-            ['templateVars' =>
+            ['template_vars' =>
                  [
                      'order'                    => $order,
                      'shipment'                 => $shipment,
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php
@@ -45,6 +45,11 @@ abstract class AbstractSenderTest extends \PHPUnit_Framework_TestCase
      */
     protected $addressMock;
 
+    /**
+     * @var \Magento\Framework\Event\Manager | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $eventManagerMock;
+
     public function stepMockSetup()
     {
         $this->senderBuilderFactoryMock = $this->getMock(
@@ -86,6 +91,7 @@ public function stepMockSetup()
         $this->addressRendererMock = $this->getMock('Magento\Sales\Model\Order\Address\Renderer', [], [], '', false);
         $this->addressMock = $this->getMock('Magento\Sales\Model\Order\Address', [], [], '', false);
         $this->addressRendererMock->expects($this->any())->method('format')->willReturn(1);
+        $this->eventManagerMock = $this->getMock('Magento\Framework\Event\Manager', [], [], '', false);
     }
 
     public function stepAddressFormat($billingAddress)
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoCommentSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoCommentSenderTest.php
@@ -40,7 +40,8 @@ protected function setUp()
             $this->templateContainerMock,
             $this->identityContainerMock,
             $this->senderBuilderFactoryMock,
-            $this->addressRendererMock
+            $this->addressRendererMock,
+            $this->eventManagerMock
         );
     }
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
@@ -74,7 +74,8 @@ protected function setUp()
             $this->senderBuilderFactoryMock,
             $this->paymentHelper,
             $this->creditmemoResource,
-            $this->addressRendererMock
+            $this->addressRendererMock,
+            $this->eventManagerMock
         );
     }
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceCommentSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceCommentSenderTest.php
@@ -58,7 +58,8 @@ protected function setUp()
             $this->templateContainerMock,
             $this->identityContainerMock,
             $this->senderBuilderFactoryMock,
-            $this->addressRendererMock
+            $this->addressRendererMock,
+            $this->eventManagerMock
         );
     }
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php
@@ -77,7 +77,8 @@ protected function setUp()
             $this->senderBuilderFactoryMock,
             $this->paymentHelper,
             $this->invoiceResource,
-            $this->addressRendererMock
+            $this->addressRendererMock,
+            $this->eventManagerMock
         );
     }
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderCommentSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderCommentSenderTest.php
@@ -22,7 +22,8 @@ protected function setUp()
             $this->templateContainerMock,
             $this->identityContainerMock,
             $this->senderBuilderFactoryMock,
-            $this->addressRendererMock
+            $this->addressRendererMock,
+            $this->eventManagerMock
         );
     }
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php
@@ -53,7 +53,8 @@ protected function setUp()
             $this->senderBuilderFactoryMock,
             $this->paymentHelper,
             $this->orderResource,
-            $this->addressRendererMock
+            $this->addressRendererMock,
+            $this->eventManagerMock
         );
     }
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentCommentSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentCommentSenderTest.php
@@ -41,7 +41,8 @@ protected function setUp()
             $this->templateContainerMock,
             $this->identityContainerMock,
             $this->senderBuilderFactoryMock,
-            $this->addressRendererMock
+            $this->addressRendererMock,
+            $this->eventManagerMock
         );
     }
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php
@@ -77,7 +77,8 @@ protected function setUp()
             $this->senderBuilderFactoryMock,
             $this->paymentHelper,
             $this->shipmentResource,
-            $this->addressRendererMock
+            $this->addressRendererMock,
+            $this->eventManagerMock
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function send(Creditmemo $creditmemo, $notify = true, $comment = '')`
`68`	`68`	`$formattedBillingAddress = $this->addressRenderer->format($order->getBillingAddress(), 'html');`
`69`	`69`
`70`	`70`	`$transport = new \Magento\Framework\Object(`
`71`		`- ['templateVars' =>`
	`71`	`+ ['template_vars' =>`
`72`	`72`	`[`
`73`	`73`	`'order' => $order,`
`74`	`74`	`'creditmemo' => $creditmemo,`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public function send(Invoice $invoice, $notify = true, $comment = '')`
`86`	`86`	`$formattedBillingAddress = $this->addressRenderer->format($order->getBillingAddress(), 'html');`
`87`	`87`
`88`	`88`	`$transport = new \Magento\Framework\Object(`
`89`		`- ['templateVars' =>`
	`89`	`+ ['template_vars' =>`
`90`	`90`	`[`
`91`	`91`	`'order' => $order,`
`92`	`92`	`'invoice' => $invoice,`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function send(Order $order, $notify = true, $comment = '')`
`66`	`66`	`$formattedBillingAddress = $this->addressRenderer->format($order->getBillingAddress(), 'html');`
`67`	`67`
`68`	`68`	`$transport = new \Magento\Framework\Object(`
`69`		`- ['templateVars' =>`
	`69`	`+ ['template_vars' =>`
`70`	`70`	`[`
`71`	`71`	`'order' => $order,`
`72`	`72`	`'comment' => $comment,`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public function send(Order $order)`
`91`	`91`	`protected function prepareTemplate(Order $order)`
`92`	`92`	`{`
`93`	`93`	`$transport = new \Magento\Framework\Object(`
`94`		`- ['templateVars' =>`
	`94`	`+ ['template_vars' =>`
`95`	`95`	`[`
`96`	`96`	`'order' => $order,`
`97`	`97`	`'billing' => $order->getBillingAddress(),`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,8 @@ protected function setUp()`
`40`	`40`	`$this->templateContainerMock,`
`41`	`41`	`$this->identityContainerMock,`
`42`	`42`	`$this->senderBuilderFactoryMock,`
`43`		`- $this->addressRendererMock`
	`43`	`+ $this->addressRendererMock,`
	`44`	`+ $this->eventManagerMock`
`44`	`45`	`);`
`45`	`46`	`}`
`46`	`47`