Merge remote-tracking branch 'mpi/MAGETWO-52069' into pr-mpi-200416

Author: oshmyheliuk

app/code/Magento/Quote/Model/Quote/ShippingAssignment/ShippingProcessor.php

@@ -65,7 +65,10 @@ public function save(ShippingInterface $shipping, CartInterface $quote)
     {
         $this->shippingAddressManagement->assign($quote->getId(), $shipping->getAddress());
         if (!empty($shipping->getMethod()) && $quote->getItemsCount() > 0) {
-            list($carrierCode, $methodCode) = explode("_", $shipping->getMethod());
+            $nameComponents = explode('_', $shipping->getMethod());
+            $carrierCode = array_shift($nameComponents);
+            // carrier method code can contains more one name component
+            $methodCode = implode('_', $nameComponents);
             $this->shippingMethodManagement->apply($quote->getId(), $carrierCode, $methodCode);
         }
     }

app/code/Magento/Quote/Test/Unit/Model/Quote/ShippingAssignment/ShippingProcessorTest.php

@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Quote\Test\Unit\Model\Quote\ShippingAssignment;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Quote\Api\Data\AddressInterface;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Api\Data\ShippingInterface;
+use Magento\Quote\Model\Quote\ShippingAssignment\ShippingProcessor;
+use Magento\Quote\Model\ShippingAddressManagement;
+use Magento\Quote\Model\ShippingMethodManagement;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Class ShippingProcessorTest
+ */
+class ShippingProcessorTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ShippingAddressManagement|MockObject
+     */
+    private $shippingAddressManagement;
+
+    /**
+     * @var ShippingMethodManagement|MockObject
+     */
+    private $shippingMethodManagement;
+
+    /**
+     * @var ShippingProcessor
+     */
+    private $shippingProcessor;
+
+    protected function setUp()
+    {
+        $this->shippingAddressManagement = $this->getMockBuilder(ShippingAddressManagement::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['assign'])
+            ->getMock();
+        
+        $this->shippingMethodManagement = $this->getMockBuilder(ShippingMethodManagement::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['apply'])
+            ->getMock();
+        
+        $objectManager = new ObjectManager($this);
+        
+        $this->shippingProcessor = $objectManager->getObject(ShippingProcessor::class, [
+            'shippingAddressManagement' => $this->shippingAddressManagement,
+            'shippingMethodManagement' => $this->shippingMethodManagement
+        ]);
+    }
+
+    /**
+     * @param string $method
+     * @param string $carrierCode
+     * @param string $methodCode
+     * @dataProvider saveDataProvider
+     */
+    public function testSave($method, $carrierCode, $methodCode)
+    {
+        $shipping = $this->getMockForAbstractClass(ShippingInterface::class);
+        $quote = $this->getMockForAbstractClass(CartInterface::class);
+        $quoteId = 1;
+
+        $address = $this->getMockForAbstractClass(AddressInterface::class);
+        
+        $quote->expects(static::exactly(2))
+            ->method('getId')
+            ->willReturn($quoteId);
+        
+        $shipping->expects(static::once())
+            ->method('getAddress')
+            ->willReturn($address);
+
+        $this->shippingAddressManagement->expects(static::once())
+            ->method('assign')
+            ->with($quoteId, $address);
+
+        $shipping->expects(static::exactly(2))
+            ->method('getMethod')
+            ->willReturn($method);
+
+        $quote->expects(static::once())
+            ->method('getItemsCount')
+            ->willReturn(1);
+
+        $this->shippingMethodManagement->expects(static::once())
+            ->method('apply')
+            ->with($quoteId, $carrierCode, $methodCode);
+
+        $this->shippingProcessor->save($shipping, $quote);
+    }
+
+    /**
+     * Get variations for save method testing
+     * @return array
+     */
+    public function saveDataProvider()
+    {
+        return [
+            ['carrier_Global_World_Economy', 'carrier', 'Global_World_Economy'],
+            ['carrier_International_Economy', 'carrier', 'International_Economy'],
+            ['carrier_Express', 'carrier', 'Express'],
+            ['flat_rate', 'flat', 'rate'],
+        ];
+    }
+}