Merge remote-tracking branch 'origin/MAGETWO-92005' into 2.3-develop-pr20

OlgaVasyltsun · OlgaVasyltsun · commit b7ec0908914e · 2018-05-29T11:04:41.000+03:00
diff --git a/app/code/Magento/Catalog/Model/Product/Price/TierPriceStorage.php b/app/code/Magento/Catalog/Model/Product/Price/TierPriceStorage.php
@@ -172,8 +172,10 @@ private function getExistingPrices(array $skus, $groupBySku = false)
         $rawPrices = $this->tierPricePersistence->get($ids);
         $prices = [];
 
+        $linkField = $this->tierPricePersistence->getEntityLinkField();
+        $skuByIdLookup = $this->buildSkuByIdLookup($skus);
         foreach ($rawPrices as $rawPrice) {
-            $sku = $this->retrieveSkuById($rawPrice[$this->tierPricePersistence->getEntityLinkField()], $skus);
+            $sku = $skuByIdLookup[$rawPrice[$linkField]];
             $price = $this->tierPriceFactory->create($rawPrice, $sku);
             if ($groupBySku) {
                 $prices[$sku][] = $price;
@@ -300,21 +302,21 @@ private function isCorrectPriceValue(array $existingPrice, array $price)
     }
 
     /**
-     * Retrieve SKU by product ID.
+     * Generate lookup to retrieve SKU by product ID.
      *
-     * @param int $id
      * @param array $skus
-     * @return string|null
+     * @return array
      */
-    private function retrieveSkuById($id, $skus)
+    private function buildSkuByIdLookup($skus)
     {
+        $lookup = [];
         foreach ($this->productIdLocator->retrieveProductIdsBySkus($skus) as $sku => $ids) {
-            if (isset($ids[$id])) {
-                return $sku;
+            foreach (array_keys($ids) as $id) {
+                $lookup[$id] = $sku;
             }
         }
 
-        return null;
+        return $lookup;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Plugin/Block/Topmenu.php b/app/code/Magento/Catalog/Plugin/Block/Topmenu.php
@@ -162,6 +162,7 @@ private function getCategoryAsArray($category, $currentCategory, $isParentActive
             'url' => $this->catalogCategory->getCategoryUrl($category),
             'has_active' => in_array((string)$category->getId(), explode('/', $currentCategory->getPath()), true),
             'is_active' => $category->getId() == $currentCategory->getId(),
+            'is_category' => true,
             'is_parent_active' => $isParentActive
         ];
     }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php
@@ -1336,7 +1336,6 @@ public function testSaveExistingWithMediaGalleryEntries()
 
         $expectedResult = [
             [
-                'value_id' => 5,
                 'value_id' => 5,
                 "label" => "new_label_text",
                 'file' => 'filename1',
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/breadcrumbs.js b/app/code/Magento/Catalog/view/frontend/web/js/product/breadcrumbs.js
@@ -16,6 +16,7 @@ define([
                 categoryUrlSuffix: '',
                 useCategoryPathInUrl: false,
                 product: '',
+                categoryItemSelector: '.category-item',
                 menuContainer: '[data-action="navigation"] > ul'
             },
 
@@ -163,7 +164,10 @@ define([
                     categoryMenuItem = null;
 
                 if (categoryUrl && menu.length) {
-                    categoryMenuItem = menu.find('a[href="' + categoryUrl + '"]');
+                    categoryMenuItem = menu.find(
+                        this.options.categoryItemSelector +
+                        ' > a[href="' + categoryUrl + '"]'
+                    );
                 }
 
                 return categoryMenuItem;
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system.xml b/app/code/Magento/Paypal/etc/adminhtml/system.xml
@@ -32,6 +32,7 @@
             </group>
             <group id="other_payment_methods" translate="label" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Other Payment Methods:</label>
+                <attribute type="expanded">1</attribute>
                 <fieldset_css>paypal-top-section payments-other-header</fieldset_css>
                 <frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
             </group>
diff --git a/app/code/Magento/ReleaseNotification/Ui/Renderer/NotificationRenderer.php b/app/code/Magento/ReleaseNotification/Ui/Renderer/NotificationRenderer.php
@@ -174,7 +174,7 @@ private function buildFooter(array $footer)
      * correct HTML format.
      *
      * @param string $content
-     * @returns string
+     * @return string
      */
     private function formatContentWithLinks($content)
     {
diff --git a/app/code/Magento/Theme/Block/Html/Topmenu.php b/app/code/Magento/Theme/Block/Html/Topmenu.php
@@ -309,6 +309,10 @@ protected function _getMenuItemClasses(\Magento\Framework\Data\Tree\Node $item)
         $classes[] = 'level' . $item->getLevel();
         $classes[] = $item->getPositionClass();
 
+        if ($item->getIsCategory()) {
+            $classes[] = 'category-item';
+        }
+
         if ($item->getIsFirst()) {
             $classes[] = 'first';
         }
diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js
@@ -721,6 +721,8 @@ define([
          * @param {Number} page - current page
          */
         changePage: function (page) {
+            this.clear();
+
             if (page === 1 && !this.recordData().length) {
                 return false;
             }
@@ -762,15 +764,13 @@ define([
          * Change page to next
          */
         nextPage: function () {
-            this.clear();
             this.currentPage(this.currentPage() + 1);
         },
 
         /**
          * Change page to previous
          */
         previousPage: function () {
-            this.clear();
             this.currentPage(this.currentPage() - 1);
         },
 
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Page/AdminConfigPaymentMethodsPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Page/AdminConfigPaymentMethodsPage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+    <page name="AdminConfigPaymentMethodsPage" url="admin/system_config/edit/section/payment/" area="admin" module="Magento_Config">
+        <section name="OtherPaymentsConfigSection"/>
+    </page>
+</pages>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Section/OtherPaymentsConfigSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Section/OtherPaymentsConfigSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="OtherPaymentsConfigSection">
+        <element name="expandedTab" type="button" selector="#payment_us_other_payment_methods-head.open"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Test/AdminConfigPaymentsSectionState.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Test/AdminConfigPaymentsSectionState.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminConfigPaymentsSectionState">
+        <annotations>
+            <description value="Other Payment Methods section in Admin expanded by default"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MAGETWO-92043"/>
+        </annotations>
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        <amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToConfigurationPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <seeElement selector="{{OtherPaymentsConfigSection.expandedTab}}" stepKey="seeSectionExpanded"/>
+    </test>
+</tests>
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/breadcrumbs.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/breadcrumbs.test.js
@@ -18,7 +18,11 @@ define([
             'Magento_Theme/js/model/breadcrumb-list': jasmine.createSpyObj(['push'])
         },
         defaultContext = require.s.contexts._,
-        menuItem = $('<li class="level0"><a href="http://localhost.com/cat1.html" id="ui-id-3">Cat1</a></li>')[0],
+        menuItem = $(
+            '<li class="level0 category-item">' +
+            '<a href="http://localhost.com/cat1.html" id="ui-id-3">Cat1</a>' +
+            '</li>'
+        )[0],
 
         /**
          * Create context object.

Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,7 @@ private function getCategoryAsArray($category, $currentCategory, $isParentActive`
`162`	`162`	`'url' => $this->catalogCategory->getCategoryUrl($category),`
`163`	`163`	`'has_active' => in_array((string)$category->getId(), explode('/', $currentCategory->getPath()), true),`
`164`	`164`	`'is_active' => $category->getId() == $currentCategory->getId(),`
	`165`	`+ 'is_category' => true,`
`165`	`166`	`'is_parent_active' => $isParentActive`
`166`	`167`	`];`
`167`	`168`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1336,7 +1336,6 @@ public function testSaveExistingWithMediaGalleryEntries()`
`1336`	`1336`
`1337`	`1337`	`$expectedResult = [`
`1338`	`1338`	`[`
`1339`		`- 'value_id' => 5,`
`1340`	`1339`	`'value_id' => 5,`
`1341`	`1340`	`"label" => "new_label_text",`
`1342`	`1341`	`'file' => 'filename1',`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ private function buildFooter(array $footer)`
`174`	`174`	`* correct HTML format.`
`175`	`175`	`*`
`176`	`176`	`* @param string $content`
`177`		`- * @returns string`
	`177`	`+ * @return string`
`178`	`178`	`*/`
`179`	`179`	`private function formatContentWithLinks($content)`
`180`	`180`	`{`