Merge branch 'MAGETWO-34644' into MAGETWO-34647

Author: Dmytro Voskoboinikov

app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php

@@ -16,6 +16,8 @@
 
 /**
  * Class InvoiceSender
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class InvoiceSender extends Sender
 {

app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php

@@ -16,6 +16,8 @@
 
 /**
  * Class ShipmentSender
+ * 
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ShipmentSender extends Sender
 {

app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php

@@ -126,7 +126,6 @@ public function stepMockSetup()
             ->method('getPayment')
             ->will($this->returnValue($paymentInfoMock));
 
-
         $this->addressRenderer = $this->getMock('Magento\Sales\Model\Order\Address\Renderer', [], [], '', false);
         $this->addressMock = $this->getMock('Magento\Sales\Model\Order\Address', [], [], '', false);
 
@@ -151,4 +150,59 @@ public function stepMockSetup()
             false
         );
     }
+
+    public function stepAddressFormat($billingAddress)
+    {
+        $this->orderMock->expects($this->any())
+            ->method('getBillingAddress')
+            ->will($this->returnValue($billingAddress));
+        $this->orderMock->expects($this->any())
+            ->method('getShippingAddress')
+            ->will($this->returnValue($billingAddress));
+    }
+
+    public function stepSendWithoutSendCopy()
+    {
+        $this->stepSend($this->once(), $this->never());
+    }
+
+    public function stepSendWithCallSendCopyTo()
+    {
+        $this->stepSend($this->never(), $this->once());
+    }
+
+    public function stepIdentityContainerInit($identityMockClassName)
+    {
+        $this->identityContainerMock = $this->getMock(
+            $identityMockClassName,
+            ['getStore', 'isEnabled', 'getConfigValue', 'getTemplateId', 'getGuestTemplateId'],
+            [],
+            '',
+            false
+        );
+        $this->identityContainerMock->expects($this->any())
+            ->method('getStore')
+            ->will($this->returnValue($this->storeMock));
+    }
+
+    protected function stepSend(
+        \PHPUnit_Framework_MockObject_Matcher_InvokedCount $sendExpects,
+        \PHPUnit_Framework_MockObject_Matcher_InvokedCount $sendCopyToExpects
+    ) {
+        $senderMock = $this->getMock(
+            'Magento\Sales\Model\Order\Email\Sender',
+            ['send', 'sendCopyTo'],
+            [],
+            '',
+            false
+        );
+        $senderMock->expects($sendExpects)
+            ->method('send');
+        $senderMock->expects($sendCopyToExpects)
+            ->method('sendCopyTo');
+
+        $this->senderBuilderFactoryMock->expects($this->once())
+            ->method('create')
+            ->will($this->returnValue($senderMock));
+    }
 }

app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoCommentSenderTest.php

@@ -26,6 +26,7 @@ protected function setUp()
     {
         $this->stepMockSetup();
         $this->stepIdentityContainerInit('\Magento\Sales\Model\Order\Email\Container\CreditmemoCommentIdentity');
+        $this->addressRenderer->expects($this->any())->method('format')->willReturn(1);
         $this->creditmemoMock = $this->getMock(
             '\Magento\Sales\Model\Order\Creditmemo',
             ['getStore', '__wakeup', 'getOrder'],
@@ -44,7 +45,7 @@ protected function setUp()
             $this->identityContainerMock,
             $this->senderBuilderFactoryMock,
             $this->loggerMock,
-            $this->addressRendererMock
+            $this->addressRenderer
         );
     }
 

app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceCommentSenderTest.php

@@ -40,6 +40,8 @@ protected function setUp()
 
         $this->stepIdentityContainerInit('\Magento\Sales\Model\Order\Email\Container\InvoiceCommentIdentity');
 
+        $this->addressRenderer->expects($this->any())->method('format')->willReturn(1);
+
         $this->invoiceMock = $this->getMock(
             '\Magento\Sales\Model\Order\Invoice',
             ['getStore', '__wakeup', 'getOrder'],
@@ -59,7 +61,7 @@ protected function setUp()
             $this->identityContainerMock,
             $this->senderBuilderFactoryMock,
             $this->loggerMock,
-            $this->addressRendererMock
+            $this->addressRenderer
         );
     }
 

app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderCommentSenderTest.php

@@ -18,12 +18,13 @@ protected function setUp()
     {
         $this->stepMockSetup();
         $this->stepIdentityContainerInit('\Magento\Sales\Model\Order\Email\Container\OrderCommentIdentity');
+        $this->addressRenderer->expects($this->any())->method('format')->willReturn(1);
         $this->sender = new OrderCommentSender(
             $this->templateContainerMock,
             $this->identityContainerMock,
             $this->senderBuilderFactoryMock,
             $this->loggerMock,
-            $this->addressRendererMock
+            $this->addressRenderer
         );
     }
 

app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentCommentSenderTest.php

@@ -23,6 +23,7 @@ protected function setUp()
     {
         $this->stepMockSetup();
         $this->stepIdentityContainerInit('\Magento\Sales\Model\Order\Email\Container\ShipmentCommentIdentity');
+        $this->addressRenderer->expects($this->any())->method('format')->willReturn(1);
         $this->shipmentMock = $this->getMock(
             '\Magento\Sales\Model\Order\Shipment',
             ['getStore', '__wakeup', 'getOrder'],
@@ -42,7 +43,7 @@ protected function setUp()
             $this->identityContainerMock,
             $this->senderBuilderFactoryMock,
             $this->loggerMock,
-            $this->addressRendererMock
+            $this->addressRenderer
         );
     }