MAGETWO-63406: [Github] Paypal Payment Order Transaction ID Link will result to 404 not found

- Fixed returned link
- Fixed unit tests

Author: isavchuk-magento

app/code/Magento/Paypal/Helper/Data.php

@@ -15,7 +15,7 @@
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
     const HTML_TRANSACTION_ID =
-        '<a target="_blank" href="https://www.%1$s.paypal.com/cgi-bin/webscr?cmd=_view-a-trans&id=%2$s">%2$s</a>';
+        '<a target="_blank" href="https://www%1$s.paypal.com/cgi-bin/webscr?cmd=_view-a-trans&id=%2$s">%2$s</a>';
 
     /**
      * Cache for shouldAskToCreateBillingAgreement()
@@ -133,7 +133,7 @@ public function getHtmlTransactionId($methodCode, $txnId)
         if (in_array($methodCode, $this->methodCodes)) {
             /** @var \Magento\Paypal\Model\Config $config */
             $config = $this->configFactory->create()->setMethod($methodCode);
-            $sandboxFlag = ($config->getValue('sandboxFlag') ? 'sandbox' : '');
+            $sandboxFlag = ($config->getValue('sandboxFlag') ? '.sandbox' : '');
             return sprintf(self::HTML_TRANSACTION_ID, $sandboxFlag, $txnId);
         }
         return $txnId;

app/code/Magento/Paypal/Test/Unit/Helper/DataTest.php

@@ -7,6 +7,17 @@
 
 class DataTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @var string
+     */
+    private static $htmlTransactionId =
+        '<a target="_blank" href="https://www%1$s.paypal.com/cgi-bin/webscr?cmd=_view-a-trans&id=%2$s">%2$s</a>';
+
+    /**
+     * @var string
+     */
+    private static $txnId = 'XXX123123XXX';
+
     /**
      * @var \Magento\Payment\Api\PaymentMethodListInterface|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -37,13 +48,10 @@ protected function setUp()
             \Magento\Payment\Model\Method\InstanceFactory::class
         )->disableOriginalConstructor()->getMock();
 
-        $this->configMock = $this->getMock(
-            \Magento\Paypal\Model\Config::class,
-            [],
-            [],
-            '',
-            false
-        );
+        $this->configMock = $this->getMockBuilder(\Magento\Paypal\Model\Config::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $configMockFactory = $this->getMockBuilder(\Magento\Paypal\Model\ConfigFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
@@ -138,34 +146,68 @@ public function getBillingAgreementMethodsDataProvider()
     }
 
     /**
+     * Sandbox mode
+     * Expected link <a target="_blank" href="https://www.sandbox.paypal.com/...</a>
+     *
      * @param string $methodCode
-     * @param string $htmlTransactionId
      * @dataProvider testGetHtmlTransactionIdProvider
      */
-    public function testGetHtmlTransactionId($methodCode, $htmlTransactionId)
+    public function testGetHtmlTransactionSandboxLink($methodCode)
     {
-        $txnId = 'XXX123123XXX';
-        $htmlTransactionId = sprintf($htmlTransactionId, 'sandbox', $txnId);
+        $expectedLink = sprintf(self::$htmlTransactionId, '.sandbox', self::$txnId);
 
-        $this->configMock->expects($this->any())
+        $this->configMock->expects($this->once())
             ->method('getValue')
-            ->with($this->stringContains('sandboxFlag'))
+            ->with('sandboxFlag')
             ->willReturn(true);
 
-        $this->assertEquals($htmlTransactionId, $this->_helper->getHtmlTransactionId($methodCode, $txnId));
+        $this->assertEquals(
+            $expectedLink,
+            $this->_helper->getHtmlTransactionId($methodCode, self::$txnId)
+        );
+    }
+
+    /**
+     * Real mode
+     * Expected link <a target="_blank" href="https://www.paypal.com/...  </a>
+     *
+     * @param string $methodCode
+     * @dataProvider testGetHtmlTransactionIdProvider
+     */
+    public function testGetHtmlTransactionRealLink($methodCode)
+    {
+        $expectedLink = sprintf(self::$htmlTransactionId, '', self::$txnId);
+
+        $this->configMock->expects($this->once())
+            ->method('getValue')
+            ->with('sandboxFlag')
+            ->willReturn(false);
+
+        $this->assertEquals(
+            $expectedLink,
+            $this->_helper->getHtmlTransactionId($methodCode, self::$txnId)
+        );
     }
 
     /**
      * @return array
      */
     public function testGetHtmlTransactionIdProvider()
     {
-        $htmlTransactionId =
-            '<a target="_blank" href="https://www.%1$s.paypal.com/cgi-bin/webscr?cmd=_view-a-trans&id=%2$s">%2$s</a>';
         return [
-            ['paypal_express', $htmlTransactionId],
-            ['payflow_express', 'XXX123123XXX'],
-            ['hosted_pro', $htmlTransactionId]
+            ['paypal_express'],
+            ['hosted_pro']
         ];
     }
+
+    /**
+     * Invokes with method not in payment list
+     * Expected result just returned txtId: "XXX123123XXX"
+     */
+    public function testGetHtmlTransactionMethodNotInPaymentList()
+    {
+        $methodCode = 'payflow_express';
+
+        $this->assertEquals(self::$txnId, $this->_helper->getHtmlTransactionId($methodCode, self::$txnId));
+    }
 }