Merge remote-tracking branch 'remotes/origin/MAGETWO-69607' into MPI-PR-Bugfixes

Author: YevSent

app/code/Magento/Braintree/Gateway/Request/ChannelDataBuilder.php

@@ -5,19 +5,16 @@
  */
 namespace Magento\Braintree\Gateway\Request;
 
-use Magento\Payment\Gateway\Request\BuilderInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ProductMetadataInterface;
+use Magento\Payment\Gateway\Config\Config;
+use Magento\Payment\Gateway\Request\BuilderInterface;
 
 /**
  * Class BnCodeDataBuilder
  */
 class ChannelDataBuilder implements BuilderInterface
 {
-    /**
-     * @var ProductMetadataInterface
-     */
-    private $productMetadata;
-
     /**
      * @var string
      */
@@ -28,23 +25,36 @@ class ChannelDataBuilder implements BuilderInterface
      */
     private static $channelValue = 'Magento2_Cart_%s_BT';
 
+    /**
+     * @var ProductMetadataInterface
+     */
+    private $productMetadata;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
     /**
      * Constructor
      *
      * @param ProductMetadataInterface $productMetadata
+     * @param Config $config
      */
-    public function __construct(ProductMetadataInterface $productMetadata)
+    public function __construct(ProductMetadataInterface $productMetadata, Config $config = null)
     {
         $this->productMetadata = $productMetadata;
+        $this->config = $config ?: ObjectManager::getInstance()->get(Config::class);
     }
 
     /**
      * @inheritdoc
      */
     public function build(array $buildSubject)
     {
+        $channel = $this->config->getValue('channel');
         return [
-            self::$channel => sprintf(self::$channelValue, $this->productMetadata->getEdition())
+            self::$channel => $channel ?: sprintf(self::$channelValue, $this->productMetadata->getEdition())
         ];
     }
 }

app/code/Magento/Braintree/Test/Unit/Gateway/Request/ChannelDataBuilderTest.php

@@ -7,6 +7,8 @@
 
 use Magento\Braintree\Gateway\Request\ChannelDataBuilder;
 use Magento\Framework\App\ProductMetadataInterface;
+use Magento\Payment\Gateway\Config\Config;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * Class PaymentDataBuilderTest
@@ -16,19 +18,32 @@
 class ChannelDataBuilderTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var ProductMetadataInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ProductMetadataInterface|MockObject
      */
-    private $productMetadataMock;
+    private $productMetadata;
+
+    /**
+     * @var Config|MockObject
+     */
+    private $config;
 
     /**
      * @var ChannelDataBuilder
      */
     private $builder;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $this->productMetadataMock = $this->getMock(ProductMetadataInterface::class);
-        $this->builder = new ChannelDataBuilder($this->productMetadataMock);
+        $this->productMetadata = $this->getMockBuilder(ProductMetadataInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->config = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->builder = new ChannelDataBuilder($this->productMetadata, $this->config);
     }
 
     /**
@@ -40,11 +55,37 @@ protected function setUp()
     public function testBuild($edition, array $expected)
     {
         $buildSubject = [];
-        $this->productMetadataMock->expects(static::once())
-            ->method('getEdition')
+
+        $this->config->method('getValue')
+            ->with(self::equalTo('channel'))
+            ->willReturn(null);
+
+        $this->productMetadata->method('getEdition')
             ->willReturn($edition);
 
-        $this->assertEquals($expected, $this->builder->build($buildSubject));
+        self::assertEquals($expected, $this->builder->build($buildSubject));
+    }
+
+    /**
+     * Checks a case when a channel provided via payment method configuration.
+     */
+    public function testBuildWithChannelFromConfig()
+    {
+        $channel = 'Magento2_Cart_ConfigEdition_BT';
+
+        $this->config->method('getValue')
+            ->with(self::equalTo('channel'))
+            ->willReturn($channel);
+
+        $this->productMetadata->expects(self::never())
+            ->method('getEdition');
+
+        self::assertEquals(
+            [
+                'channel' => $channel
+            ],
+            $this->builder->build([])
+        );
     }
 
     /**

app/code/Magento/Braintree/etc/di.xml

@@ -187,6 +187,12 @@
     </type>
     <!-- END command managers section for Vault -->
 
+    <type name="Magento\Braintree\Gateway\Request\ChannelDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">Magento\Braintree\Gateway\Config\Config</argument>
+        </arguments>
+    </type>
+
     <!-- Braintree commands  -->
     <virtualType name="BraintreeAuthorizeCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
         <arguments>

app/code/Magento/Paypal/Model/AbstractConfig.php

@@ -335,7 +335,8 @@ public function isMethodSupportedForCountry($method = null, $countryCode = null)
      */
     public function getBuildNotationCode()
     {
-        return sprintf(self::$bnCode, $this->getProductMetadata()->getEdition());
+        $notationCode = $this->_scopeConfig->getValue('paypal/notation_code', ScopeInterface::SCOPE_STORES);
+        return $notationCode ?: sprintf(self::$bnCode, $this->getProductMetadata()->getEdition());
     }
 
     /**

app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php

@@ -290,12 +290,16 @@ public function testIsMethodActive()
         $this->config->isMethodActive('method');
     }
 
+    /**
+     * Checks a case, when notation code based on Magento edition.
+     */
     public function testGetBuildNotationCode()
     {
-        $productMetadata = $this->getMock(ProductMetadataInterface::class, [], [], '', false);
-        $productMetadata->expects($this->once())
-            ->method('getEdition')
-            ->will($this->returnValue('SomeEdition'));
+        $productMetadata = $this->getMockBuilder(ProductMetadataInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $productMetadata->method('getEdition')
+            ->willReturn('SomeEdition');
 
         $objectManagerHelper = new ObjectManagerHelper($this);
         $objectManagerHelper->setBackwardCompatibleProperty(
@@ -304,6 +308,20 @@ public function testGetBuildNotationCode()
             $productMetadata
         );
 
-        $this->assertEquals('Magento_Cart_SomeEdition', $this->config->getBuildNotationCode());
+        self::assertEquals('Magento_Cart_SomeEdition', $this->config->getBuildNotationCode());
+    }
+
+    /**
+     * Checks a case, when notation code should be provided from configuration.
+     */
+    public function testBuildNotationCodeFromConfig()
+    {
+        $notationCode = 'Magento_Cart_EditionFromConfig';
+
+        $this->scopeConfigMock->method('getValue')
+            ->with(self::equalTo('paypal/notation_code'), self::equalTo('stores'))
+            ->willReturn($notationCode);
+
+        self::assertEquals($notationCode, $this->config->getBuildNotationCode());
     }
 }