Merge remote-tracking branch 'origin/MAGETWO-52030' into PR-4

Author: aohorodnyk

app/code/Magento/Downloadable/Model/Product/Type.php

@@ -164,10 +164,11 @@ public function getLinks($product)
      */
     public function hasLinks($product)
     {
-        if ($product->hasData('links_exist')) {
-            return $product->getData('links_exist');
+        $hasLinks = $product->getData('links_exist');
+        if (null === $hasLinks) {
+            $hasLinks = (count($this->getLinks($product)) > 0);
         }
-        return count($this->getLinks($product)) > 0;
+        return $hasLinks;
     }
 
     /**

app/code/Magento/Downloadable/Test/Unit/Model/Product/TypeTest.php

@@ -17,6 +17,7 @@ class TypeTest extends \PHPUnit_Framework_TestCase
      * @var \Magento\Downloadable\Model\Product\Type
      */
     private $target;
+
     /**
      * @var TypeHandlerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -83,6 +84,7 @@ protected function setUp()
                 'getDownloadableData',
                 'setTypeHasOptions',
                 'setLinksExist',
+                'getDownloadableLinks',
                 '__wakeup',
             ],
             [],
@@ -144,4 +146,12 @@ public function testBeforeSave()
     {
         $this->target->beforeSave($this->product);
     }
+
+    public function testHasLinks()
+    {
+        $this->product->expects($this->exactly(2))
+            ->method('getDownloadableLinks')
+            ->willReturn(['link1', 'link2']);
+        $this->assertTrue($this->target->hasLinks($this->product));
+    }
 }