Merge pull request #441 from magento-dragons/W1

[DRAGONS] BugFix

Author: kandy

app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/bulk.js

@@ -304,6 +304,7 @@ define([
 
                     uploadInput.fileupload({
                         dataType: 'json',
+                        dropZone: gallery,
                         process: [{
                             action: 'load',
                             fileTypes: /^image\/(gif|jpeg|png)$/

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

@@ -178,7 +178,7 @@ public function hasLinks($product)
      */
     public function hasOptions($product)
     {
-        return $product->getLinksPurchasedSeparately() || parent::hasOptions($product);
+        return parent::hasOptions($product) || $this->hasLinks($product);
     }
 
     /**

app/code/Magento/Search/view/frontend/templates/form.mini.phtml

@@ -23,7 +23,7 @@ $helper = $this->helper('Magento\Search\Helper\Data');
                     <input id="search"
                            data-mage-init='{"quickSearch":{
                                 "formSelector":"#search_mini_form",
-                                "url":"<?php /* @escapeNotVerified */ echo $block->getUrl('search/ajax/suggest'); ?>",
+                                "url":"<?php /* @escapeNotVerified */ echo $block->getUrl('search/ajax/suggest', ['_secure' => $block->getRequest()->isSecure()]); ?>",
                                 "destinationSelector":"#search_autocomplete"}
                            }'
                            type="text"

app/code/Magento/Theme/Block/Html/Topmenu.php

@@ -49,7 +49,6 @@ public function __construct(
         TreeFactory $treeFactory,
         array $data = []
     ) {
-        $this->setCacheLifetime(30 * 60);
         parent::__construct($context, $data);
         $this->_menu = $nodeFactory->create(
             [
@@ -60,6 +59,16 @@ public function __construct(
         );
     }
 
+    /**
+     * Get block cache life time
+     *
+     * @return int
+     */
+    protected function getCacheLifetime()
+    {
+        return parent::getCacheLifetime() ?: 3600;
+    }
+
     /**
      * Get top menu html
      *

dev/tests/integration/testsuite/Magento/GroupedProduct/Model/ResourceModel/Product/Type/Grouped/AssociatedProductsCollectionTest.php

@@ -30,8 +30,9 @@ public function testGetColumnValues()
         $resultData = $collection->getColumnValues('sku');
         $this->assertNotEmpty($resultData);
 
-        foreach (['simple-1', 'virtual-product'] as $skuExpected) {
-            $this->assertTrue(in_array($skuExpected, $resultData));
-        }
+        $expected = ['virtual-product', 'simple-1'];
+        sort($expected);
+        sort($resultData);
+        $this->assertEquals($expected, $resultData);
     }
 }