From e6ed16bec356c52697b6c85582554ca7e3263c75 Mon Sep 17 00:00:00 2001
From: Dzmitry Tabusheu <dzmitry_tabusheu@epam.com>
Date: Thu, 1 Nov 2018 11:08:00 +0300
Subject: [PATCH 01/38] MAGETWO-95811: Cannot translate specific admin sections
 with inline translation

- Added translate tags to templates
---
 app/code/Magento/Ui/view/base/web/js/grid/search/search.js     | 2 +-
 .../base/web/templates/grid/controls/bookmarks/bookmarks.html  | 2 +-
 .../view/base/web/templates/grid/controls/bookmarks/view.html  | 2 +-
 .../Magento/Ui/view/base/web/templates/grid/search/search.html | 3 ++-
 app/code/Magento/Ui/view/base/web/templates/grid/submenu.html  | 2 +-
 .../Ui/view/base/web/templates/grid/tree-massactions.html      | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/search/search.js b/app/code/Magento/Ui/view/base/web/js/grid/search/search.js
index fa445a2577adb..be825a391cf07 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/search/search.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/search/search.js
@@ -18,7 +18,7 @@ define([
     return Element.extend({
         defaults: {
             template: 'ui/grid/search/search',
-            placeholder: $t('Search by keyword'),
+            placeholder: 'Search by keyword',
             label: $t('Keyword'),
             value: '',
             previews: [],
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/bookmarks.html b/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/bookmarks.html
index 3ef64fd4b5371..36a3232c3e61a 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/bookmarks.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/bookmarks.html
@@ -6,7 +6,7 @@
 -->
 <div class="admin__action-dropdown-wrap admin__data-grid-action-bookmarks" collapsible>
     <button class="admin__action-dropdown" type="button" toggleCollapsible>
-        <span class="admin__action-dropdown-text" text="activeView.label"/>
+        <span class="admin__action-dropdown-text" translate="activeView.label"/>
     </button>
     <ul class="admin__action-dropdown-menu">
         <repeat args="foreach: viewsArray, item: '$view'">
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/view.html b/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/view.html
index b52669e2cd28d..521ce9fc806ac 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/view.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/view.html
@@ -30,7 +30,7 @@
 </div>
 
 <div class="action-dropdown-menu-item">
-    <a href="" class="action-dropdown-menu-link" text="$view().label" click="applyView.bind($data, $view().index)" closeCollapsible/>
+    <a href="" class="action-dropdown-menu-link" translate="$view().label" click="applyView.bind($data, $view().index)" closeCollapsible/>
 
     <div class="action-dropdown-menu-item-actions" if="$view().editable">
         <button class="action-edit" type="button" attr="title: $t('Edit bookmark')" click="editView.bind($data, $view().index)">
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/search/search.html b/app/code/Magento/Ui/view/base/web/templates/grid/search/search.html
index 39d996e05c3a6..13b82a93eca25 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/search/search.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/search/search.html
@@ -10,9 +10,10 @@
     </label>
     <input class="admin__control-text data-grid-search-control" type="text"
             data-bind="
+                i18n: placeholder,
                 attr: {
                     id: index,
-                    placeholder: placeholder
+                    placeholder: $t(placeholder)
                 },
                 textInput: inputValue,
                 keyboard: {
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/submenu.html b/app/code/Magento/Ui/view/base/web/templates/grid/submenu.html
index c5d87a4b16c4e..610d78e00b81d 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/submenu.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/submenu.html
@@ -6,7 +6,7 @@
 -->
 <ul class="action-submenu" each="data: action.actions, as: 'action'" css="_active: action.visible">
     <li css="_visible: $data.visible">
-        <span class="action-menu-item" text="label" click="$parent.applyAction.bind($parent, type)"/>
+        <span class="action-menu-item" translate="label" click="$parent.applyAction.bind($parent, type)"/>
         <render args="name: $parent.submenuTemplate, data: $parent" if="$data.actions"/>
     </li>
 </ul>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html b/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html
index 1aeb48b7c7698..d11d4aa243737 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html
@@ -11,7 +11,7 @@
     <div class="action-menu-items">
         <ul class="action-menu" each="data: actions, as: 'action'" css="_active: opened">
             <li css="_visible: $data.visible, _parent: $data.actions">
-                <span class="action-menu-item" text="label" click="$parent.applyAction.bind($parent, type)"/>
+                <span class="action-menu-item" translate="label" click="$parent.applyAction.bind($parent, type)"/>
                 <render args="name: $parent.submenuTemplate, data: $parent" if="$data.actions"/>
             </li>
         </ul>

From 919938fa1c0ee3ccf64de6019b55e88b7405ecfe Mon Sep 17 00:00:00 2001
From: Dzmitry Tabusheu <dzmitry_tabusheu@epam.com>
Date: Wed, 12 Dec 2018 19:57:51 +0300
Subject: [PATCH 02/38] MAGETWO-95827: Changing Attribute Set may lead to
 exception "Attempt to load value of nonexistent EAV attribute"

- Added attributes id filter to sql query
---
 .../Magento/Eav/Model/ResourceModel/ReadHandler.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php b/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
index cd2fe7477ca60..8804550be2b29 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
@@ -12,6 +12,9 @@
 use Magento\Framework\Model\Entity\ScopeResolver;
 use Psr\Log\LoggerInterface;
 
+/**
+ * EAV read handler
+ */
 class ReadHandler implements AttributeInterface
 {
     /**
@@ -86,6 +89,8 @@ private function getEntityAttributes(string $entityType, DataObject $entity): ar
     }
 
     /**
+     * Get context variables
+     *
      * @param ScopeInterface $scope
      * @return array
      */
@@ -99,6 +104,8 @@ protected function getContextVariables(ScopeInterface $scope)
     }
 
     /**
+     * Execute read handler
+     *
      * @param string $entityType
      * @param array $entityData
      * @param array $arguments
@@ -129,14 +136,14 @@ public function execute($entityType, $entityData, $arguments = [])
             }
         }
         if (count($attributeTables)) {
-            $attributeTables = array_keys($attributeTables);
-            foreach ($attributeTables as $attributeTable) {
+            foreach ($attributeTables as $attributeTable => $attributeIds) {
                 $select = $connection->select()
                     ->from(
                         ['t' => $attributeTable],
                         ['value' => 't.value', 'attribute_id' => 't.attribute_id']
                     )
-                    ->where($metadata->getLinkField() . ' = ?', $entityData[$metadata->getLinkField()]);
+                    ->where($metadata->getLinkField() . ' = ?', $entityData[$metadata->getLinkField()])
+                    ->where('attribute_id IN (?)', $attributeIds);
                 foreach ($context as $scope) {
                     //TODO: if (in table exists context field)
                     $select->where(

From 4e398d702e722b2f5f7ff1b02d7c8fc5940f1d41 Mon Sep 17 00:00:00 2001
From: David Grigoryan <david_grigoryan@epam.com>
Date: Mon, 24 Dec 2018 17:45:18 +0400
Subject: [PATCH 03/38] MAGETWO-91696: Configurable product type issue when
 adding to order

- Add automated test
---
 .../Mftf/Page/AdminOrderProcessDataPage.xml   |  13 ++
 .../AdminOrderFormItemsOrderedSection.xml     |   3 +-
 .../Section/AdminOrderItemsOrderedSection.xml |   4 +-
 .../Test/AdminConfProductAddedBySkuTest.xml   | 116 ++++++++++++++++++
 4 files changed, 134 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Page/AdminOrderProcessDataPage.xml
 create mode 100644 app/code/Magento/SalesSequence/Test/Mftf/Test/AdminConfProductAddedBySkuTest.xml

diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderProcessDataPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderProcessDataPage.xml
new file mode 100644
index 0000000000000..2041bf8f3c9ae
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderProcessDataPage.xml
@@ -0,0 +1,13 @@
+<?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="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminOrderProcessDataPage" url="sales/order_create/processData" area="admin" module="Magento_Sales">
+        <section name="AdminOrderFormItemsOrderedSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsOrderedSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsOrderedSection.xml
index 11673f1f0fe26..beb566b20806c 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsOrderedSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsOrderedSection.xml
@@ -15,5 +15,6 @@
         <element name="configureProductQtyField" type="input" selector="//*[@id='super-product-table']/tbody/tr[{{arg}}]/td[5]/input[1]" parameterized="true"/>
         <element name="addProductToOrder" type="input" selector="//*[@title='Add Products to Order']"/>
         <element name="itemsOrderedSummaryText" type="textarea" selector="//table[@class='data-table admin__table-primary order-tables']/tfoot/tr"/>
+        <element name="configureSelectAttribute" type="select" selector="select[id*=attribute]"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderItemsOrderedSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderItemsOrderedSection.xml
index 53aeeb62c6b70..5c2ff296ebeee 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderItemsOrderedSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderItemsOrderedSection.xml
@@ -23,8 +23,10 @@
 
         <element name="productNameColumn" type="text" selector=".edit-order-table .col-product .product-title"/>
         <element name="productNameOptions" type="text" selector=".edit-order-table .col-product .item-options"/>
+        <element name="productName" type="text" selector="#order-items_grid  span[id*=order_item]"/>
         <element name="productNameOptionsLink" type="text" selector="//table[contains(@class, 'edit-order-table')]//td[contains(@class, 'col-product')]//a[text() = '{{var1}}']" parameterized="true"/>
         <element name="productSkuColumn" type="text" selector=".edit-order-table .col-product .product-sku-block"/>
+        <element name="productTotal" type="text" selector="#order-items_grid .col-total"/>
         <element name="statusColumn" type="text" selector=".edit-order-table .col-status"/>
         <element name="originalPriceColumn" type="text" selector=".edit-order-table .col-original-price .price"/>
         <element name="priceColumn" type="text" selector=".edit-order-table .col-price .price"/>
@@ -35,4 +37,4 @@
         <element name="discountAmountColumn" type="text" selector=".edit-order-table .col-discont .price"/>
         <element name="totalColumn" type="text" selector=".edit-order-table .col-total .price"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/SalesSequence/Test/Mftf/Test/AdminConfProductAddedBySkuTest.xml b/app/code/Magento/SalesSequence/Test/Mftf/Test/AdminConfProductAddedBySkuTest.xml
new file mode 100644
index 0000000000000..1da3b924420fe
--- /dev/null
+++ b/app/code/Magento/SalesSequence/Test/Mftf/Test/AdminConfProductAddedBySkuTest.xml
@@ -0,0 +1,116 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminConfProductAddedBySkuTest">
+        <annotations>
+            <features value="SalesSequence"/>
+            <title value="Check that Configurable product added by SKU to an Order"/>
+            <description value="Check that Configurable product added by SKU to an Order"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-97251"/>
+            <useCaseId value="MAGETWO-91696"/>
+            <group value="SalesSequence"/>
+        </annotations>
+        <before>
+            <!--create new Category-->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <!--one Configurable product is created-->
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="createSimpleUsCustomer"/>
+
+            <!--Login to admin-->
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <!--Log out-->
+            <actionGroup ref="logout" stepKey="logout"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleUsCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+        </after>
+
+        <!--Create new order-->
+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="CreateNewOrder">
+            <argument name="customer" value="Simple_US_Customer"/>
+        </actionGroup>
+
+        <!--Click on "Add products by SKU" button > Type SKU > And add it to order without qty value-->
+        <click selector="{{AdminOrderFormItemsOrderedSection.addProductsBySku}}" stepKey="clickAddProductsBySKUButton"/>
+        <waitForElementVisible stepKey="waitForElementVisible" selector="{{AdminOrderFormItemsSection.skuNumber('0')}}"/>
+        <fillField selector="{{AdminOrderFormItemsSection.skuNumber('0')}}" stepKey="typeCreatedProductGroupSKU" userInput="$$createConfigProduct.sku$$"/>
+        <pressKey selector="{{AdminOrderFormItemsSection.skuNumber('0')}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressKey2"/>
+
+        <!--Click on "Configure" button-->
+        <waitForElementVisible stepKey="waitForConfigureButtonBySkuAppeared" selector="{{AdminOrderFormItemsOrderedSection.configureButtonBySku}}"/>
+        <click selector="{{AdminOrderFormItemsOrderedSection.configureButtonBySku}}" stepKey="clickConfigureButtonBySKUButton"/>
+
+        <!--Choose an Option, click on "Ok" button-->
+        <waitForElementVisible stepKey="waitForConfigureProductFrameVisible" selector="{{AdminOrderFormItemsOrderedSection.configureProductOk}}"/>
+        <selectOption selector="{{AdminOrderFormItemsOrderedSection.configureSelectAttribute}}" userInput="option1" stepKey="selectOption1" after="waitForConfigureProductFrameVisible"/>
+
+        <click selector="{{AdminOrderFormItemsOrderedSection.configureProductOk}}" stepKey="clickConfigureProductFrameOkButton"/>
+        <waitForPageLoad stepKey="waitForSavedConfigure"/>
+
+        <!--Click on "Add Products to Order" button-->
+        <click selector="{{AdminOrderFormItemsOrderedSection.addProductToOrder}}" stepKey="clickAddProductToOrderButton"/>
+        <waitForPageLoad stepKey="waitForProductAdded"/>
+        <seeInCurrentUrl url="{{AdminOrderProcessDataPage.url}}" stepKey="seeOnOrderProcessDataPage"/>
+
+        <!--Verify that Product successfully added to items-->
+        <see selector="{{AdminOrderItemsOrderedSection.productName}}" userInput="$$createConfigProduct.name$$" stepKey="grabSkuAddedProduct"/>
+        <grabTextFrom selector="{{AdminOrderItemsOrderedSection.productTotal}}" stepKey="grabAddedProductTotalCount"/>
+
+        <assertEquals stepKey="assertToMakeSureThatProductSuccessfullyAdded">
+            <actualResult type="variable">$grabAddedProductTotalCount</actualResult>
+            <expectedResult type="string">Total 1 product(s)</expectedResult>
+        </assertEquals>
+    </test>
+</tests>

From 2654a22254a1841a10b69c23bd46092a4dbe9c1e Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Wed, 9 Jan 2019 12:39:06 +0300
Subject: [PATCH 04/38] MAGETWO-97311: 2.3 only - creating attribute option
 value using API returns unexpected response

- Clear attribte options after saving attribute.
---
 .../Catalog/Model/ResourceModel/Eav/Attribute.php    |  3 +++
 .../Model/Entity/Attribute/Source/AbstractSource.php | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
index 707ebbb2964cc..40c5282ccf766 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
@@ -236,6 +236,9 @@ public function afterSave()
         ) {
             $this->_indexerEavProcessor->markIndexerAsInvalid();
         }
+        if ($this->_source !== null) {
+            $this->_source->clearOptions();
+        }
 
         return parent::afterSave();
     }
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
index 0991b3f9f4b23..974a070c27535 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
@@ -80,6 +80,8 @@ public function getOptionText($value)
     }
 
     /**
+     * Get option id.
+     *
      * @param string $value
      * @return null|string
      */
@@ -93,6 +95,16 @@ public function getOptionId($value)
         return null;
     }
 
+    /**
+     * Clear cached options.
+     *
+     * @return void
+     */
+    public function clearOptions() : void
+    {
+        $this->_options = null;
+    }
+
     /**
      * Add Value Sort To Collection Select
      *

From b53f1208ddc2c2d2eecfd17a681a7ff92dfd66d8 Mon Sep 17 00:00:00 2001
From: Yauhen_Lyskavets <yauhen_lyskavets@epam.com>
Date: Wed, 9 Jan 2019 15:42:04 +0300
Subject: [PATCH 05/38] MAGETWO-59055: Can't Create New Attribute from Product

- Attribute store labels fix.
---
 .../Model/Product/Attribute/DataProvider.php  | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/DataProvider.php b/app/code/Magento/Catalog/Model/Product/Attribute/DataProvider.php
index 2bb10d3b31a24..893000544a728 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/DataProvider.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/DataProvider.php
@@ -113,27 +113,28 @@ private function customizeAttributeCode($meta)
      */
     private function customizeFrontendLabels($meta)
     {
+        $labelConfigs = [];
+
         foreach ($this->storeRepository->getList() as $store) {
             $storeId = $store->getId();
 
             if (!$storeId) {
                 continue;
             }
-
-            $meta['manage-titles']['children'] = [
-                'frontend_label[' . $storeId . ']' => $this->arrayManager->set(
-                    'arguments/data/config',
-                    [],
-                    [
-                        'formElement' => Input::NAME,
-                        'componentType' => Field::NAME,
-                        'label' => $store->getName(),
-                        'dataType' => Text::NAME,
-                        'dataScope' => 'frontend_label[' . $storeId . ']'
-                    ]
-                ),
-            ];
+            $labelConfigs['frontend_label[' . $storeId . ']'] = $this->arrayManager->set(
+                'arguments/data/config',
+                [],
+                [
+                    'formElement' => Input::NAME,
+                    'componentType' => Field::NAME,
+                    'label' => $store->getName(),
+                    'dataType' => Text::NAME,
+                    'dataScope' => 'frontend_label[' . $storeId . ']'
+                ]
+            );
         }
+        $meta['manage-titles']['children'] = $labelConfigs;
+
         return $meta;
     }
 

From 4280d564187bc60303785c8e76169651886bc135 Mon Sep 17 00:00:00 2001
From: Lusine Papyan <Lusine_Papyan@epam.com>
Date: Tue, 15 Jan 2019 14:58:32 +0400
Subject: [PATCH 06/38] MAGETWO-91696: Configurable product type issue when
 adding to order

- Move test script from CE to EE
---
 .../Test/AdminConfProductAddedBySkuTest.xml   | 116 ------------------
 1 file changed, 116 deletions(-)
 delete mode 100644 app/code/Magento/SalesSequence/Test/Mftf/Test/AdminConfProductAddedBySkuTest.xml

diff --git a/app/code/Magento/SalesSequence/Test/Mftf/Test/AdminConfProductAddedBySkuTest.xml b/app/code/Magento/SalesSequence/Test/Mftf/Test/AdminConfProductAddedBySkuTest.xml
deleted file mode 100644
index 1da3b924420fe..0000000000000
--- a/app/code/Magento/SalesSequence/Test/Mftf/Test/AdminConfProductAddedBySkuTest.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminConfProductAddedBySkuTest">
-        <annotations>
-            <features value="SalesSequence"/>
-            <title value="Check that Configurable product added by SKU to an Order"/>
-            <description value="Check that Configurable product added by SKU to an Order"/>
-            <severity value="MAJOR"/>
-            <testCaseId value="MAGETWO-97251"/>
-            <useCaseId value="MAGETWO-91696"/>
-            <group value="SalesSequence"/>
-        </annotations>
-        <before>
-            <!--create new Category-->
-            <createData entity="ApiCategory" stepKey="createCategory"/>
-            <!--one Configurable product is created-->
-            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-                <requiredEntity createDataKey="createCategory"/>
-            </createData>
-            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-                <requiredEntity createDataKey="createConfigProductAttribute"/>
-            </createData>
-            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
-                <requiredEntity createDataKey="createConfigProductAttribute"/>
-            </createData>
-            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-                <requiredEntity createDataKey="createConfigProductAttribute"/>
-            </createData>
-            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
-                <requiredEntity createDataKey="createConfigProductAttribute"/>
-            </getData>
-            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
-                <requiredEntity createDataKey="createConfigProductAttribute"/>
-            </getData>
-            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
-                <requiredEntity createDataKey="createConfigProductAttribute"/>
-                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-            </createData>
-            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
-                <requiredEntity createDataKey="createConfigProductAttribute"/>
-                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-            </createData>
-            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
-                <requiredEntity createDataKey="createConfigProduct"/>
-                <requiredEntity createDataKey="createConfigProductAttribute"/>
-                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-            </createData>
-            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
-                <requiredEntity createDataKey="createConfigProduct"/>
-                <requiredEntity createDataKey="createConfigChildProduct1"/>
-            </createData>
-            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
-                <requiredEntity createDataKey="createConfigProduct"/>
-                <requiredEntity createDataKey="createConfigChildProduct2"/>
-            </createData>
-            <createData entity="Simple_US_Customer" stepKey="createSimpleUsCustomer"/>
-
-            <!--Login to admin-->
-            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-        </before>
-        <after>
-            <!--Log out-->
-            <actionGroup ref="logout" stepKey="logout"/>
-            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <deleteData createDataKey="createSimpleUsCustomer" stepKey="deleteCustomer"/>
-            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
-            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
-            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-        </after>
-
-        <!--Create new order-->
-        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="CreateNewOrder">
-            <argument name="customer" value="Simple_US_Customer"/>
-        </actionGroup>
-
-        <!--Click on "Add products by SKU" button > Type SKU > And add it to order without qty value-->
-        <click selector="{{AdminOrderFormItemsOrderedSection.addProductsBySku}}" stepKey="clickAddProductsBySKUButton"/>
-        <waitForElementVisible stepKey="waitForElementVisible" selector="{{AdminOrderFormItemsSection.skuNumber('0')}}"/>
-        <fillField selector="{{AdminOrderFormItemsSection.skuNumber('0')}}" stepKey="typeCreatedProductGroupSKU" userInput="$$createConfigProduct.sku$$"/>
-        <pressKey selector="{{AdminOrderFormItemsSection.skuNumber('0')}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressKey2"/>
-
-        <!--Click on "Configure" button-->
-        <waitForElementVisible stepKey="waitForConfigureButtonBySkuAppeared" selector="{{AdminOrderFormItemsOrderedSection.configureButtonBySku}}"/>
-        <click selector="{{AdminOrderFormItemsOrderedSection.configureButtonBySku}}" stepKey="clickConfigureButtonBySKUButton"/>
-
-        <!--Choose an Option, click on "Ok" button-->
-        <waitForElementVisible stepKey="waitForConfigureProductFrameVisible" selector="{{AdminOrderFormItemsOrderedSection.configureProductOk}}"/>
-        <selectOption selector="{{AdminOrderFormItemsOrderedSection.configureSelectAttribute}}" userInput="option1" stepKey="selectOption1" after="waitForConfigureProductFrameVisible"/>
-
-        <click selector="{{AdminOrderFormItemsOrderedSection.configureProductOk}}" stepKey="clickConfigureProductFrameOkButton"/>
-        <waitForPageLoad stepKey="waitForSavedConfigure"/>
-
-        <!--Click on "Add Products to Order" button-->
-        <click selector="{{AdminOrderFormItemsOrderedSection.addProductToOrder}}" stepKey="clickAddProductToOrderButton"/>
-        <waitForPageLoad stepKey="waitForProductAdded"/>
-        <seeInCurrentUrl url="{{AdminOrderProcessDataPage.url}}" stepKey="seeOnOrderProcessDataPage"/>
-
-        <!--Verify that Product successfully added to items-->
-        <see selector="{{AdminOrderItemsOrderedSection.productName}}" userInput="$$createConfigProduct.name$$" stepKey="grabSkuAddedProduct"/>
-        <grabTextFrom selector="{{AdminOrderItemsOrderedSection.productTotal}}" stepKey="grabAddedProductTotalCount"/>
-
-        <assertEquals stepKey="assertToMakeSureThatProductSuccessfullyAdded">
-            <actualResult type="variable">$grabAddedProductTotalCount</actualResult>
-            <expectedResult type="string">Total 1 product(s)</expectedResult>
-        </assertEquals>
-    </test>
-</tests>

From 17edb97dd8746b7eec2e2c83eb4e15a6183d6122 Mon Sep 17 00:00:00 2001
From: vprohorov <vitaliy_prokharau@epam.com>
Date: Thu, 8 Nov 2018 18:20:03 +0300
Subject: [PATCH 07/38] MC-10973: Simple product with MAP assigned to
 configurable should displays the same way as products with special price

- Adding configurable products to MAP
---
 .../Block/Product/View/Type/Configurable.php  |  5 ++
 .../Model/Product/Type/Configurable.php       | 18 ++++
 .../view/frontend/web/js/configurable.js      | 10 ++-
 app/code/Magento/Msrp/Helper/Data.php         |  4 +-
 .../base/templates/product/price/msrp.phtml   | 90 ++++++++++---------
 .../Magento/Msrp/view/base/web/js/msrp.js     | 56 +++++++++++-
 6 files changed, 131 insertions(+), 52 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
index 2502b79921e99..cf02b131011f9 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
@@ -314,6 +314,11 @@ protected function getOptionPrices()
                         ),
                     ],
                     'tierPrices' => $tierPrices,
+                    'msrpPrice' => [
+                        'amount' => $this->localeFormat->getNumber(
+                            $product->getMsrp()
+                        ),
+                    ],
                  ];
         }
         return $prices;
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index f98075f2294cc..49352c008b20f 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -1445,4 +1445,22 @@ function($attr) {
 
         return array_unique(array_merge($productAttributes, $requiredAttributes, $usedAttributes));
     }
+
+    /**
+     * Returns msrp for children products
+     *
+     * @param \Magento\Catalog\Model\Product $product
+     * @return int
+     */
+    public function getChildrenMsrp(\Magento\Catalog\Model\Product $product)
+    {
+        $prices = [];
+        foreach ($this->getUsedProducts($product) as $item) {
+            if ($item->getMsrp() !== null) {
+                $prices[] = $item->getMsrp();
+            }
+        }
+        return $prices ? min($prices) : 0;
+    }
+
 }
diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
index 6357bbd6c7c0c..60de8e713c079 100644
--- a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
+++ b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
@@ -589,7 +589,6 @@ define([
                     displayPrices[code].amount = newPrices[code].amount - displayPrices[code].amount;
                 }
             });
-
             return displayPrices;
         },
 
@@ -627,13 +626,11 @@ define([
          */
         _displayRegularPriceBlock: function (optionId) {
             var shouldBeShown = true;
-
             _.each(this.options.settings, function (element) {
                 if (element.value === '') {
                     shouldBeShown = false;
                 }
             });
-
             if (shouldBeShown &&
                 this.options.spConfig.optionPrices[optionId].oldPrice.amount !==
                 this.options.spConfig.optionPrices[optionId].finalPrice.amount
@@ -642,6 +639,13 @@ define([
             } else {
                 $(this.options.slyOldPriceSelector).hide();
             }
+
+            $(document).trigger('updateMsrpPriceBlock',
+                [
+                    optionId,
+                    this.options.spConfig.optionPrices,
+                ]
+            );
         },
 
         /**
diff --git a/app/code/Magento/Msrp/Helper/Data.php b/app/code/Magento/Msrp/Helper/Data.php
index b4ec34ebee19c..298130834a3df 100644
--- a/app/code/Magento/Msrp/Helper/Data.php
+++ b/app/code/Magento/Msrp/Helper/Data.php
@@ -155,7 +155,9 @@ public function isMinimalPriceLessMsrp($product)
         $msrp = $product->getMsrp();
         $price = $product->getPriceInfo()->getPrice(\Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE);
         if ($msrp === null) {
-            if ($product->getTypeId() !== \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE) {
+            if ($product->getTypeId() !== \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE
+                && $product->getTypeId() !== \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE)
+            {
                 return false;
             } else {
                 $msrp = $product->getTypeInstance()->getChildrenMsrp($product);
diff --git a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
index dd5abd433073d..0b44945c5a74c 100644
--- a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
+++ b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
@@ -20,8 +20,9 @@ $priceType = $block->getPrice();
 /** @var $product \Magento\Catalog\Model\Product */
 $product = $block->getSaleableItem();
 $productId = $product->getId();
+$amount = $product->getMsrp() ?: $product->getTypeInstance()->getChildrenMsrp($product);
 $msrpPrice = $block->renderAmount(
-    $priceType->getCustomAmount($product->getMsrp() ?: $product->getTypeInstance()->getChildrenMsrp($product)),
+    $priceType->getCustomAmount($amount),
     [
         'price_id' => $block->getPriceId() ? $block->getPriceId() : 'old-price-' . $productId,
         'include_container' => false,
@@ -29,54 +30,55 @@ $msrpPrice = $block->renderAmount(
     ]
 );
 $priceElementIdPrefix = $block->getPriceElementIdPrefix() ? $block->getPriceElementIdPrefix() : 'product-price-';
-
-$addToCartUrl = '';
-if ($product->isSaleable()) {
-    /** @var Magento\Catalog\Block\Product\AbstractProduct $addToCartUrlGenerator */
-    $addToCartUrlGenerator = $block->getLayout()->getBlockSingleton('Magento\Catalog\Block\Product\AbstractProduct');
-    $addToCartUrl = $addToCartUrlGenerator->getAddToCartUrl(
-        $product,
-        ['_query' => [
-            \Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED =>
-                $this->helper('Magento\Framework\Url\Helper\Data')->getEncodedUrl(
-                    $addToCartUrlGenerator->getAddToCartUrl($product)
-                ),
-        ]]
-    );
-}
 ?>
-<?php if ($product->getMsrp()): ?>
+
+<?php if ($amount): ?>
     <span class="old-price map-old-price"><?= /* @escapeNotVerified */ $msrpPrice ?></span>
 <?php endif; ?>
 
 <?php if ($priceType->isShowPriceOnGesture()): ?>
     <?php
-        $priceElementId = $priceElementIdPrefix . $productId . $block->getIdSuffix();
-        $popupId = 'msrp-popup-' . $productId . $block->getRandomString(20);
-        $data = ['addToCart' => [
-            'origin'=> 'msrp',
-            'popupId' => '#' . $popupId,
-            'productName' => $block->escapeJs($block->escapeHtml($product->getName())),
-            'productId' => $productId,
-            'productIdInput' => 'input[type="hidden"][name="product"]',
-            'realPrice' => $block->getRealPriceHtml(),
-            'isSaleable' => $product->isSaleable(),
-            'msrpPrice' => $msrpPrice,
-            'priceElementId' => $priceElementId,
-            'closeButtonId' => '#map-popup-close',
-            'addToCartUrl' => $addToCartUrl,
-            'paymentButtons' => '[data-label=or]'
-        ]];
-        if ($block->getRequest()->getFullActionName() === 'catalog_product_view') {
-            $data['addToCart']['addToCartButton'] = '#product_addtocart_form [type=submit]';
-        } else {
-            $data['addToCart']['addToCartButton'] = sprintf(
-                'form:has(input[type="hidden"][name="product"][value="%s"]) button[type="submit"]',
-                (int) $productId) . ',' .
-                sprintf('.block.widget .price-box[data-product-id=%s]+.product-item-actions button.tocart',
-                (int) $productId
-            );
-        }
+
+    $addToCartUrl = '';
+    if ($product->isSaleable()) {
+        /** @var Magento\Catalog\Block\Product\AbstractProduct $addToCartUrlGenerator */
+        $addToCartUrlGenerator = $block->getLayout()->getBlockSingleton('Magento\Catalog\Block\Product\AbstractProduct');
+        $addToCartUrl = $addToCartUrlGenerator->getAddToCartUrl(
+            $product,
+            ['_query' => [
+                \Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED =>
+                    $this->helper('Magento\Framework\Url\Helper\Data')->getEncodedUrl(
+                        $addToCartUrlGenerator->getAddToCartUrl($product)
+                    ),
+            ]]
+        );
+    }
+
+    $priceElementId = $priceElementIdPrefix . $productId . $block->getIdSuffix();
+    $popupId = 'msrp-popup-' . $productId . $block->getRandomString(20);
+    $data = ['addToCart' => [
+        'origin'=> 'msrp',
+        'popupId' => '#' . $popupId,
+        'productName' => $block->escapeJs($block->escapeHtml($product->getName())),
+        'productId' => $productId,
+        'productIdInput' => 'input[type="hidden"][name="product"]',
+        'realPrice' => $block->getRealPriceHtml(),
+        'isSaleable' => $product->isSaleable(),
+        'msrpPrice' => $msrpPrice,
+        'priceElementId' => $priceElementId,
+        'closeButtonId' => '#map-popup-close',
+        'addToCartUrl' => $addToCartUrl,
+        'paymentButtons' => '[data-label=or]'
+    ]];
+    if ($block->getRequest()->getFullActionName() === 'catalog_product_view') {
+        $data['addToCart']['addToCartButton'] = '#product_addtocart_form [type=submit]';
+    } else {
+        $data['addToCart']['addToCartButton'] = sprintf(
+            'form:has(input[type="hidden"][name="product"][value="%s"]) button[type="submit"]',
+            (int) $productId . ',' .
+            sprintf('.block.widget .price-box[data-product-id=%s]+.product-item-actions button.tocart',
+            (int) $productId));
+    }
     ?>
     <span id="<?= /* @escapeNotVerified */ $block->getPriceId() ? $block->getPriceId() : $priceElementId ?>" style="display:none"></span>
     <a href="javascript:void(0);"
@@ -100,4 +102,4 @@ if ($product->isSaleable()) {
                                      "productName": "<?= $block->escapeJs($block->escapeHtml($product->getName())) ?>",
                                      "closeButtonId": "#map-popup-close"}}'><span><?= /* @escapeNotVerified */ __("What's this?") ?></span>
     </a>
-<?php endif; ?>
+<?php endif; ?>
\ No newline at end of file
diff --git a/app/code/Magento/Msrp/view/base/web/js/msrp.js b/app/code/Magento/Msrp/view/base/web/js/msrp.js
index deeadd9b55b82..1360ebb0f28ac 100644
--- a/app/code/Magento/Msrp/view/base/web/js/msrp.js
+++ b/app/code/Magento/Msrp/view/base/web/js/msrp.js
@@ -4,11 +4,12 @@
  */
 define([
     'jquery',
+    'Magento_Catalog/js/price-utils',
     'underscore',
     'jquery/ui',
     'mage/dropdown',
     'mage/template'
-], function ($) {
+], function ($, priceUtils) {
     'use strict';
 
     $.widget('mage.addToCart', {
@@ -24,7 +25,10 @@ define([
             // Selectors
             cartForm: '.form.map.checkout',
             msrpLabelId: '#map-popup-msrp',
+            msrpPriceElement: '#map-popup-msrp .price-wrapper',
             priceLabelId: '#map-popup-price',
+            priceElement: '#map-popup-price .price',
+            oldPriceElement: '.old-price.map-old-price .price-wrapper',
             popUpAttr: '[data-role=msrp-popup-template]',
             popupCartButtonId: '#map-popup-button',
             paypalCheckoutButons: '[data-action=checkout-form-submit]',
@@ -59,6 +63,7 @@ define([
             shadowHinter: 'popup popup-pointer'
         },
         popupOpened: false,
+        wasOpened: false,
 
         /**
          * Creates widget instance
@@ -73,6 +78,7 @@ define([
                 this.initTierPopup();
             }
             $(this.options.cartButtonId).on('click', this._addToCartSubmit.bind(this));
+            $(document).on('updateMsrpPriceBlock', this.onUpdateMsrpPrice.bind(this));
         },
 
         /**
@@ -89,7 +95,7 @@ define([
 
             $msrpPopup.find('button')
                 .on('click',
-                this.handleMsrpAddToCart.bind(this))
+                    this.handleMsrpAddToCart.bind(this))
                 .filter(this.options.popupCartButtonId)
                 .text($(this.options.addToCartButton).text());
 
@@ -212,8 +218,11 @@ define([
             var options = this.tierOptions || this.options;
 
             this.popUpOptions.position.of = $(event.target);
-            this.$popup.find(this.options.msrpLabelId).html(options.msrpPrice);
-            this.$popup.find(this.options.priceLabelId).html(options.realPrice);
+            if (!this.wasOpened) {
+                this.$popup.find(this.options.msrpLabelId).html(options.msrpPrice);
+                this.$popup.find(this.options.priceLabelId).html(options.realPrice);
+                this.wasOpened = true;
+            }
             this.$popup.dropdownDialog(this.popUpOptions).dropdownDialog('open');
             this._toggle(this.$popup);
 
@@ -268,7 +277,46 @@ define([
             }
             $(this.options.cartForm).submit();
 
+        },
+
+        /**
+         * Call on event updatePrice. Proxy to updateMsrpPrice method.
+         *
+         * @param {Event} event
+         * @param {mixed} optionId
+         * @param {Object} prices
+         */
+        onUpdateMsrpPrice: function onUpdateMsrpPrice(event, optionId, prices) {
+            let useDefaultPrice = optionId === undefined;
+            let priceIndex = useDefaultPrice ? Object.keys(prices)[0] : optionId;
+            return this.updateMsrpPrice(
+                priceUtils.formatPrice(prices[priceIndex].finalPrice.amount),
+                priceUtils.formatPrice(prices[priceIndex].msrpPrice.amount),
+                useDefaultPrice
+            );
+        },
+
+        /**
+         * Update prices for configurable product with MSRP enabled
+         *
+         * @param {string} finalPrice
+         * @param {string} msrpPrice
+         * @param {boolean} useDefaultPrice
+         */
+        updateMsrpPrice: function (finalPrice, msrpPrice, useDefaultPrice) {
+            if (!this.wasOpened || useDefaultPrice) {
+                let options = this.tierOptions || this.options;
+                this.$popup.find(this.options.msrpLabelId).html(options.msrpPrice);
+                this.$popup.find(this.options.priceLabelId).html(options.realPrice);
+                this.wasOpened = true;
+            }
+            if (!useDefaultPrice) {
+                this.$popup.find(this.options.msrpPriceElement).html(msrpPrice);
+                this.$popup.find(this.options.priceElement).html(finalPrice);
+            }
+            $(this.options.oldPriceElement).html(msrpPrice);
         }
+
     });
 
     return $.mage.addToCart;

From f0bb8f08db1952319d13f97a2a3d73985098d687 Mon Sep 17 00:00:00 2001
From: Yurii Borysov <yurii_borysov@epam.com>
Date: Thu, 17 Jan 2019 00:58:32 +0200
Subject: [PATCH 08/38] MC-10973: Simple product with MAP assigned to
 configurable should displays the same way as products with special price

- Update UI to handle configurable products correctly
- Fix tests
- Fix JS code style issues
---
 .../Block/Product/View/Type/Configurable.php  |  4 +
 .../Product/View/Type/ConfigurableTest.php    |  3 +
 app/code/Magento/Msrp/Helper/Data.php         | 12 +--
 .../base/templates/product/price/msrp.phtml   |  1 +
 .../Magento/Msrp/view/base/web/js/msrp.js     | 84 +++++++++++++++----
 .../Magento_Msrp/web/css/source/_module.less  |  5 ++
 6 files changed, 87 insertions(+), 22 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
index cf02b131011f9..e07879e93a6b4 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
@@ -15,6 +15,8 @@
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 
 /**
+ * Confugurable product view type
+ *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
@@ -276,6 +278,8 @@ protected function getOptionImages()
     }
 
     /**
+     * Collect price options
+     *
      * @return array
      */
     protected function getOptionPrices()
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php
index 25d8412c91056..c5c2368720b98 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php
@@ -379,6 +379,9 @@ private function getExpectedArray($productId, $amount, $priceQty, $percentage):
                             'percentage' => $percentage,
                         ],
                     ],
+                    'msrpPrice' => [
+                        'amount' => null    ,
+                    ]
                 ],
             ],
             'priceFormat' => [],
diff --git a/app/code/Magento/Msrp/Helper/Data.php b/app/code/Magento/Msrp/Helper/Data.php
index 298130834a3df..218d26239e243 100644
--- a/app/code/Magento/Msrp/Helper/Data.php
+++ b/app/code/Magento/Msrp/Helper/Data.php
@@ -70,8 +70,7 @@ public function __construct(
     }
 
     /**
-     * Check if can apply Minimum Advertise price to product
-     * in specific visibility
+     * Check if can apply Minimum Advertise price to product in specific visibility
      *
      * @param int|Product $product
      * @param int|null $visibility Check displaying price in concrete place (by default generally)
@@ -135,6 +134,8 @@ public function isShowPriceOnGesture($product)
     }
 
     /**
+     * Check if we should show MAP proce before order confirmation
+     *
      * @param int|Product $product
      * @return bool
      */
@@ -144,6 +145,8 @@ public function isShowBeforeOrderConfirm($product)
     }
 
     /**
+     * Check if any MAP price is larger than as low as value.
+     *
      * @param int|Product $product
      * @return bool|float
      */
@@ -155,9 +158,8 @@ public function isMinimalPriceLessMsrp($product)
         $msrp = $product->getMsrp();
         $price = $product->getPriceInfo()->getPrice(\Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE);
         if ($msrp === null) {
-            if ($product->getTypeId() !== \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE
-                && $product->getTypeId() !== \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE)
-            {
+            if ($product->getTypeId()       !== \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE
+                && $product->getTypeId() !== \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE) {
                 return false;
             } else {
                 $msrp = $product->getTypeInstance()->getChildrenMsrp($product);
diff --git a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
index 0b44945c5a74c..8af659a5172b3 100644
--- a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
+++ b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
@@ -34,6 +34,7 @@ $priceElementIdPrefix = $block->getPriceElementIdPrefix() ? $block->getPriceElem
 
 <?php if ($amount): ?>
     <span class="old-price map-old-price"><?= /* @escapeNotVerified */ $msrpPrice ?></span>
+    <span class="map-fallback-price normal-price"><?= /* @escapeNotVerified */ $msrpPrice ?></span>
 <?php endif; ?>
 
 <?php if ($priceType->isShowPriceOnGesture()): ?>
diff --git a/app/code/Magento/Msrp/view/base/web/js/msrp.js b/app/code/Magento/Msrp/view/base/web/js/msrp.js
index 1360ebb0f28ac..b1d83431e2fb4 100644
--- a/app/code/Magento/Msrp/view/base/web/js/msrp.js
+++ b/app/code/Magento/Msrp/view/base/web/js/msrp.js
@@ -9,7 +9,7 @@ define([
     'jquery/ui',
     'mage/dropdown',
     'mage/template'
-], function ($, priceUtils) {
+], function ($, priceUtils, _) {
     'use strict';
 
     $.widget('mage.addToCart', {
@@ -28,7 +28,11 @@ define([
             msrpPriceElement: '#map-popup-msrp .price-wrapper',
             priceLabelId: '#map-popup-price',
             priceElement: '#map-popup-price .price',
-            oldPriceElement: '.old-price.map-old-price .price-wrapper',
+            mapInfoLinks: ".map-show-info",
+            displayPriceElement: '.old-price.map-old-price .price-wrapper',
+            fallbackPriceElement: '.normal-price.fallback-price .price-wrapper',
+            displayPriceContainer: '.old-price.map-old-price',
+            fallbackPriceContainer: '.normal-price.map-fallback-price',
             popUpAttr: '[data-role=msrp-popup-template]',
             popupCartButtonId: '#map-popup-button',
             paypalCheckoutButons: '[data-action=checkout-form-submit]',
@@ -67,6 +71,7 @@ define([
 
         /**
          * Creates widget instance
+         *
          * @private
          */
         _create: function () {
@@ -83,6 +88,7 @@ define([
 
         /**
          * Init msrp popup
+         *
          * @private
          */
         initMsrpPopup: function () {
@@ -110,6 +116,7 @@ define([
 
         /**
          * Init info popup
+         *
          * @private
          */
         initInfoPopup: function () {
@@ -232,6 +239,7 @@ define([
         },
 
         /**
+         * Toggle MAP popup visibility
          *
          * @param {HTMLElement} $elem
          * @private
@@ -248,6 +256,7 @@ define([
         },
 
         /**
+         * Close MAP information popup
          *
          * @param {HTMLElement} $elem
          */
@@ -286,14 +295,36 @@ define([
          * @param {mixed} optionId
          * @param {Object} prices
          */
-        onUpdateMsrpPrice: function onUpdateMsrpPrice(event, optionId, prices) {
-            let useDefaultPrice = optionId === undefined;
-            let priceIndex = useDefaultPrice ? Object.keys(prices)[0] : optionId;
-            return this.updateMsrpPrice(
-                priceUtils.formatPrice(prices[priceIndex].finalPrice.amount),
-                priceUtils.formatPrice(prices[priceIndex].msrpPrice.amount),
-                useDefaultPrice
-            );
+        onUpdateMsrpPrice: function onUpdateMsrpPrice(event, priceIndex, prices) {
+
+            var defaultMsrp = _.chain(prices).map(function (price) {
+                return price.msrpPrice.amount;
+            }).reject(function (p) {
+                return p === null
+            }).min().value();
+
+            var defaultPrice = _.chain(prices).map(function (p) {
+                return p.finalPrice.amount
+            }).min().value();
+
+            if (typeof priceIndex !== "undefined") {
+                var msrpPrice = prices[priceIndex].msrpPrice.amount;
+
+                if(msrpPrice !== null) {
+                    this.updateMsrpPrice(
+                        priceUtils.formatPrice(prices[priceIndex].finalPrice.amount),
+                        priceUtils.formatPrice(prices[priceIndex].msrpPrice.amount),
+                        false);
+                } else {
+                    this.updateNonMsrpPrice(
+                        priceUtils.formatPrice(prices[priceIndex].finalPrice.amount));
+                }
+            } else {
+                this.updateMsrpPrice(
+                    priceUtils.formatPrice(defaultPrice),
+                    priceUtils.formatPrice(defaultMsrp),
+                    true);
+            }
         },
 
         /**
@@ -304,17 +335,36 @@ define([
          * @param {boolean} useDefaultPrice
          */
         updateMsrpPrice: function (finalPrice, msrpPrice, useDefaultPrice) {
-            if (!this.wasOpened || useDefaultPrice) {
-                let options = this.tierOptions || this.options;
-                this.$popup.find(this.options.msrpLabelId).html(options.msrpPrice);
-                this.$popup.find(this.options.priceLabelId).html(options.realPrice);
-                this.wasOpened = true;
+            var options = this.tierOptions || this.options;
+            $(this.options.fallbackPriceContainer).hide();
+            $(this.options.displayPriceContainer).show();
+            $(this.options.mapInfoLinks).show();
+
+            if(useDefaultPrice || !this.wasOpened) {
+                    this.$popup.find(this.options.msrpLabelId).html(options.msrpPrice);
+                    this.$popup.find(this.options.priceLabelId).html(options.realPrice);
+                    $(this.options.displayPriceElement).html(msrpPrice);
+                    this.wasOpened = true;
             }
-            if (!useDefaultPrice) {
+
+            if(!useDefaultPrice) {
                 this.$popup.find(this.options.msrpPriceElement).html(msrpPrice);
                 this.$popup.find(this.options.priceElement).html(finalPrice);
+                $(this.options.displayPriceElement).html(msrpPrice);
             }
-            $(this.options.oldPriceElement).html(msrpPrice);
+        },
+
+        /**
+         * Display non MAP price for irrelevant products
+         *
+         * @param {string} price
+         */
+        updateNonMsrpPrice: function(price) {
+            var options = this.tierOptions || this.options;
+            $(this.options.fallbackPriceElement).html(price);
+            $(this.options.displayPriceContainer).hide();
+            $(this.options.mapInfoLinks).hide();
+            $(this.options.fallbackPriceContainer).show();
         }
 
     });
diff --git a/app/design/frontend/Magento/blank/Magento_Msrp/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Msrp/web/css/source/_module.less
index f0dd8a957e9b5..d292feae7b98d 100644
--- a/app/design/frontend/Magento/blank/Magento_Msrp/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Msrp/web/css/source/_module.less
@@ -55,6 +55,11 @@
         }
     }
 
+    .map-fallback-price {
+        display: none;
+    }
+
+
     .map-old-price {
         text-decoration: none;
 

From 342cbfb0d610db808bef5d328c1f2005b8d99685 Mon Sep 17 00:00:00 2001
From: Lusine Papyan <Lusine_Papyan@epam.com>
Date: Tue, 22 Jan 2019 11:28:57 +0400
Subject: [PATCH 09/38] MAGETWO-59055: Can't Create New Attribute from Product

- Add automated test script
---
 .../AdminProductAttributeActionGroup.xml      | 35 ++++++++++
 .../AdminProductFormAttributeSection.xml      | 24 +++++++
 .../Mftf/Section/AdminProductFormSection.xml  |  5 ++
 ...AdminCreateNewAttributeFromProductTest.xml | 68 +++++++++++++++++++
 4 files changed, 132 insertions(+)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateNewAttributeFromProductTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
index 80cadbb6571f2..e28d8d439aa1a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
@@ -30,6 +30,41 @@
         <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="navigateToAttributeEditPage3" />
         <waitForPageLoad stepKey="waitForPageLoad3" />
     </actionGroup>
+
+    <actionGroup name="AdminCreateAttributeFromProductPage">
+        <arguments>
+            <argument name="attributeName" type="string"/>
+            <argument name="attributeType" type="string" defaultValue="TextField"/>
+        </arguments>
+        <click selector="{{AdminProductFormSection.addAttributeBtn}}" stepKey="clickAddAttributeBtn"/>
+        <see userInput="Select Attribute" stepKey="checkNewAttributePopUpAppeared"/>
+        <click selector="{{AdminProductFormAttributeSection.createNewAttribute}}" stepKey="clickCreateNewAttribute"/>
+        <fillField selector="{{AdminProductFormNewAttributeSection.attributeLabel}}" userInput="{{attributeName}}" stepKey="fillAttributeLabel"/>
+        <selectOption selector="{{AdminProductFormNewAttributeSection.attributeType}}" userInput="{{attributeType}}" stepKey="selectAttributeType"/>
+        <click selector="{{AdminProductFormNewAttributeSection.saveAttribute}}" stepKey="saveAttribute"/>
+    </actionGroup>
+
+    <actionGroup name="AdminCreateAttributeWithValueWithTwoStoreViesFromProductPage" extends="AdminCreateAttributeFromProductPage">
+        <remove keyForRemoval="saveAttribute"/>
+        <arguments>
+            <argument name="firstStoreViewName" type="string"/>
+            <argument name="secondStoreViewName" type="string"/>
+        </arguments>
+        <click selector="{{AdminProductFormNewAttributeSection.addValue}}" stepKey="addValue" after="selectAttributeType"/>
+        <seeElement selector="{{AdminProductFormNewAttributeSection.optionViewName(firstStoreViewName))}}" stepKey="seeFirstStoreView"/>
+        <seeElement selector="{{AdminProductFormNewAttributeSection.optionViewName(firstStoreViewName))}}" stepKey="seeSecondStoreView"/>
+        <fillField selector="{{AdminProductFormNewAttributeSection.optionValue('1'))}}" userInput="default" stepKey="fillDefaultStoreView"/>
+        <fillField selector="{{AdminProductFormNewAttributeSection.optionValue('2'))}}" userInput="admin" stepKey="fillAdminStoreView"/>
+        <fillField selector="{{AdminProductFormNewAttributeSection.optionValue('3'))}}" userInput="view1" stepKey="fillFirstStoreView"/>
+        <fillField selector="{{AdminProductFormNewAttributeSection.optionValue('4'))}}" userInput="view2" stepKey="fillSecondStoreView"/>
+
+        <!--Check store view in Manage Titles section-->
+        <click selector="{{AdminProductFormNewAttributeSection.manageTitlesHeader}}" stepKey="openManageTitlesSection"/>
+        <seeElement selector="{{AdminProductFormNewAttributeSection.manageTitlesViewName(customStoreEN.name)}}" stepKey="seeFirstStoreViewName"/>
+        <seeElement selector="{{AdminProductFormNewAttributeSection.manageTitlesViewName(customStoreFR.name)}}" stepKey="seeSecondStoreViewName"/>
+        <click selector="{{AdminProductFormNewAttributeSection.saveAttribute}}" stepKey="saveAttribute1"/>
+    </actionGroup>
+
     <actionGroup name="changeUseForPromoRuleConditionsProductAttribute">
         <arguments>
             <argument name="option" type="string"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection.xml
new file mode 100644
index 0000000000000..e159a4ce5c0b6
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection.xml
@@ -0,0 +1,24 @@
+<?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="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductFormAttributeSection">
+        <element name="createNewAttribute" type="button" selector="//button[@data-index='add_new_attribute_button']" timeout="30"/>
+    </section>
+    <section name="AdminProductFormNewAttributeSection">
+        <element name="attributeLabel" type="button" selector="//input[@name='frontend_label[0]']" timeout="30"/>
+        <element name="attributeType" type="select" selector="//select[@name='frontend_input']" timeout="30"/>
+        <element name="addValue" type="button" selector="//button[@data-action='add_new_row']" timeout="30"/>
+        <element name="optionViewName" type="text" selector="//table[@data-index='attribute_options_select']//span[contains(text(), '{{arg}}')]" parameterized="true" timeout="30"/>
+        <element name="optionValue" type="input" selector="(//input[contains(@name, 'option[value]')])[{{arg}}]" timeout="30" parameterized="true"/>
+        <element name="manageTitlesHeader" type="button" selector="//div[@class='fieldset-wrapper-title']//span[contains(text(), 'Manage Titles')]" timeout="30/"/>
+        <element name="manageTitlesViewName" type="text" selector="//div[@data-index='manage-titles']//span[contains(text(), '{{arg}}')]" timeout="30" parameterized="true"/>
+        <element name="saveAttribute" type="button" selector="button#save" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
index 5791d0bfedab9..8d0083474f612 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
@@ -177,4 +177,9 @@
         <element name="specialPrice" type="input" selector="input[name='product[special_price]']"/>
         <element name="doneButton" type="button" selector=".product_form_product_form_advanced_pricing_modal button.action-primary"/>
     </section>
+    <section name="AdminProductAttributeSection">
+        <element name="attributeSectionHeader" type="button" selector="//div[@data-index='attributes']" timeout="30"/>
+        <element name="dropDownAttribute" type="select" selector="//select[@name='product[{{arg}}]']" parameterized="true" timeout="30"/>
+        <element name="attributeSection" type="div" selector="//div[@data-index='attributes']/div[contains(@class, 'admin__collapsible-content _show')]" timeout="30"/>
+    </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateNewAttributeFromProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateNewAttributeFromProductTest.xml
new file mode 100644
index 0000000000000..282331924bca3
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateNewAttributeFromProductTest.xml
@@ -0,0 +1,68 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateNewAttributeFromProductTest">
+        <annotations>
+            <features value="Catalog"/>
+            <title value="Check that New Attribute from Product is create"/>
+            <description value="Check that New Attribute from Product is create"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-12296"/>
+            <useCaseId value="MAGETWO-59055"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+
+            <!--Create product-->
+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
+        </before>
+        <after>
+            <!--Delete create data-->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+
+            <!--Delete store views-->
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteFirstStoreView">
+                <argument name="customStore" value="customStoreEN"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteSecondStoreView">
+                <argument name="customStore" value="customStoreFR"/>
+            </actionGroup>
+
+            <!--Delete Attribute-->
+            <actionGroup ref="deleteProductAttribute" stepKey="deleteAttribute">
+                <argument name="ProductAttribute" value="productDropDownAttribute"/>
+            </actionGroup>
+
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Create 2 store views-->
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createFirstStoreView">
+            <argument name="customStore" value="customStoreEN"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createSecondStoreView">
+            <argument name="customStore" value="customStoreFR"/>
+        </actionGroup>
+
+        <!--Go to created product page and create new attribute-->
+        <amOnPage url="{{AdminProductEditPage.url($$createProduct.id$$)}}" stepKey="openAdminEditPage"/>
+        <actionGroup ref="AdminCreateAttributeWithValueWithTwoStoreViesFromProductPage" stepKey="createAttribute">
+            <argument name="attributeName" value="{{productDropDownAttribute.attribute_code}}"/>
+            <argument name="attributeType" value="Dropdown"/>
+            <argument name="firstStoreViewName" value="{{customStoreEN.name}}"/>
+            <argument name="secondStoreViewName" value="{{customStoreFR.name}}"/>
+        </actionGroup>
+
+        <!--Check attribute existence in product page attribute section-->
+        <conditionalClick selector="{{AdminProductAttributeSection.attributeSectionHeader}}" dependentSelector="{{AdminProductAttributeSection.attributeSection}}" visible="false" stepKey="openAttributeSection"/>
+        <seeElement selector="{{AdminProductAttributeSection.dropDownAttribute(productDropDownAttribute.attribute_code)}}" stepKey="seeNewAttributeInProductPage"/>
+    </test>
+</tests>

From bdb10fb43a8acbce72ed02f63c9646cf6510d4c8 Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Tue, 22 Jan 2019 12:59:54 +0300
Subject: [PATCH 10/38] MC-10971: [Magento Cloud] - Unable to Scope Catalog
 Price rules by custom product attribute

- Added possibility to use 'is undefined' filter in rule conditions;
---
 .../EavAttributeCondition.php                 | 50 +++++++++++++------
 .../ConditionsToSearchCriteriaMapper.php      | 15 ++++++
 .../Model/Rule/Condition/Product.php          |  8 +--
 .../Model/Condition/AbstractCondition.php     |  5 +-
 .../Magento/Rule/view/adminhtml/web/rules.js  | 22 ++++++++
 5 files changed, 79 insertions(+), 21 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/EavAttributeCondition.php b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/EavAttributeCondition.php
index d3c84e69c9540..e296c8d3b8978 100644
--- a/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/EavAttributeCondition.php
+++ b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/EavAttributeCondition.php
@@ -58,22 +58,38 @@ public function build(Filter $filter): string
         $conditionValue = $this->mapConditionValue($conditionType, $filter->getValue());
 
         // NOTE: store scope was ignored intentionally to perform search across all stores
-        $attributeSelect = $this->resourceConnection->getConnection()
-            ->select()
-            ->from(
-                [$tableAlias => $attribute->getBackendTable()],
-                $tableAlias . '.' . $attribute->getEntityIdField()
-            )->where(
-                $this->resourceConnection->getConnection()->prepareSqlCondition(
-                    $tableAlias . '.' . $attribute->getIdFieldName(),
-                    ['eq' => $attribute->getAttributeId()]
-                )
-            )->where(
-                $this->resourceConnection->getConnection()->prepareSqlCondition(
-                    $tableAlias . '.value',
-                    [$conditionType => $conditionValue]
-                )
-            );
+        if ($conditionType == 'is_null') {
+            $entityResourceModel = $attribute->getEntity();
+            $attributeSelect = $this->resourceConnection->getConnection()
+                ->select()
+                ->from(
+                    [Collection::MAIN_TABLE_ALIAS => $entityResourceModel->getEntityTable()],
+                    Collection::MAIN_TABLE_ALIAS . '.' . $entityResourceModel->getEntityIdField()
+                )->joinLeft(
+                    [$tableAlias => $attribute->getBackendTable()],
+                    $tableAlias . '.' . $attribute->getEntityIdField() . '=' . Collection::MAIN_TABLE_ALIAS .
+                    '.' . $entityResourceModel->getEntityIdField() . ' AND ' . $tableAlias . '.' .
+                    $attribute->getIdFieldName() . '=' . $attribute->getAttributeId(),
+                    ''
+                )->where($tableAlias . '.value is null');
+        } else {
+            $attributeSelect = $this->resourceConnection->getConnection()
+                ->select()
+                ->from(
+                    [$tableAlias => $attribute->getBackendTable()],
+                    $tableAlias . '.' . $attribute->getEntityIdField()
+                )->where(
+                    $this->resourceConnection->getConnection()->prepareSqlCondition(
+                        $tableAlias . '.' . $attribute->getIdFieldName(),
+                        ['eq' => $attribute->getAttributeId()]
+                    )
+                )->where(
+                    $this->resourceConnection->getConnection()->prepareSqlCondition(
+                        $tableAlias . '.value',
+                        [$conditionType => $conditionValue]
+                    )
+                );
+        }
 
         return $this->resourceConnection
             ->getConnection()
@@ -86,6 +102,8 @@ public function build(Filter $filter): string
     }
 
     /**
+     * Get attribute entity by its code
+     *
      * @param string $field
      * @return Attribute
      * @throws \Magento\Framework\Exception\LocalizedException
diff --git a/app/code/Magento/CatalogRule/Model/Rule/Condition/ConditionsToSearchCriteriaMapper.php b/app/code/Magento/CatalogRule/Model/Rule/Condition/ConditionsToSearchCriteriaMapper.php
index 6d343fe149d21..fabe504fbe31c 100644
--- a/app/code/Magento/CatalogRule/Model/Rule/Condition/ConditionsToSearchCriteriaMapper.php
+++ b/app/code/Magento/CatalogRule/Model/Rule/Condition/ConditionsToSearchCriteriaMapper.php
@@ -71,6 +71,8 @@ public function mapConditionsToSearchCriteria(CombinedCondition $conditions): Se
     }
 
     /**
+     * Convert condition to filter group
+     *
      * @param ConditionInterface $condition
      * @return null|\Magento\Framework\Api\CombinedFilterGroup|\Magento\Framework\Api\Filter
      * @throws InputException
@@ -89,6 +91,8 @@ private function mapConditionToFilterGroup(ConditionInterface $condition)
     }
 
     /**
+     * Convert combined condition to filter group
+     *
      * @param Combine $combinedCondition
      * @return null|\Magento\Framework\Api\CombinedFilterGroup
      * @throws InputException
@@ -121,6 +125,8 @@ private function mapCombinedConditionToFilterGroup(CombinedCondition $combinedCo
     }
 
     /**
+     * Convert simple condition to filter group
+     *
      * @param ConditionInterface $productCondition
      * @return FilterGroup|Filter
      * @throws InputException
@@ -139,6 +145,8 @@ private function mapSimpleConditionToFilterGroup(ConditionInterface $productCond
     }
 
     /**
+     * Convert simple condition with array value to filter group
+     *
      * @param ConditionInterface $productCondition
      * @return FilterGroup
      * @throws InputException
@@ -161,6 +169,8 @@ private function processSimpleConditionWithArrayValue(ConditionInterface $produc
     }
 
     /**
+     * Get glue for multiple values by operator
+     *
      * @param string $operator
      * @return string
      */
@@ -211,6 +221,8 @@ private function reverseSqlOperatorInFilter(Filter $filter)
     }
 
     /**
+     * Convert filters array into combined filter group
+     *
      * @param array $filters
      * @param string $combinationMode
      * @return FilterGroup
@@ -227,6 +239,8 @@ private function createCombinedFilterGroup(array $filters, string $combinationMo
     }
 
     /**
+     * Creating of filter object by filtering params
+     *
      * @param string $field
      * @param string $value
      * @param string $conditionType
@@ -264,6 +278,7 @@ private function mapRuleOperatorToSQLCondition(string $ruleOperator): string
             '!{}' => 'nlike', // does not contains
             '()' => 'in',    // is one of
             '!()' => 'nin',   // is not one of
+            '<=>' => 'is_null'
         ];
 
         if (!array_key_exists($ruleOperator, $operatorsMap)) {
diff --git a/app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php b/app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php
index ab650c94a0f08..0db178b2a0a6d 100644
--- a/app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php
+++ b/app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php
@@ -4,12 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Catalog Rule Product Condition data model
- */
 namespace Magento\CatalogRule\Model\Rule\Condition;
 
 /**
+ * Catalog Rule Product Condition data model
+ *
  * @method string getAttribute() Returns attribute code
  */
 class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
@@ -29,6 +28,9 @@ public function validate(\Magento\Framework\Model\AbstractModel $model)
 
         $oldAttrValue = $model->getData($attrCode);
         if ($oldAttrValue === null) {
+            if ($this->getOperator() === '<=>') {
+                return true;
+            }
             return false;
         }
 
diff --git a/app/code/Magento/Rule/Model/Condition/AbstractCondition.php b/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
index d2be99757df47..6729fe722de56 100644
--- a/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
+++ b/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
@@ -106,8 +106,8 @@ public function getDefaultOperatorInputByType()
                 'string' => ['==', '!=', '>=', '>', '<=', '<', '{}', '!{}', '()', '!()'],
                 'numeric' => ['==', '!=', '>=', '>', '<=', '<', '()', '!()'],
                 'date' => ['==', '>=', '<='],
-                'select' => ['==', '!='],
-                'boolean' => ['==', '!='],
+                'select' => ['==', '!=', '<=>'],
+                'boolean' => ['==', '!=', '<=>'],
                 'multiselect' => ['{}', '!{}', '()', '!()'],
                 'grid' => ['()', '!()'],
             ];
@@ -137,6 +137,7 @@ public function getDefaultOperatorOptions()
                 '!{}' => __('does not contain'),
                 '()' => __('is one of'),
                 '!()' => __('is not one of'),
+                '<=>' => __('is undefined'),
             ];
         }
         return $this->_defaultOperatorOptions;
diff --git a/app/code/Magento/Rule/view/adminhtml/web/rules.js b/app/code/Magento/Rule/view/adminhtml/web/rules.js
index 8e36562ebd7fe..202337c39da35 100644
--- a/app/code/Magento/Rule/view/adminhtml/web/rules.js
+++ b/app/code/Magento/Rule/view/adminhtml/web/rules.js
@@ -101,6 +101,9 @@ define([
 
                     if (!elem.multiple) {
                         Event.observe(elem, 'change', this.hideParamInputField.bind(this, container));
+
+                        this.changeVisibilityForValueRuleParam(elem);
+
                     }
                     Event.observe(elem, 'blur', this.hideParamInputField.bind(this, container));
                 }
@@ -262,6 +265,8 @@ define([
                     label.innerHTML = str != '' ? str : '...';
                 }
 
+                this.changeVisibilityForValueRuleParam(elem);
+
                 elem = Element.down(container, 'input.input-text');
 
                 if (elem) {
@@ -293,6 +298,23 @@ define([
             this.shownElement = null;
         },
 
+        changeVisibilityForValueRuleParam: function(elem) {
+            let parsedElementId = elem.id.split('__');
+            if (parsedElementId[2] != 'operator') {
+                return false;
+            }
+
+            let valueElement = jQuery('#' + parsedElementId[0] + '__' + parsedElementId[1] + '__value');
+
+            if(elem.value == '<=>') {
+                valueElement.closest('.rule-param').hide();
+            } else {
+                valueElement.closest('.rule-param').show();
+            }
+
+            return true;
+        },
+
         addRuleNewChild: function (elem) {
             var parent_id = elem.id.replace(/^.*__(.*)__.*$/, '$1');
             var children_ul_id = elem.id.replace(/__/g, ':').replace(/[^:]*$/, 'children').replace(/:/g, '__');

From c1ac1ffc0d2309f822b659fc31c406f30a93ec95 Mon Sep 17 00:00:00 2001
From: Yurii Borysov <yurii_borysov@epam.com>
Date: Fri, 18 Jan 2019 16:47:36 +0200
Subject: [PATCH 11/38] MC-10973: Simple product with MAP assigned to
 configurable should displays the same way as products with special price

- Fix tests
- Fix swatch issue
---
 .../Model/Product/Type/Configurable.php       |  2 +-
 .../view/frontend/web/js/configurable.js      |  5 +++-
 app/code/Magento/Msrp/composer.json           |  1 +
 .../Magento/Msrp/view/base/web/js/msrp.js     | 25 +++++++++++--------
 .../view/frontend/web/js/swatch-renderer.js   |  9 ++++++-
 .../Magento_Msrp/web/css/source/_module.less  |  1 -
 6 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index 49352c008b20f..cf5feb3670bab 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -1385,7 +1385,7 @@ function ($item) {
      */
     private function getUsedProductsCacheKey($keyParts)
     {
-        return md5(implode('_', $keyParts));
+        return sha1(implode('_', $keyParts));
     }
 
     /**
diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
index 60de8e713c079..0a3b4a93f3d45 100644
--- a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
+++ b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
@@ -589,6 +589,7 @@ define([
                     displayPrices[code].amount = newPrices[code].amount - displayPrices[code].amount;
                 }
             });
+
             return displayPrices;
         },
 
@@ -626,11 +627,13 @@ define([
          */
         _displayRegularPriceBlock: function (optionId) {
             var shouldBeShown = true;
+
             _.each(this.options.settings, function (element) {
                 if (element.value === '') {
                     shouldBeShown = false;
                 }
             });
+
             if (shouldBeShown &&
                 this.options.spConfig.optionPrices[optionId].oldPrice.amount !==
                 this.options.spConfig.optionPrices[optionId].finalPrice.amount
@@ -643,7 +646,7 @@ define([
             $(document).trigger('updateMsrpPriceBlock',
                 [
                     optionId,
-                    this.options.spConfig.optionPrices,
+                    this.options.spConfig.optionPrices
                 ]
             );
         },
diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json
index 6e7bf61063a2a..e3099aa2f14d6 100644
--- a/app/code/Magento/Msrp/composer.json
+++ b/app/code/Magento/Msrp/composer.json
@@ -11,6 +11,7 @@
         "magento/module-downloadable": "*",
         "magento/module-eav": "*",
         "magento/module-grouped-product": "*",
+        "magento/module-configurable-product": "*",
         "magento/module-store": "*",
         "magento/module-tax": "*"
     },
diff --git a/app/code/Magento/Msrp/view/base/web/js/msrp.js b/app/code/Magento/Msrp/view/base/web/js/msrp.js
index b1d83431e2fb4..ca10c3f90fa16 100644
--- a/app/code/Magento/Msrp/view/base/web/js/msrp.js
+++ b/app/code/Magento/Msrp/view/base/web/js/msrp.js
@@ -28,9 +28,9 @@ define([
             msrpPriceElement: '#map-popup-msrp .price-wrapper',
             priceLabelId: '#map-popup-price',
             priceElement: '#map-popup-price .price',
-            mapInfoLinks: ".map-show-info",
+            mapInfoLinks: '.map-show-info',
             displayPriceElement: '.old-price.map-old-price .price-wrapper',
-            fallbackPriceElement: '.normal-price.fallback-price .price-wrapper',
+            fallbackPriceElement: '.normal-price.map-fallback-price .price-wrapper',
             displayPriceContainer: '.old-price.map-old-price',
             fallbackPriceContainer: '.normal-price.map-fallback-price',
             popUpAttr: '[data-role=msrp-popup-template]',
@@ -225,6 +225,7 @@ define([
             var options = this.tierOptions || this.options;
 
             this.popUpOptions.position.of = $(event.target);
+
             if (!this.wasOpened) {
                 this.$popup.find(this.options.msrpLabelId).html(options.msrpPrice);
                 this.$popup.find(this.options.priceLabelId).html(options.realPrice);
@@ -292,23 +293,27 @@ define([
          * Call on event updatePrice. Proxy to updateMsrpPrice method.
          *
          * @param {Event} event
-         * @param {mixed} optionId
+         * @param {mixed} priceIndex
          * @param {Object} prices
          */
         onUpdateMsrpPrice: function onUpdateMsrpPrice(event, priceIndex, prices) {
 
-            var defaultMsrp = _.chain(prices).map(function (price) {
+            var defaultMsrp,
+                defaultPrice,
+                msrpPrice;
+
+            defaultMsrp = _.chain(prices).map(function (price) {
                 return price.msrpPrice.amount;
             }).reject(function (p) {
-                return p === null
+                return p === null;
             }).min().value();
 
-            var defaultPrice = _.chain(prices).map(function (p) {
-                return p.finalPrice.amount
+            defaultPrice = _.chain(prices).map(function (p) {
+                return p.finalPrice.amount;
             }).min().value();
 
-            if (typeof priceIndex !== "undefined") {
-                var msrpPrice = prices[priceIndex].msrpPrice.amount;
+            if (typeof priceIndex !== 'undefined') {
+                msrpPrice = prices[priceIndex].msrpPrice.amount;
 
                 if(msrpPrice !== null) {
                     this.updateMsrpPrice(
@@ -336,6 +341,7 @@ define([
          */
         updateMsrpPrice: function (finalPrice, msrpPrice, useDefaultPrice) {
             var options = this.tierOptions || this.options;
+
             $(this.options.fallbackPriceContainer).hide();
             $(this.options.displayPriceContainer).show();
             $(this.options.mapInfoLinks).show();
@@ -360,7 +366,6 @@ define([
          * @param {string} price
          */
         updateNonMsrpPrice: function(price) {
-            var options = this.tierOptions || this.options;
             $(this.options.fallbackPriceElement).html(price);
             $(this.options.displayPriceContainer).hide();
             $(this.options.mapInfoLinks).hide();
diff --git a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
index 938028f62502d..b03c41544fed8 100644
--- a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
+++ b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
@@ -493,7 +493,7 @@ define([
                 return '';
             }
 
-            $.each(config.options, function () {
+            $.each(config.options, function (index) {
                 var id,
                     type,
                     value,
@@ -523,6 +523,7 @@ define([
                 label = this.label ? this.label : '';
                 attr =
                     ' id="' + controlId + '-item-' + id + '"' +
+                    ' index="' + index +'"' +
                     ' aria-checked="false"' +
                     ' aria-describedby="' + controlId + '"' +
                     ' tabindex="0"' +
@@ -745,6 +746,12 @@ define([
                 $widget._UpdatePrice();
             }
 
+            $(document).trigger('updateMsrpPriceBlock',
+                [
+                    parseInt($this.attr('index')) + 1,
+                    $widget.options.jsonConfig.optionPrices
+                ]);
+
             $widget._loadMedia();
             $input.trigger('change');
         },
diff --git a/app/design/frontend/Magento/blank/Magento_Msrp/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Msrp/web/css/source/_module.less
index d292feae7b98d..6e2069c6e88ef 100644
--- a/app/design/frontend/Magento/blank/Magento_Msrp/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Msrp/web/css/source/_module.less
@@ -59,7 +59,6 @@
         display: none;
     }
 
-
     .map-old-price {
         text-decoration: none;
 

From d718d97b6df3bec1205423c7c7c696637d4e60a6 Mon Sep 17 00:00:00 2001
From: Yurii Borysov <yurii_borysov@epam.com>
Date: Wed, 23 Jan 2019 17:20:15 +0200
Subject: [PATCH 12/38] MC-10973: Simple product with MAP assigned to
 configurable should displays the same way as products with special price

- Customizable product MAP price should be max msrp of child products
- Non-msrp price was not hidden within luma theme
---
 .../ConfigurableProduct/Model/Product/Type/Configurable.php   | 2 +-
 app/code/Magento/Msrp/view/base/web/js/msrp.js                | 2 +-
 .../Magento/luma/Magento_Msrp/web/css/source/_module.less     | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index cf5feb3670bab..e69240dcfeb13 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -1460,7 +1460,7 @@ public function getChildrenMsrp(\Magento\Catalog\Model\Product $product)
                 $prices[] = $item->getMsrp();
             }
         }
-        return $prices ? min($prices) : 0;
+        return $prices ? max($prices) : 0;
     }
 
 }
diff --git a/app/code/Magento/Msrp/view/base/web/js/msrp.js b/app/code/Magento/Msrp/view/base/web/js/msrp.js
index ca10c3f90fa16..906e7a52b8168 100644
--- a/app/code/Magento/Msrp/view/base/web/js/msrp.js
+++ b/app/code/Magento/Msrp/view/base/web/js/msrp.js
@@ -306,7 +306,7 @@ define([
                 return price.msrpPrice.amount;
             }).reject(function (p) {
                 return p === null;
-            }).min().value();
+            }).max().value();
 
             defaultPrice = _.chain(prices).map(function (p) {
                 return p.finalPrice.amount;
diff --git a/app/design/frontend/Magento/luma/Magento_Msrp/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Msrp/web/css/source/_module.less
index 112184b45fe86..475361c56afc8 100644
--- a/app/design/frontend/Magento/luma/Magento_Msrp/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Msrp/web/css/source/_module.less
@@ -74,6 +74,10 @@
         }
     }
 
+    .map-fallback-price {
+        display: none;
+    }
+
     .map-old-price,
     .product-item .map-old-price,
     .product-info-price .map-show-info {

From f1d5d0b832fa7f44f0d091b83339d0579c6a11b8 Mon Sep 17 00:00:00 2001
From: Yurii Borysov <yurii_borysov@epam.com>
Date: Thu, 24 Jan 2019 17:32:48 +0200
Subject: [PATCH 13/38] MC-10973: Simple product with MAP assigned to
 configurable should displays the same way as products with special price

- Final price should be preffered to available if larger than defined msrp
- Minor code style fix
---
 app/code/Magento/Msrp/view/base/web/js/msrp.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Msrp/view/base/web/js/msrp.js b/app/code/Magento/Msrp/view/base/web/js/msrp.js
index 906e7a52b8168..c086a799889b7 100644
--- a/app/code/Magento/Msrp/view/base/web/js/msrp.js
+++ b/app/code/Magento/Msrp/view/base/web/js/msrp.js
@@ -300,7 +300,8 @@ define([
 
             var defaultMsrp,
                 defaultPrice,
-                msrpPrice;
+                msrpPrice,
+                finalPrice;
 
             defaultMsrp = _.chain(prices).map(function (price) {
                 return price.msrpPrice.amount;
@@ -314,15 +315,15 @@ define([
 
             if (typeof priceIndex !== 'undefined') {
                 msrpPrice = prices[priceIndex].msrpPrice.amount;
+                finalPrice = prices[priceIndex].finalPrice.amount;
 
-                if(msrpPrice !== null) {
+                if(msrpPrice === null || msrpPrice <= finalPrice) {
+                    this.updateNonMsrpPrice(priceUtils.formatPrice(finalPrice));
+                } else {
                     this.updateMsrpPrice(
-                        priceUtils.formatPrice(prices[priceIndex].finalPrice.amount),
-                        priceUtils.formatPrice(prices[priceIndex].msrpPrice.amount),
+                        priceUtils.formatPrice(finalPrice),
+                        priceUtils.formatPrice(msrpPrice),
                         false);
-                } else {
-                    this.updateNonMsrpPrice(
-                        priceUtils.formatPrice(prices[priceIndex].finalPrice.amount));
                 }
             } else {
                 this.updateMsrpPrice(

From 8b5d3b69c0f49c280f7f789b441e2245dfc3a055 Mon Sep 17 00:00:00 2001
From: Yurii Borysov <yurii_borysov@epam.com>
Date: Mon, 28 Jan 2019 17:18:14 +0200
Subject: [PATCH 14/38] MC-4981: Changing Number of Products To Display
 Requires Cache Refresh

- Update cache key to reflect the update in products count field properly
---
 app/code/Magento/CatalogWidget/Block/Product/ProductsList.php    | 1 +
 .../CatalogWidget/Test/Unit/Block/Product/ProductsListTest.php   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
index 2b95de24d0201..d79c598ebddc4 100644
--- a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
+++ b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
@@ -179,6 +179,7 @@ public function getCacheKeyInfo()
             $this->httpContext->getValue(\Magento\Customer\Model\Context::CONTEXT_GROUP),
             (int) $this->getRequest()->getParam($this->getData('page_var_name'), 1),
             $this->getProductsPerPage(),
+            $this->getProductsCount(),
             $conditions,
             $this->json->serialize($this->getRequest()->getParams()),
             $this->getTemplate(),
diff --git a/app/code/Magento/CatalogWidget/Test/Unit/Block/Product/ProductsListTest.php b/app/code/Magento/CatalogWidget/Test/Unit/Block/Product/ProductsListTest.php
index 5de8b9d9632fc..3c0276ae9d367 100644
--- a/app/code/Magento/CatalogWidget/Test/Unit/Block/Product/ProductsListTest.php
+++ b/app/code/Magento/CatalogWidget/Test/Unit/Block/Product/ProductsListTest.php
@@ -167,6 +167,7 @@ public function testGetCacheKeyInfo()
             'context_group',
             1,
             5,
+            10,
             'some_serialized_conditions',
             json_encode('request_params'),
             'test_template',

From 56745922ccd6ad1b464c505558c6ac57f44ab2ab Mon Sep 17 00:00:00 2001
From: Nikita Chubukov <nikita_chubukov@epam.com>
Date: Thu, 31 Jan 2019 09:28:08 +0300
Subject: [PATCH 15/38] MC-5906: The order of product SKU is not respected

- Added order by conditions for product collection
---
 .../Rule/Model/Condition/Sql/Builder.php      | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Rule/Model/Condition/Sql/Builder.php b/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
index 6267e30a7a6d5..5b182162ce5fc 100644
--- a/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
+++ b/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
@@ -250,8 +250,24 @@ public function attachConditionToCollection(
         $this->_joinTablesToCollection($collection, $combine);
         $whereExpression = (string)$this->_getMappedSqlCombination($combine);
         if (!empty($whereExpression)) {
-            // Select ::where method adds braces even on empty expression
-            $collection->getSelect()->where($whereExpression);
+            if (!empty($combine->getConditions())) {
+                foreach ($combine->getConditions() as $condition) {
+                    $conditions = $condition->getData()['value'];
+                    $attribute = $condition->getData()['attribute'];
+                }
+                if (!empty($conditions)) {
+                    $conditions = explode(',', $conditions);
+                    foreach ($conditions as &$condition) {
+                        $condition = "'" . trim($condition) . "'";
+                    }
+                    $conditions = implode(', ', $conditions);
+                }
+
+                $collection->getSelect()->where($whereExpression)->order("FIELD($attribute, $conditions)");
+            } else {
+                // Select ::where method adds braces even on empty expression
+                $collection->getSelect()->where($whereExpression);
+            }
         }
     }
 }

From 1a80de4c73092912ce785292d2cda7108ffcc5cb Mon Sep 17 00:00:00 2001
From: Lusine Papyan <Lusine_Papyan@epam.com>
Date: Thu, 31 Jan 2019 17:57:10 +0400
Subject: [PATCH 16/38] MC-10973: Simple product with MAP assigned to
 configurable should displays the same way as products with special price

- Add automated test script
---
 ...AdminProductFormAdvancedPricingSection.xml |   1 +
 .../StorefrontProductInfoMainSection.xml      |   2 +
 .../Msrp/Test/Mftf/Data/MsrpSettingsData.xml  |  24 +++
 .../Test/Mftf/Metadata/msrp_settings-meta.xml |  21 +++
 ...hMapAssignedConfigProductIsCorrectTest.xml | 161 ++++++++++++++++++
 5 files changed, 209 insertions(+)
 create mode 100644 app/code/Magento/Msrp/Test/Mftf/Data/MsrpSettingsData.xml
 create mode 100644 app/code/Magento/Msrp/Test/Mftf/Metadata/msrp_settings-meta.xml
 create mode 100644 app/code/Magento/Msrp/Test/Mftf/Test/StorefrontProductWithMapAssignedConfigProductIsCorrectTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
index 0a1804aa284dc..697648cedb7ba 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
@@ -20,6 +20,7 @@
         <element name="productTierPricePercentageValuePriceInput" type="input" selector="[name='product[tier_price][{{var1}}][percentage_value]']" parameterized="true"/>
         <element name="specialPrice" type="input" selector="input[name='product[special_price]']"/>
         <element name="doneButton" type="button" selector=".product_form_product_form_advanced_pricing_modal button.action-primary" timeout="5"/>
+        <element name="msrp" type="input" selector="//input[@name='product[msrp]']" timeout="30"/>
         <element name="save" type="button" selector="#save-button"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index 5fa2262faba96..d72dec071ac3c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -29,6 +29,8 @@
         <element name="productOptionFile" type="file" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'OptionFile')]/../div[@class='control']//input[@type='file']" parameterized="true"/>
         <element name="productOptionSelect" type="select" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{var1}}')]/../div[@class='control']//select" parameterized="true"/>
         <element name="specialPriceValue" type="text" selector="//span[@class='special-price']//span[@class='price']"/>
+        <element name="mapPrice" type="text" selector="//div[@class='price-box price-final_price']//span[contains(@class, 'price-msrp_price')]"/>
+        <element name="clickForPriceLink" type="text" selector="//div[@class='price-box price-final_price']//a[contains(text(), 'Click for price')]"/>
 
 
         <!-- The parameter is the nth custom option that you want to get -->
diff --git a/app/code/Magento/Msrp/Test/Mftf/Data/MsrpSettingsData.xml b/app/code/Magento/Msrp/Test/Mftf/Data/MsrpSettingsData.xml
new file mode 100644
index 0000000000000..3922bb4868914
--- /dev/null
+++ b/app/code/Magento/Msrp/Test/Mftf/Data/MsrpSettingsData.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="MsrpEnableMAP" type="msrp_settings_config">
+        <requiredEntity type="enabled">EnableMAP</requiredEntity>
+    </entity>
+    <entity name="EnableMAP" type="msrp_settings_config">
+        <data key="value">1</data>
+    </entity>
+
+    <entity name="MsrpDisableMAP" type="msrp_settings_config">
+        <requiredEntity type="enabled">DisableMAP</requiredEntity>
+    </entity>
+    <entity name="DisableMAP" type="msrp_settings_config">
+        <data key="value">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Msrp/Test/Mftf/Metadata/msrp_settings-meta.xml b/app/code/Magento/Msrp/Test/Mftf/Metadata/msrp_settings-meta.xml
new file mode 100644
index 0000000000000..be91a548ad909
--- /dev/null
+++ b/app/code/Magento/Msrp/Test/Mftf/Metadata/msrp_settings-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="MsrpSettingsConfig" dataType="msrp_settings_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/sales/" method="POST">
+        <object key="groups" dataType="msrp_settings_config">
+            <object key="msrp" dataType="msrp_settings_config">
+                <object key="fields" dataType="msrp_settings_config">
+                    <object key="enabled" dataType="enabled">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
\ No newline at end of file
diff --git a/app/code/Magento/Msrp/Test/Mftf/Test/StorefrontProductWithMapAssignedConfigProductIsCorrectTest.xml b/app/code/Magento/Msrp/Test/Mftf/Test/StorefrontProductWithMapAssignedConfigProductIsCorrectTest.xml
new file mode 100644
index 0000000000000..48792336c5f2c
--- /dev/null
+++ b/app/code/Magento/Msrp/Test/Mftf/Test/StorefrontProductWithMapAssignedConfigProductIsCorrectTest.xml
@@ -0,0 +1,161 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontProductWithMapAssignedConfigProductIsCorrectTest">
+        <annotations>
+            <features value="Msrp"/>
+            <title value="Check that simple products with MAP assigned to configurable product displayed correctly"/>
+            <description value="Check that simple products with MAP assigned to configurable product displayed correctly"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-12292"/>
+            <useCaseId value="MC-10973"/>
+            <group value="Msrp"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!--Create category-->
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+
+            <!-- Create the configurable product based on the data in the /data folder -->
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!-- Make the configurable product have two options, that are children of the default attribute set -->
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption3" stepKey="createConfigProductAttributeOption3">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="3" stepKey="getConfigAttributeOption3">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+
+            <!-- Create the 2 children that will be a part of the configurable product -->
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <field key="price">50.00</field>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <field key="price">60.00</field>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="SimpleOne" stepKey="createConfigChildProduct3">
+                <field key="price">70.00</field>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption3"/>
+            </createData>
+
+            <!-- Assign the two products to the configurable product -->
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+                <requiredEntity createDataKey="getConfigAttributeOption3"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild3">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct3"/>
+            </createData>
+
+            <!--Enable Minimum advertised Price-->
+            <createData entity="MsrpEnableMAP" stepKey="enableMAP"/>
+        </before>
+        <after>
+            <!--Delete created data-->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigChildProduct3" stepKey="deleteConfigChildProduct3"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+
+            <!--Disable Minimum advertised Price-->
+            <createData entity="MsrpDisableMAP" stepKey="disableMAP"/>
+
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+
+        <!-- Set Manufacturer's Suggested Retail Price to products-->
+        <amOnPage url="{{AdminProductEditPage.url($$createConfigChildProduct1.id$$)}}" stepKey="goToFirstChildProductEditPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.msrp}}" stepKey="waitForMsrp"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.msrp}}" userInput="55" stepKey="setMsrpForFirstChildProduct"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct1"/>
+
+        <amOnPage url="{{AdminProductEditPage.url($$createConfigChildProduct2.id$$)}}" stepKey="goToSecondChildProductEditPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad1"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton1"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.msrp}}" stepKey="waitForMsrp1"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.msrp}}" userInput="66" stepKey="setMsrpForSecondChildProduct"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton1"/>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <!--Clear cache-->
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
+        <!--Go to store front and check msrp for products-->
+        <amOnPage url="{{StorefrontProductPage.url($$createConfigProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToConfigProductPage"/>
+        <waitForPageLoad stepKey="waitForLoadConfigProductPage"/>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.mapPrice}}" stepKey="grabMapPrice"/>
+        <assertEquals expected='$66.00' expectedType="string" actual="($grabMapPrice)" stepKey="assertMapPrice"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.clickForPriceLink}}" stepKey="checkClickForPriceLink"/>
+
+        <!--Check msrp for second child product-->
+        <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="$$getConfigAttributeOption2.value$$" stepKey="selectSecondOption"/>
+        <waitForElement selector="{{StorefrontProductInfoMainSection.mapPrice}}" stepKey="waitForLoad"/>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.mapPrice}}" stepKey="grabSecondProductMapPrice"/>
+        <assertEquals expected='$66.00' expectedType="string" actual="($grabSecondProductMapPrice)" stepKey="assertSecondProductMapPrice"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.clickForPriceLink}}" stepKey="checkClickForPriceLinkForSecondProduct"/>
+
+        <!--Check msrp for first child product-->
+        <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="$$getConfigAttributeOption1.value$$" stepKey="selectFirstOption"/>
+        <waitForElement selector="{{StorefrontProductInfoMainSection.mapPrice}}" stepKey="waitForLoad1"/>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.mapPrice}}" stepKey="grabFirstProductMapPrice"/>
+        <assertEquals expected='$55.00' expectedType="string" actual="($grabFirstProductMapPrice)" stepKey="assertFirstProductMapPrice"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.clickForPriceLink}}" stepKey="checkClickForPriceLinkForFirstProduct"/>
+
+        <!--Check price for third child product-->
+        <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="$$getConfigAttributeOption3.value$$" stepKey="selectThirdOption"/>
+        <waitForElement selector="{{StorefrontProductInfoMainSection.mapPrice}}" stepKey="waitForLoad2"/>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="grabThirdProductMapPrice"/>
+        <assertEquals expected='$70.00' expectedType="string" actual="($grabThirdProductMapPrice)" stepKey="assertThirdProductMapPrice"/>
+        <dontSeeElement selector="{{StorefrontProductInfoMainSection.clickForPriceLink}}" stepKey="checkClickForPriceLinkForThirdProduct"/>
+    </test>
+</tests>

From 9f8456b567f902b73566569f2b17c71dce69a9ac Mon Sep 17 00:00:00 2001
From: Lusine Papyan <Lusine_Papyan@epam.com>
Date: Fri, 1 Feb 2019 16:28:28 +0400
Subject: [PATCH 17/38] MC-10971: [Magento Cloud] - Unable to Scope Catalog
 Price rules by custom product attribute

- Add automated test script;
---
 .../Test/Mftf/Data/ProductAttributeData.xml   |  21 +++
 .../CatalogPriceRuleActionGroup.xml           |  32 +++++
 .../Test/Mftf/Data/CatalogRuleData.xml        |  17 +++
 .../AdminNewCatalogPriceRuleSection.xml       |   2 +
 ...tributeIsUndefinedCatalogPriceRuleTest.xml | 129 ++++++++++++++++++
 5 files changed, 201 insertions(+)
 create mode 100644 app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
index b367cdcab9d8b..4ba9eb8ea9b61 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
@@ -115,4 +115,25 @@
         <data key="used_for_sort_by">true</data>
         <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
     </entity>
+    <entity name="productYesNoAttribute" type="ProductAttribute">
+        <data key="attribute_code" unique="suffix">attribute</data>
+        <data key="frontend_input">boolean</data>
+        <data key="scope">global</data>
+        <data key="is_required">false</data>
+        <data key="is_unique">false</data>
+        <data key="is_searchable">true</data>
+        <data key="is_visible">true</data>
+        <data key="is_visible_in_advanced_search">true</data>
+        <data key="is_visible_on_front">true</data>
+        <data key="is_filterable">true</data>
+        <data key="is_filterable_in_search">true</data>
+        <data key="used_in_product_listing">true</data>
+        <data key="is_used_for_promo_rules">true</data>
+        <data key="is_comparable">true</data>
+        <data key="is_used_in_grid">true</data>
+        <data key="is_visible_in_grid">true</data>
+        <data key="is_filterable_in_grid">true</data>
+        <data key="used_for_sort_by">true</data>
+        <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
+    </entity>
 </entities>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
index fe4042e8a2e9f..113820efdf253 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
@@ -36,6 +36,38 @@
         <waitForPageLoad stepKey="waitForApplied"/>
     </actionGroup>
 
+
+    <actionGroup name="createCatalogPriceRule">
+        <arguments>
+            <argument name="catalogRule" defaultValue="_defaultCatalogRule"/>
+        </arguments>
+
+        <click stepKey="addNewRule" selector="{{AdminGridMainControls.add}}"/>
+        <fillField selector="{{AdminNewCatalogPriceRule.ruleName}}" userInput="{{catalogRule.name}}"  stepKey="fillName" />
+        <fillField selector="{{AdminNewCatalogPriceRule.description}}" userInput="{{catalogRule.description}}" stepKey="fillDescription" />
+        <click selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}" stepKey="selectActive" />
+        <selectOption selector="{{AdminNewCatalogPriceRule.websites}}" parameterArray="{{catalogRule.website_ids}}" stepKey="selectSite" />
+        <selectOption selector="{{AdminNewCatalogPriceRule.customerGroups}}" parameterArray="{{catalogRule.customer_group_ids}}" stepKey="selectCustomerGroup" />
+        <click stepKey="openActionDropdown" selector="{{AdminNewCatalogPriceRule.actionsTab}}"/>
+        <fillField stepKey="fillDiscountValue" selector="{{AdminNewCatalogPriceRuleActions.discountAmount}}" userInput="{{catalogRule.discount_amount}}"/>
+    </actionGroup>
+
+    <actionGroup name="CreateCatalogPriceRuleConditionWithAttribute">
+        <arguments>
+            <argument name="attributeName" type="string"/>
+            <argument name="targetValue" type="string"/>
+            <argument name="targetSelectValue" type="string"/>
+        </arguments>
+
+        <click selector="{{AdminNewCatalogPriceRule.conditionsTab}}" stepKey="openConditionsTab"/>
+        <waitForPageLoad stepKey="waitForConditionTabOpened"/>
+        <click selector="{{AdminNewCatalogPriceRuleConditions.newCondition}}" stepKey="addNewCondition"/>
+        <selectOption selector="{{AdminNewCatalogPriceRuleConditions.conditionSelect('1')}}" userInput="{{attributeName}}" stepKey="selectTypeCondition"/>
+        <waitForElement selector="{{AdminNewCatalogPriceRuleConditions.targetEllipsisValue('1', targetValue)}}" stepKey="waitForIsTarget"/>
+        <click selector="{{AdminNewCatalogPriceRuleConditions.targetEllipsisValue('1', 'is')}}" stepKey="clickOnIs"/>
+        <selectOption selector="{{AdminNewCatalogPriceRuleConditions.targetSelect('1')}}" userInput="{{targetSelectValue}}" stepKey="selectTargetCondition"/>
+    </actionGroup>
+
     <!-- Apply all of the saved catalog price rules -->
     <actionGroup name="applyCatalogPriceRules">
         <amOnPage stepKey="goToPriceRulePage" url="{{CatalogRulePage.url}}"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Data/CatalogRuleData.xml b/app/code/Magento/CatalogRule/Test/Mftf/Data/CatalogRuleData.xml
index 71bdfe0613bb7..5b75708d1ae0a 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Data/CatalogRuleData.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Data/CatalogRuleData.xml
@@ -77,4 +77,21 @@
         <data key="simple_action">by_percent</data>
         <data key="discount_amount">96</data>
     </entity>
+
+    <entity name="CatalogRuleWithAllCustomerGroups" type="catalogRule">
+        <data key="name" unique="suffix">CatalogPriceRule</data>
+        <data key="description">Catalog Price Rule Description</data>
+        <data key="is_active">1</data>
+        <array key="customer_group_ids">
+            <item>0</item>
+            <item>1</item>
+            <item>2</item>
+            <item>3</item>
+        </array>
+        <array key="website_ids">
+            <item>1</item>
+        </array>
+        <data key="simple_action">by_percent</data>
+        <data key="discount_amount">10</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminNewCatalogPriceRuleSection.xml b/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminNewCatalogPriceRuleSection.xml
index 7cfb5bf40be55..635260888e7fb 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminNewCatalogPriceRuleSection.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminNewCatalogPriceRuleSection.xml
@@ -41,6 +41,8 @@
         <element name="newCondition" type="button" selector=".rule-param.rule-param-new-child"/>
         <element name="conditionSelect" type="select" selector="select#conditions__{{var}}__new_child" parameterized="true"/>
         <element name="targetEllipsis" type="button" selector="//li[{{var}}]//a[@class='label'][text() = '...']" parameterized="true"/>
+        <element name="targetEllipsisValue" type="button" selector="//ul[@id='conditions__{{var}}__children']//a[contains(text(), '{{var1}}')]" parameterized="true" timeout="30"/>
+        <element name="targetSelect" type="select" selector="//ul[@id='conditions__{{var}}__children']//select" parameterized="true" timeout="30"/>
         <element name="targetInput" type="input" selector="input#conditions__{{var1}}--{{var2}}__value" parameterized="true"/>
         <element name="applyButton" type="button" selector="#conditions__{{var1}}__children li:nth-of-type({{var2}}) a.rule-param-apply" parameterized="true"/>
     </section>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml
new file mode 100644
index 0000000000000..11c7b671ed407
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml
@@ -0,0 +1,129 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminEnableAttributeIsUndefinedCatalogPriceRuleTest">
+        <annotations>
+            <features value="CatalogRule"/>
+            <title value="Enable 'is undefined' condition to Scope Catalog Price rules by custom product attribute"/>
+            <description value="Enable 'is undefined' condition to Scope Catalog Price rules by custom product attribute"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-13654"/>
+            <useCaseId value="MC-10971"/>
+            <group value="CatalogRule"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+
+            <createData entity="CatalogRuleWithAllCustomerGroups" stepKey="createCatalogPriceRule"/>
+            <createData entity="ApiCategory" stepKey="createFirstCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createFirstProduct">
+                <requiredEntity createDataKey="createFirstCategory"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createSecondProduct">
+                <requiredEntity createDataKey="createFirstCategory"/>
+            </createData>
+            <createData entity="productYesNoAttribute" stepKey="createProductAttribute"/>
+            <createData entity="AddToDefaultSet" stepKey="addToAttributeSetHandle">
+                <requiredEntity createDataKey="createProductAttribute"/>
+            </createData>
+
+            <createData entity="SimpleSubCategory" stepKey="createSecondCategory"/>
+            <createData entity="SimpleProduct3" stepKey="createThirdProduct">
+                <requiredEntity createDataKey="createSecondCategory"/>
+            </createData>
+            <createData entity="SimpleProduct4" stepKey="createForthProduct">
+                <requiredEntity createDataKey="createSecondCategory"/>
+            </createData>
+            <createData entity="productDropDownAttribute" stepKey="createSecondProductAttribute">
+                <field key="scope">website</field>
+            </createData>
+        </before>
+        <after>
+
+            <!--Delete created data-->
+            <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToCatalogPriceRulePage"/>
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule">
+                <argument name="name" value="{{CatalogRuleWithAllCustomerGroups.name}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
+            </actionGroup>
+            <click stepKey="resetFilters" selector="{{AdminSecondaryGridSection.resetFilters}}"/>
+            <deleteData createDataKey="createFirstProduct" stepKey="deleteFirstProduct"/>
+            <deleteData createDataKey="createSecondProduct" stepKey="deleteSecondProduct"/>
+            <deleteData createDataKey="createFirstCategory" stepKey="deleteFirstCategory"/>
+            <deleteData createDataKey="createThirdProduct" stepKey="deleteThirdProduct"/>
+            <deleteData createDataKey="createForthProduct" stepKey="deleteForthProduct"/>
+            <deleteData createDataKey="createSecondCategory" stepKey="deleteSecondCategory"/>
+            <deleteData createDataKey="createSecondProductAttribute" stepKey="deleteSecondProductAttribute"/>
+
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Create catalog price rule-->
+        <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage"/>
+        <waitForPageLoad stepKey="waitForPriceRulePage"/>
+        <actionGroup ref="createCatalogPriceRule" stepKey="createCatalogPriceRule">
+                <argument name="catalogRule" value="CatalogRuleWithAllCustomerGroups"/>
+        </actionGroup>
+        <actionGroup ref="CreateCatalogPriceRuleConditionWithAttribute" stepKey="createCatalogPriceRuleCondition">
+            <argument name="attributeName" value="$$createProductAttribute.attribute[frontend_labels][0][label]$$"/>
+            <argument name="targetValue" value="is"/>
+            <argument name="targetSelectValue" value="is undefined"/>
+        </actionGroup>
+        <click selector="{{AdminNewCatalogPriceRule.save}}" stepKey="saveRule"/>
+
+        <!--Check Catalog Price Rule for first product-->
+        <amOnPage url="{{StorefrontProductPage.url($$createFirstProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToFirstProductPage"/>
+        <waitForPageLoad stepKey="waitForFirstProductPageLoad"/>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.updatedPrice}}" stepKey="grabFirstProductUpdatedPrice"/>
+        <assertEquals expected='$110.70' expectedType="string" actual="($grabFirstProductUpdatedPrice)" stepKey="assertFirstProductUpdatedPrice"/>
+
+        <!--Check Catalog Price Rule for second product-->
+        <amOnPage url="{{StorefrontProductPage.url($$createSecondProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToSecondProductPage"/>
+        <waitForPageLoad stepKey="waitForSecondProductPageLoad"/>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.updatedPrice}}" stepKey="grabSecondProductUpdatedPrice"/>
+        <assertEquals expected='$110.70' expectedType="string" actual="($grabFirstProductUpdatedPrice)" stepKey="assertSecondProductUpdatedPrice"/>
+
+        <!--Delete previous attribute and Catalog Price Rule-->
+        <deleteData createDataKey="createProductAttribute" stepKey="deleteProductAttribute"/>
+        <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToCatalogPriceRulePage"/>
+        <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule">
+            <argument name="name" value="{{CatalogRuleWithAllCustomerGroups.name}}"/>
+            <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
+        </actionGroup>
+
+        <!--Add new attribute to Default set-->
+        <createData entity="AddToDefaultSet" stepKey="addToAttributeSetHandle1">
+            <requiredEntity createDataKey="createSecondProductAttribute"/>
+        </createData>
+
+        <!--Create new Catalog Price Rule-->
+        <actionGroup ref="createCatalogPriceRule" stepKey="createCatalogPriceRule1">
+            <argument name="catalogRule" value="CatalogRuleWithAllCustomerGroups"/>
+        </actionGroup>
+        <actionGroup ref="CreateCatalogPriceRuleConditionWithAttribute" stepKey="createCatalogPriceRuleCondition1">
+            <argument name="attributeName" value="$$createSecondProductAttribute.attribute[frontend_labels][0][label]$$"/>
+            <argument name="targetValue" value="is"/>
+            <argument name="targetSelectValue" value="is undefined"/>
+        </actionGroup>
+        <click selector="{{AdminNewCatalogPriceRule.save}}" stepKey="saveRule1"/>
+
+        <!--Check Catalog Price Rule for third product-->
+        <amOnPage url="{{StorefrontProductPage.url($$createThirdProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToThirdProductPage"/>
+        <waitForPageLoad stepKey="waitForThirdProductPageLoad"/>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.updatedPrice}}" stepKey="grabThirdProductUpdatedPrice"/>
+        <assertEquals expected='$110.70' expectedType="string" actual="($grabThirdProductUpdatedPrice)" stepKey="assertThirdProductUpdatedPrice"/>
+
+        <!--Check Catalog Price Rule for forth product-->
+        <amOnPage url="{{StorefrontProductPage.url($$createForthProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToForthProductPage"/>
+        <waitForPageLoad stepKey="waitForForthProductPageLoad"/>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.updatedPrice}}" stepKey="grabForthProductUpdatedPrice"/>
+        <assertEquals expected='$110.70' expectedType="string" actual="($grabForthProductUpdatedPrice)" stepKey="assertForthProductUpdatedPrice"/>
+    </test>
+</tests>

From 56681f0fec1c127ea650302e68563b89b1bfb125 Mon Sep 17 00:00:00 2001
From: Lusine Papyan <Lusine_Papyan@epam.com>
Date: Fri, 1 Feb 2019 17:09:42 +0400
Subject: [PATCH 18/38] MC-10973: Simple product with MAP assigned to
 configurable should displays the same way as products with special price

- Update automated test script
---
 .../Magento/Catalog/Test/Mftf/Data/ProductData.xml     |  9 +++++++++
 .../Mftf/Section/StorefrontProductInfoMainSection.xml  |  1 -
 ...roductWithMapAssignedConfigProductIsCorrectTest.xml | 10 +++-------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index b6442a1af3ff7..6ace9ce28b7c5 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -146,6 +146,15 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
     </entity>
+    <entity name="ApiSimpleProductWithPrice50" type="product2" extends="ApiSimpleOne">
+        <data key="price">50</data>
+    </entity>
+    <entity name="ApiSimpleProductWithPrice60" type="product2" extends="ApiSimpleTwo">
+        <data key="price">60</data>
+    </entity>
+    <entity name="ApiSimpleProductWithPrice70" type="product2" extends="SimpleOne">
+        <data key="price">70</data>
+    </entity>
     <entity name="ApiSimpleTwoHidden" type="product2">
         <data key="sku" unique="suffix">api-simple-product-two</data>
         <data key="type_id">simple</data>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index d72dec071ac3c..e5d8bca7358b9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -32,7 +32,6 @@
         <element name="mapPrice" type="text" selector="//div[@class='price-box price-final_price']//span[contains(@class, 'price-msrp_price')]"/>
         <element name="clickForPriceLink" type="text" selector="//div[@class='price-box price-final_price']//a[contains(text(), 'Click for price')]"/>
 
-
         <!-- The parameter is the nth custom option that you want to get -->
         <element name="nthCustomOption" type="block" selector="//*[@id='product-options-wrapper']/*[@class='fieldset']/*[contains(@class, 'field')][{{customOptionNum}}]" parameterized="true" />
         <!-- The 1st parameter is the nth custom option, the 2nd parameter is the nth value in the option -->
diff --git a/app/code/Magento/Msrp/Test/Mftf/Test/StorefrontProductWithMapAssignedConfigProductIsCorrectTest.xml b/app/code/Magento/Msrp/Test/Mftf/Test/StorefrontProductWithMapAssignedConfigProductIsCorrectTest.xml
index 48792336c5f2c..a874de3b223a2 100644
--- a/app/code/Magento/Msrp/Test/Mftf/Test/StorefrontProductWithMapAssignedConfigProductIsCorrectTest.xml
+++ b/app/code/Magento/Msrp/Test/Mftf/Test/StorefrontProductWithMapAssignedConfigProductIsCorrectTest.xml
@@ -53,20 +53,16 @@
                 <requiredEntity createDataKey="createConfigProductAttribute"/>
             </getData>
 
-
             <!-- Create the 2 children that will be a part of the configurable product -->
-            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
-                <field key="price">50.00</field>
+            <createData entity="ApiSimpleProductWithPrice50" stepKey="createConfigChildProduct1">
                 <requiredEntity createDataKey="createConfigProductAttribute"/>
                 <requiredEntity createDataKey="getConfigAttributeOption1"/>
             </createData>
-            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
-                <field key="price">60.00</field>
+            <createData entity="ApiSimpleProductWithPrice60" stepKey="createConfigChildProduct2">
                 <requiredEntity createDataKey="createConfigProductAttribute"/>
                 <requiredEntity createDataKey="getConfigAttributeOption2"/>
             </createData>
-            <createData entity="SimpleOne" stepKey="createConfigChildProduct3">
-                <field key="price">70.00</field>
+            <createData entity="ApiSimpleProductWithPrice70" stepKey="createConfigChildProduct3">
                 <requiredEntity createDataKey="createConfigProductAttribute"/>
                 <requiredEntity createDataKey="getConfigAttributeOption3"/>
             </createData>

From 8e132a545bd412293d40aec2dbe33c25a3c9ae45 Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Tue, 5 Feb 2019 16:45:45 +0300
Subject: [PATCH 19/38] MC-10973: Simple product with MAP assigned to
 configurable should displays the same way as products with special price

- Fix static tests.
---
 .../ConfigurableProduct/Model/Product/Type/Configurable.php   | 1 +
 app/code/Magento/Msrp/view/base/web/js/msrp.js                | 2 +-
 .../Magento/Swatches/view/frontend/web/js/swatch-renderer.js  | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index e69240dcfeb13..2c4b95c818e14 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -24,6 +24,7 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @api
  * @since 100.0.2
  */
diff --git a/app/code/Magento/Msrp/view/base/web/js/msrp.js b/app/code/Magento/Msrp/view/base/web/js/msrp.js
index c086a799889b7..9a7487b070b94 100644
--- a/app/code/Magento/Msrp/view/base/web/js/msrp.js
+++ b/app/code/Magento/Msrp/view/base/web/js/msrp.js
@@ -317,7 +317,7 @@ define([
                 msrpPrice = prices[priceIndex].msrpPrice.amount;
                 finalPrice = prices[priceIndex].finalPrice.amount;
 
-                if(msrpPrice === null || msrpPrice <= finalPrice) {
+                if (msrpPrice === null || msrpPrice <= finalPrice) {
                     this.updateNonMsrpPrice(priceUtils.formatPrice(finalPrice));
                 } else {
                     this.updateMsrpPrice(
diff --git a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
index fe742ef22d525..f3133d5b94952 100644
--- a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
+++ b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
@@ -523,7 +523,7 @@ define([
                 label = this.label ? this.label : '';
                 attr =
                     ' id="' + controlId + '-item-' + id + '"' +
-                    ' index="' + index +'"' +
+                    ' index="' + index + '"' +
                     ' aria-checked="false"' +
                     ' aria-describedby="' + controlId + '"' +
                     ' tabindex="0"' +
@@ -748,7 +748,7 @@ define([
 
             $(document).trigger('updateMsrpPriceBlock',
                 [
-                    parseInt($this.attr('index')) + 1,
+                    parseInt($this.attr('index'), 10) + 1,
                     $widget.options.jsonConfig.optionPrices
                 ]);
 

From b3804f3822bac84b320bfde4bd621be4e32410e8 Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Tue, 5 Feb 2019 17:31:32 +0300
Subject: [PATCH 20/38] MC-10971: [Magento Cloud] - Unable to Scope Catalog
 Price rules by custom product attribute

- Fixed mftf test;
---
 .../Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml | 8 +++++++-
 ...dminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml | 6 ++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
index 113820efdf253..bdcabe65ac92e 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
@@ -47,9 +47,11 @@
         <fillField selector="{{AdminNewCatalogPriceRule.description}}" userInput="{{catalogRule.description}}" stepKey="fillDescription" />
         <click selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}" stepKey="selectActive" />
         <selectOption selector="{{AdminNewCatalogPriceRule.websites}}" parameterArray="{{catalogRule.website_ids}}" stepKey="selectSite" />
-        <selectOption selector="{{AdminNewCatalogPriceRule.customerGroups}}" parameterArray="{{catalogRule.customer_group_ids}}" stepKey="selectCustomerGroup" />
         <click stepKey="openActionDropdown" selector="{{AdminNewCatalogPriceRule.actionsTab}}"/>
         <fillField stepKey="fillDiscountValue" selector="{{AdminNewCatalogPriceRuleActions.discountAmount}}" userInput="{{catalogRule.discount_amount}}"/>
+
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <waitForPageLoad stepKey="waitForApplied"/>
     </actionGroup>
 
     <actionGroup name="CreateCatalogPriceRuleConditionWithAttribute">
@@ -109,4 +111,8 @@
     <actionGroup name="selectGeneralCustomerGroupActionGroup">
         <selectOption selector="{{AdminNewCatalogPriceRule.customerGroups}}" userInput="General" stepKey="selectCustomerGroup"/>
     </actionGroup>
+
+    <actionGroup name="selectNotLoggedInCustomerGroupActionGroup">
+        <selectOption selector="{{AdminNewCatalogPriceRule.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml
index 11c7b671ed407..b5566777f4e3a 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml
@@ -21,7 +21,6 @@
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="login"/>
 
-            <createData entity="CatalogRuleWithAllCustomerGroups" stepKey="createCatalogPriceRule"/>
             <createData entity="ApiCategory" stepKey="createFirstCategory"/>
             <createData entity="ApiSimpleProduct" stepKey="createFirstProduct">
                 <requiredEntity createDataKey="createFirstCategory"/>
@@ -69,14 +68,17 @@
         <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage"/>
         <waitForPageLoad stepKey="waitForPriceRulePage"/>
         <actionGroup ref="createCatalogPriceRule" stepKey="createCatalogPriceRule">
-                <argument name="catalogRule" value="CatalogRuleWithAllCustomerGroups"/>
+            <argument name="catalogRule" value="CatalogRuleWithAllCustomerGroups"/>
         </actionGroup>
+        <actionGroup ref="selectNotLoggedInCustomerGroupActionGroup" stepKey="selectCustomerGroup"/>
         <actionGroup ref="CreateCatalogPriceRuleConditionWithAttribute" stepKey="createCatalogPriceRuleCondition">
             <argument name="attributeName" value="$$createProductAttribute.attribute[frontend_labels][0][label]$$"/>
             <argument name="targetValue" value="is"/>
             <argument name="targetSelectValue" value="is undefined"/>
         </actionGroup>
         <click selector="{{AdminNewCatalogPriceRule.save}}" stepKey="saveRule"/>
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
 
         <!--Check Catalog Price Rule for first product-->
         <amOnPage url="{{StorefrontProductPage.url($$createFirstProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToFirstProductPage"/>

From 6d23b2a397dace8d9b4c6be83bde47e2a39545c1 Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Tue, 5 Feb 2019 18:32:48 +0300
Subject: [PATCH 21/38] MC-10973: Simple product with MAP assigned to
 configurable should displays the same way as products with special price

- Fix static tests for js.
---
 app/code/Magento/Msrp/view/base/web/js/msrp.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Msrp/view/base/web/js/msrp.js b/app/code/Magento/Msrp/view/base/web/js/msrp.js
index 9a7487b070b94..e5aa0737f7339 100644
--- a/app/code/Magento/Msrp/view/base/web/js/msrp.js
+++ b/app/code/Magento/Msrp/view/base/web/js/msrp.js
@@ -336,9 +336,9 @@ define([
         /**
          * Update prices for configurable product with MSRP enabled
          *
-         * @param {string} finalPrice
-         * @param {string} msrpPrice
-         * @param {boolean} useDefaultPrice
+         * @param {String} finalPrice
+         * @param {String} msrpPrice
+         * @param {Boolean} useDefaultPrice
          */
         updateMsrpPrice: function (finalPrice, msrpPrice, useDefaultPrice) {
             var options = this.tierOptions || this.options;
@@ -364,7 +364,7 @@ define([
         /**
          * Display non MAP price for irrelevant products
          *
-         * @param {string} price
+         * @param {String} price
          */
         updateNonMsrpPrice: function(price) {
             $(this.options.fallbackPriceElement).html(price);

From ce690a2e9809df973a396fad7d232dd2998e0ff8 Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Wed, 6 Feb 2019 08:21:38 +0300
Subject: [PATCH 22/38] MC-10973: Simple product with MAP assigned to
 configurable should displays the same way as products with special price

- Fix static test.
---
 app/code/Magento/Msrp/view/base/web/js/msrp.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Msrp/view/base/web/js/msrp.js b/app/code/Magento/Msrp/view/base/web/js/msrp.js
index e5aa0737f7339..6180e6078b92a 100644
--- a/app/code/Magento/Msrp/view/base/web/js/msrp.js
+++ b/app/code/Magento/Msrp/view/base/web/js/msrp.js
@@ -347,14 +347,14 @@ define([
             $(this.options.displayPriceContainer).show();
             $(this.options.mapInfoLinks).show();
 
-            if(useDefaultPrice || !this.wasOpened) {
+            if (useDefaultPrice || !this.wasOpened) {
                     this.$popup.find(this.options.msrpLabelId).html(options.msrpPrice);
                     this.$popup.find(this.options.priceLabelId).html(options.realPrice);
                     $(this.options.displayPriceElement).html(msrpPrice);
                     this.wasOpened = true;
             }
 
-            if(!useDefaultPrice) {
+            if (!useDefaultPrice) {
                 this.$popup.find(this.options.msrpPriceElement).html(msrpPrice);
                 this.$popup.find(this.options.priceElement).html(finalPrice);
                 $(this.options.displayPriceElement).html(msrpPrice);

From 55298c811d67ba6f63adac8c031bea4e6663dcb4 Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Wed, 6 Feb 2019 08:58:48 +0300
Subject: [PATCH 23/38] MC-10973: Simple product with MAP assigned to
 configurable should displays the same way as products with special price

- Fix static test.
---
 app/code/Magento/Msrp/view/base/web/js/msrp.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Msrp/view/base/web/js/msrp.js b/app/code/Magento/Msrp/view/base/web/js/msrp.js
index 6180e6078b92a..9e12315ec9fb2 100644
--- a/app/code/Magento/Msrp/view/base/web/js/msrp.js
+++ b/app/code/Magento/Msrp/view/base/web/js/msrp.js
@@ -348,10 +348,10 @@ define([
             $(this.options.mapInfoLinks).show();
 
             if (useDefaultPrice || !this.wasOpened) {
-                    this.$popup.find(this.options.msrpLabelId).html(options.msrpPrice);
-                    this.$popup.find(this.options.priceLabelId).html(options.realPrice);
-                    $(this.options.displayPriceElement).html(msrpPrice);
-                    this.wasOpened = true;
+                this.$popup.find(this.options.msrpLabelId).html(options.msrpPrice);
+                this.$popup.find(this.options.priceLabelId).html(options.realPrice);
+                $(this.options.displayPriceElement).html(msrpPrice);
+                this.wasOpened = true;
             }
 
             if (!useDefaultPrice) {

From 7145da8308750e1441afde6c85e651c5179b5a2d Mon Sep 17 00:00:00 2001
From: Davit_Zakharyan <davit_zakharyan@epam.com>
Date: Wed, 6 Feb 2019 04:35:16 +0400
Subject: [PATCH 24/38] MC-5906: The order of product SKU is not respected

- Added automated test script
---
 .../CheckProductsOrderActionGroup.xml         |  23 ++++
 .../StorefrontCategoryProductSection.xml      |   1 +
 ...CheckOrderOfProdsInWidgetOnCMSPageTest.xml | 104 ++++++++++++++++++
 .../ClearWidgetsFromCMSContentActionGroup.xml |  20 ++++
 .../Cms/Test/Mftf/Page/CmsPageEditPage.xml    |  16 +++
 .../Cms/Test/Mftf/Section/TinyMCESection.xml  |   2 +
 .../ActionGroup/ConfigWYSIWYGActionGroup.xml  |  11 ++
 7 files changed, 177 insertions(+)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckProductsOrderActionGroup.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/CheckOrderOfProdsInWidgetOnCMSPageTest.xml
 create mode 100644 app/code/Magento/Cms/Test/Mftf/ActionGroup/ClearWidgetsFromCMSContentActionGroup.xml
 create mode 100644 app/code/Magento/Cms/Test/Mftf/Page/CmsPageEditPage.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckProductsOrderActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckProductsOrderActionGroup.xml
new file mode 100644
index 0000000000000..f7cd2e7076288
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckProductsOrderActionGroup.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+
+    <actionGroup name="CompareTwoProductsOrder">
+        <arguments>
+            <argument name="product_1"/>
+            <argument name="product_2"/>
+        </arguments>
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
+        <waitForPageLoad stepKey="waitForPageLoad5"/>
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByNumber('1')}}" userInput="alt" stepKey="grabFirstProductName1_1"/>
+        <assertEquals  expected="{{product_1.name}}" actual="($grabFirstProductName1_1)" message="notExpectedOrder" stepKey="compare1"/>
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByNumber('2')}}" userInput="alt" stepKey="grabFirstProductName2_2"/>
+        <assertEquals  expected="{{product_2.name}}" actual="($grabFirstProductName2_2)" message="notExpectedOrder" stepKey="compare2"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
index 178e58ef2d649..f35eb63ee0e0a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
@@ -16,6 +16,7 @@
         <element name="ProductInfoByNumber" type="text" selector="//main//li[{{var1}}]//div[@class='product-item-info']" parameterized="true"/>
         <element name="ProductAddToCompareByNumber" type="text" selector="//main//li[{{var1}}]//a[contains(@class, 'tocompare')]" parameterized="true"/>
         <element name="listedProduct" type="block" selector="ol li:nth-child({{productPositionInList}}) img" parameterized="true"/>
+        <element name="ProductImageByNumber" type="button" selector="//main//li[{{var1}}]//img" parameterized="true"/>
         <element name="categoryListView" type="button" selector="a[title='List']" timeout="30"/>
 
         <element name="ProductTitleByName" type="button" selector="//main//li//a[contains(text(), '{{var1}}')]" parameterized="true"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CheckOrderOfProdsInWidgetOnCMSPageTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CheckOrderOfProdsInWidgetOnCMSPageTest.xml
new file mode 100644
index 0000000000000..d9693243ea2a3
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CheckOrderOfProdsInWidgetOnCMSPageTest.xml
@@ -0,0 +1,104 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="CheckOrderOfProdsInWidgetOnCMSPageTest">
+        <annotations>
+            <features value="Catalog"/>
+            <title value="Checking order of products in a widget on a CMS page - SKU condition"/>
+            <description value="Checking order of products in a widget on a CMS page - SKU condition"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-13718"/>
+            <useCaseId value="MC-5906"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="EnabledWYSIWYGEditor" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="enableTinyMCE4"/>
+            <waitForPageLoad stepKey="waitConfigToSave"/>
+            <createData entity="ApiCategory" stepKey="createFirstCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="product1">
+                <requiredEntity createDataKey="createFirstCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="product2">
+                <requiredEntity createDataKey="createFirstCategory"/>
+            </createData>
+            <amOnPage url="{{CmsPageEditPage.url('2')}}" stepKey="navigateToEditHomePagePage"/>
+            <waitForPageLoad stepKey="waitEditHomePagePageToLoad"/>
+            <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
+            <waitForElementNotVisible selector="{{CmsWYSIWYGSection.CheckIfTabExpand}}" stepKey="waitForTabExpand"/>
+            <click selector="{{CmsNewPagePageActionsSection.showHideEditor}}" stepKey="showHiddenButtons"/>
+            <seeElement selector="{{TinyMCESection.InsertWidgetBtn}}" stepKey="seeWidgetButton" />
+            <click selector="{{TinyMCESection.InsertWidgetBtn}}" stepKey="clickInsertWidgetButton" />
+            <waitForPageLoad stepKey="waitForPageLoad1" />
+            <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
+            <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
+            <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
+            <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Catalog Products List" stepKey="selectCatalogProductsList" />
+            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear" />
+            <click selector="{{WidgetSection.AddParam}}" stepKey="clickAddParamBtn" />
+            <waitForElementVisible selector="{{WidgetSection.ConditionsDropdown}}" stepKey="waitForDropdownVisible"/>
+            <selectOption selector="{{WidgetSection.ConditionsDropdown}}" userInput="SKU" stepKey="selectCategoryCondition" />
+            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear2" />
+            <click selector="{{WidgetSection.RuleParam1('3')}}" stepKey="clickOnRuleParam1"/>
+            <waitForElementVisible selector="{{AdminTargetRuleProductsToMatchSection.newConditionOperator}}" stepKey="waitDropdownToAppear"/>
+            <selectOption selector="{{AdminTargetRuleProductsToMatchSection.newConditionOperator}}" userInput="is one of" stepKey="selectOption"/>
+            <click selector="{{WidgetSection.RuleParam}}" stepKey="clickOnRuleParam"/>
+            <waitForElementVisible selector="{{WidgetSection.Chooser}}" stepKey="waitForElement" />
+            <click selector="{{WidgetSection.Chooser}}" stepKey="clickChooser" />
+            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear3" />
+            <click selector="{{WidgetSection.PreCreateProduct('$$product1.name$$')}}" stepKey="selectproduct1" />
+            <click selector="{{WidgetSection.PreCreateProduct('$$product2.name$$')}}" stepKey="selectproduct2" />
+            <click selector="{{AdminNewWidgetSection.applyParameter}}" stepKey="applyProducts"/>
+            <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickOnInsertWidgetButton"/>
+            <waitForLoadingMaskToDisappear stepKey="waitSaveButtonToBeClickable"/>
+            <click selector="{{InsertWidgetSection.save}}" stepKey="saveWidget"/>
+            <waitForPageLoad stepKey="waitForSaveComplete"/>
+        </before>
+        <after>
+            <actionGroup ref="ClearWidgetsFromCMSContent" stepKey="removeWidgets"/>
+            <deleteData createDataKey="createFirstCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="product1" stepKey="deleteproduct1"/>
+            <deleteData createDataKey="product2" stepKey="deleteproduct2"/>
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+        <actionGroup ref="CompareTwoProductsOrder" stepKey="compareProductOrders1">
+            <argument name="product_1" value="$$product1$$"/>
+            <argument name="product_2" value="$$product2$$"/>
+        </actionGroup>
+
+        <amOnPage url="{{CmsPageEditPage.url('2')}}" stepKey="navigateToEditHomePagePage"/>
+        <waitForPageLoad stepKey="waitEditHomePagePageToLoad"/>
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
+        <waitForElementNotVisible selector="{{CmsWYSIWYGSection.CheckIfTabExpand}}" stepKey="waitForTabExpand"/>
+        <executeJS function="jQuery('[id=\'cms_page_form_content_ifr\']').attr('name', 'preview-iframe')" stepKey="setPreviewFrameName"/>
+        <switchToIFrame selector="preview-iframe" stepKey="switchToIframe"/>
+        <doubleClick selector="{{TinyMCESection.WidgetButton}}" stepKey="clickToEditWidget"/>
+        <switchToIFrame stepKey="switchOutFromIframe"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <wait time="2" stepKey="waitOptionsToLoadProperly"/>
+        <click selector="{{WidgetSection.RuleParam1('4')}}" stepKey="openProductsList"/>
+        <waitForElementVisible selector="{{WidgetSection.Chooser}}" stepKey="waitForElement2"/>
+        <click selector="{{WidgetSection.Chooser}}" stepKey="clickChooser2" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear4" />
+        <click selector="{{WidgetSection.PreCreateProduct('$$product1.name$$')}}" stepKey="selectproduct1_1" />
+        <click selector="{{WidgetSection.PreCreateProduct('$$product1.name$$')}}" stepKey="selectproduct2_2" />
+        <click selector="{{AdminNewWidgetSection.applyParameter}}" stepKey="applyProducts1"/>
+        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickOnInsertWidgetButton1"/>
+        <waitForLoadingMaskToDisappear stepKey="waitSaveButtonToBeClickable1"/>
+        <click selector="{{InsertWidgetSection.save}}" stepKey="saveWidget1"/>
+        <waitForPageLoad stepKey="waitForSaveComplete1"/>
+
+        <actionGroup ref="CompareTwoProductsOrder" stepKey="compareProductOrders2">
+            <argument name="product_1" value="$$product2$$"/>
+            <argument name="product_2" value="$$product1$$"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/ClearWidgetsFromCMSContentActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/ClearWidgetsFromCMSContentActionGroup.xml
new file mode 100644
index 0000000000000..679a67f2462cf
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/ClearWidgetsFromCMSContentActionGroup.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="ClearWidgetsFromCMSContent">
+        <amOnPage url="{{CmsPageEditPage.url('2')}}" stepKey="navigateToEditHomePagePage"/>
+        <waitForPageLoad stepKey="waitEditHomePagePageToLoad"/>
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
+        <waitForElementNotVisible selector="{{CmsWYSIWYGSection.CheckIfTabExpand}}" stepKey="waitForTabExpand"/>
+        <executeJS function="tinyMCE.activeEditor.setContent('Hello TinyMCE4!');" stepKey="executeJSFillContent1"/>
+        <click selector="{{InsertWidgetSection.save}}" stepKey="saveWidget"/>
+        <waitForPageLoad stepKey="waitSaveToBeApplied"/>
+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the page." stepKey="seeSaveSuccess"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/Page/CmsPageEditPage.xml b/app/code/Magento/Cms/Test/Mftf/Page/CmsPageEditPage.xml
new file mode 100644
index 0000000000000..885310d9399ae
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Page/CmsPageEditPage.xml
@@ -0,0 +1,16 @@
+<?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="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="CmsPageEditPage" area="admin" url="admin/cms_page/edit/page_id/{{var}}" parameterized="true">
+        <section name="CmsNewPagePageActionsSection"/>
+        <section name="CmsNewPagePageBasicFieldsSection"/>
+        <section name="CmsNewPagePageContentSection"/>
+        <section name="CmsNewPagePageSeoSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
index 89431a0c7ce4d..f3bb7d90672ea 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
@@ -31,6 +31,7 @@
         <element name="InsertImage" type="button" selector=".mce-i-image" />
         <element name="InsertTable" type="button" selector=".mce-i-table" />
         <element name="SpecialCharacter" type="button" selector=".mce-i-charmap" />
+        <element name="WidgetButton" type="button" selector="span[class*='magento-widget mceNonEditable']"/>
     </section>
     <section name="MediaGallerySection">
         <element name="Browse" type="button" selector=".mce-i-browse"/>
@@ -99,6 +100,7 @@
         <element name="AddParam" type="button" selector=".rule-param-add"/>
         <element name="ConditionsDropdown" type="select" selector="#conditions__1__new_child"/>
         <element name="RuleParam" type="button" selector="//a[text()='...']"/>
+        <element name="RuleParam1" type="button" selector="(//span[@class='rule-param']//a)[{{var}}]" parameterized="true"/>
         <element name="RuleParamSelect" type="select" selector="//ul[contains(@class,'rule-param-children')]/li[{{arg1}}]//*[contains(@class,'rule-param')][{{arg2}}]//select" parameterized="true"/>
         <element name="RuleParamInput" type="input" selector="//ul[contains(@class,'rule-param-children')]/li[{{arg1}}]//*[contains(@class,'rule-param')][{{arg2}}]//input" parameterized="true"/>
         <element name="RuleParamLabel" type="input" selector="//ul[contains(@class,'rule-param-children')]/li[{{arg1}}]//*[contains(@class,'rule-param')][{{arg2}}]//a" parameterized="true"/>
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWYSIWYGActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWYSIWYGActionGroup.xml
index 771f0035b82b9..ff686723f10d1 100644
--- a/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWYSIWYGActionGroup.xml
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWYSIWYGActionGroup.xml
@@ -38,4 +38,15 @@
         <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
         <waitForPageLoad stepKey="waitForPageLoad2" />
     </actionGroup>
+    <actionGroup name="EnabledWYSIWYGEditor">
+        <amOnPage url="{{AdminContentManagementPage.url}}" stepKey="navigateToConfigurationPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <conditionalClick selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.EnableWYSIWYG}}" visible="false" stepKey="expandWYSIWYGOptionsTab"/>
+        <waitForElementVisible selector="{{ContentManagementSection.EnableWYSIWYG}}" stepKey="waitTabToExpand"/>
+        <uncheckOption selector="{{ContentManagementSection.EnableSystemValue}}" stepKey="enableEnableSystemValue"/>
+        <selectOption selector="{{ContentManagementSection.EnableWYSIWYG}}" userInput="Enabled by Default" stepKey="enableWYSIWYG"/>
+        <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptionsTab"/>
+        <click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig" />
+        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the configuration."/>
+    </actionGroup>
 </actionGroups>

From 6abbebef91905e54ce6977d46d1a6b21f70519ab Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Wed, 6 Feb 2019 10:39:48 +0300
Subject: [PATCH 25/38] MC-10973: Simple product with MAP assigned to
 configurable should displays the same way as products with special price

- Fix static test.
---
 app/code/Magento/Msrp/view/base/web/js/msrp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Msrp/view/base/web/js/msrp.js b/app/code/Magento/Msrp/view/base/web/js/msrp.js
index 9e12315ec9fb2..123627735540d 100644
--- a/app/code/Magento/Msrp/view/base/web/js/msrp.js
+++ b/app/code/Magento/Msrp/view/base/web/js/msrp.js
@@ -366,7 +366,7 @@ define([
          *
          * @param {String} price
          */
-        updateNonMsrpPrice: function(price) {
+        updateNonMsrpPrice: function (price) {
             $(this.options.fallbackPriceElement).html(price);
             $(this.options.displayPriceContainer).hide();
             $(this.options.mapInfoLinks).hide();

From 34345a1ff24a1b5b225e30a041700fdb28e31868 Mon Sep 17 00:00:00 2001
From: eugenpetrov <petroveugenv@gmail.com>
Date: Mon, 4 Feb 2019 15:57:35 +0300
Subject: [PATCH 26/38] MAGETWO-95827: Changing Attribute Set may lead to
 exception "Attempt to load value of nonexistent EAV attribute"

- Sorting for eav attributes has been changed from DEST to ASC
---
 .../Eav/Model/ResourceModel/ReadHandler.php   | 29 ++++++++++---------
 .../Mftf/Section/StorefrontHeaderSection.xml  |  2 +-
 .../Framework/DB/Sql/UnionExpression.php      | 19 +++++++++---
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php b/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
index 8804550be2b29..c1fc578d112cb 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
@@ -5,7 +5,11 @@
  */
 namespace Magento\Eav\Model\ResourceModel;
 
+use Magento\Eav\Model\Config;
 use Magento\Framework\DataObject;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+use Magento\Framework\DB\Sql\UnionExpression;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\EntityManager\Operation\AttributeInterface;
 use Magento\Framework\Model\Entity\ScopeInterface;
@@ -33,23 +37,21 @@ class ReadHandler implements AttributeInterface
     private $logger;
 
     /**
-     * @var \Magento\Eav\Model\Config
+     * @var Config
      */
     private $config;
 
     /**
-     * ReadHandler constructor.
-     *
      * @param MetadataPool $metadataPool
      * @param ScopeResolver $scopeResolver
      * @param LoggerInterface $logger
-     * @param \Magento\Eav\Model\Config $config
+     * @param Config $config
      */
     public function __construct(
         MetadataPool $metadataPool,
         ScopeResolver $scopeResolver,
         LoggerInterface $logger,
-        \Magento\Eav\Model\Config $config
+        Config $config
     ) {
         $this->metadataPool = $metadataPool;
         $this->scopeResolver = $scopeResolver;
@@ -140,24 +142,25 @@ public function execute($entityType, $entityData, $arguments = [])
                 $select = $connection->select()
                     ->from(
                         ['t' => $attributeTable],
-                        ['value' => 't.value', 'attribute_id' => 't.attribute_id']
+                        ['value' => 't.value', 'attribute_id' => 't.attribute_id', 'store_id' => 't.store_id']
                     )
                     ->where($metadata->getLinkField() . ' = ?', $entityData[$metadata->getLinkField()])
                     ->where('attribute_id IN (?)', $attributeIds);
                 foreach ($context as $scope) {
                     //TODO: if (in table exists context field)
                     $select->where(
-                        $metadata->getEntityConnection()->quoteIdentifier($scope->getIdentifier()) . ' IN (?)',
+                        $connection->quoteIdentifier($scope->getIdentifier()) . ' IN (?)',
                         $this->getContextVariables($scope)
-                    )->order('t.' . $scope->getIdentifier() . ' DESC');
+                    );
                 }
                 $selects[] = $select;
             }
-            $unionSelect = new \Magento\Framework\DB\Sql\UnionExpression(
-                $selects,
-                \Magento\Framework\DB\Select::SQL_UNION_ALL
-            );
-            foreach ($connection->fetchAll($unionSelect) as $attributeValue) {
+            $unionSelect = new UnionExpression($selects, Select::SQL_UNION_ALL, '( %s )');
+            $orderedUnionSelect = $connection->select();
+            $orderedUnionSelect->from(['u' => $unionSelect]);
+            $orderedUnionSelect->order('store_id');
+            $attributes = $connection->fetchAll($orderedUnionSelect);
+            foreach ($attributes as $attributeValue) {
                 if (isset($attributesMap[$attributeValue['attribute_id']])) {
                     $entityData[$attributesMap[$attributeValue['attribute_id']]] = $attributeValue['value'];
                 } else {
diff --git a/app/code/Magento/Store/Test/Mftf/Section/StorefrontHeaderSection.xml b/app/code/Magento/Store/Test/Mftf/Section/StorefrontHeaderSection.xml
index af24a3b9d29f8..2e1a657c475d5 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/StorefrontHeaderSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/StorefrontHeaderSection.xml
@@ -9,7 +9,7 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontHeaderSection">
         <element name="storeViewSwitcher" type="button" selector="#switcher-language-trigger"/>
-        <element name="storeViewDropdown" type="button" selector="ul.switcher-dropdown"/>
+        <element name="storeViewDropdown" type="button" selector=".active ul.switcher-dropdown"/>
         <element name="storeViewOption" type="button" selector="li.view-{{var1}}>a" parameterized="true"/>
         <element name="storeView" type="button" selector="//div[@class='actions dropdown options switcher-options active']//ul//li//a[contains(text(),'{{var}}')]" parameterized="true"/>
     </section>
diff --git a/lib/internal/Magento/Framework/DB/Sql/UnionExpression.php b/lib/internal/Magento/Framework/DB/Sql/UnionExpression.php
index 3ce78177d875f..f1d093b7deafa 100644
--- a/lib/internal/Magento/Framework/DB/Sql/UnionExpression.php
+++ b/lib/internal/Magento/Framework/DB/Sql/UnionExpression.php
@@ -22,18 +22,25 @@ class UnionExpression extends Expression
      */
     protected $type;
 
+    /**
+     * @var string
+     */
+    protected $pattern;
+
     /**
      * @param Select[] $parts
-     * @param string $type
+     * @param string $type (optional)
+     * @param string $pattern (optional)
      */
-    public function __construct(array $parts, $type = Select::SQL_UNION)
+    public function __construct(array $parts, $type = Select::SQL_UNION, $pattern = '')
     {
         $this->parts = $parts;
         $this->type = $type;
+        $this->pattern = $pattern;
     }
 
     /**
-     * @return string
+     * @inheritdoc
      */
     public function __toString()
     {
@@ -45,6 +52,10 @@ public function __toString()
                 $parts[] = $part;
             }
         }
-        return implode($parts, $this->type);
+        $sql = implode($parts, $this->type);
+        if ($this->pattern) {
+            return sprintf($this->pattern, $sql);
+        }
+        return $sql;
     }
 }

From 2c469a1ffce99fbaa2adb8e4bbec7921874d5d99 Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Wed, 6 Feb 2019 14:58:49 +0300
Subject: [PATCH 27/38] MAGETWO-97311: creating attribute option value using
 API returns unexpected response

- Add webapi check for id value.
---
 .../ProductSwatchAttributeOptionManagementInterfaceTest.php    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductSwatchAttributeOptionManagementInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductSwatchAttributeOptionManagementInterfaceTest.php
index 6b8388e2f4345..237574dd6e22a 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductSwatchAttributeOptionManagementInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductSwatchAttributeOptionManagementInterfaceTest.php
@@ -45,6 +45,9 @@ public function testAdd($optionData)
         $this->assertNotNull($response);
         $updatedData = $this->getAttributeOptions($testAttributeCode);
         $lastOption = array_pop($updatedData);
+        foreach ($updatedData as $option) {
+            $this->assertNotContains('id', $option['value']);
+        }
         $this->assertEquals(
             $optionData[AttributeOptionInterface::STORE_LABELS][0][AttributeOptionLabelInterface::LABEL],
             $lastOption['label']

From d1c575b2c0ebd356c3510cc82936de1297bd8445 Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Wed, 6 Feb 2019 16:31:45 +0300
Subject: [PATCH 28/38] MC-10971: [Magento Cloud] - Unable to Scope Catalog
 Price rules by custom product attribute

- Fixed MFTF test;
---
 .../AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml
index b5566777f4e3a..b07ae668be626 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml
@@ -76,7 +76,7 @@
             <argument name="targetValue" value="is"/>
             <argument name="targetSelectValue" value="is undefined"/>
         </actionGroup>
-        <click selector="{{AdminNewCatalogPriceRule.save}}" stepKey="saveRule"/>
+        <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="clickSaveAndApplyRules"/>
         <magentoCLI command="indexer:reindex" stepKey="reindex"/>
         <magentoCLI command="cache:flush" stepKey="flushCache"/>
 

From 2fd73ccbb156dd09e047116269e24aba99352fef Mon Sep 17 00:00:00 2001
From: Nikita Chubukov <nikita_chubukov@epam.com>
Date: Wed, 6 Feb 2019 16:56:08 +0300
Subject: [PATCH 29/38] MC-5906: The order of product SKU is not respected

- Fix test failures
---
 .../Magento/Rule/Model/Condition/Sql/Builder.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Rule/Model/Condition/Sql/Builder.php b/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
index 5b182162ce5fc..71c25afb80ee9 100644
--- a/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
+++ b/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
@@ -251,19 +251,25 @@ public function attachConditionToCollection(
         $whereExpression = (string)$this->_getMappedSqlCombination($combine);
         if (!empty($whereExpression)) {
             if (!empty($combine->getConditions())) {
+                $conditions = '';
+                $attribute = '';
                 foreach ($combine->getConditions() as $condition) {
-                    $conditions = $condition->getData()['value'];
-                    $attribute = $condition->getData()['attribute'];
+                    if ($condition->getData('attribute') === \Magento\Catalog\Api\Data\ProductInterface::SKU) {
+                        $conditions = $condition->getData('value');
+                        $attribute = $condition->getData('attribute');
+                    }
                 }
-                if (!empty($conditions)) {
+
+                $collection->getSelect()->where($whereExpression);
+
+                if (!empty($conditions) && !empty($attribute)) {
                     $conditions = explode(',', $conditions);
                     foreach ($conditions as &$condition) {
                         $condition = "'" . trim($condition) . "'";
                     }
                     $conditions = implode(', ', $conditions);
+                    $collection->getSelect()->order("FIELD($attribute, $conditions)");
                 }
-
-                $collection->getSelect()->where($whereExpression)->order("FIELD($attribute, $conditions)");
             } else {
                 // Select ::where method adds braces even on empty expression
                 $collection->getSelect()->where($whereExpression);

From 069d343dc6a85cacb0309cf59961e94762a2d17e Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Wed, 6 Feb 2019 19:13:16 +0300
Subject: [PATCH 30/38] MC-10971: [Magento Cloud] - Unable to Scope Catalog
 Price rules by custom product attribute

- Fixed MFTF test;
---
 .../Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml  | 1 -
 ...AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml | 7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
index bdcabe65ac92e..2d4b164dbde0a 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
@@ -45,7 +45,6 @@
         <click stepKey="addNewRule" selector="{{AdminGridMainControls.add}}"/>
         <fillField selector="{{AdminNewCatalogPriceRule.ruleName}}" userInput="{{catalogRule.name}}"  stepKey="fillName" />
         <fillField selector="{{AdminNewCatalogPriceRule.description}}" userInput="{{catalogRule.description}}" stepKey="fillDescription" />
-        <click selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}" stepKey="selectActive" />
         <selectOption selector="{{AdminNewCatalogPriceRule.websites}}" parameterArray="{{catalogRule.website_ids}}" stepKey="selectSite" />
         <click stepKey="openActionDropdown" selector="{{AdminNewCatalogPriceRule.actionsTab}}"/>
         <fillField stepKey="fillDiscountValue" selector="{{AdminNewCatalogPriceRuleActions.discountAmount}}" userInput="{{catalogRule.discount_amount}}"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml
index b07ae668be626..053a8c33e640c 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml
@@ -106,15 +106,20 @@
         </createData>
 
         <!--Create new Catalog Price Rule-->
+        <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage1"/>
+        <waitForPageLoad stepKey="waitForPriceRulePage1"/>
         <actionGroup ref="createCatalogPriceRule" stepKey="createCatalogPriceRule1">
             <argument name="catalogRule" value="CatalogRuleWithAllCustomerGroups"/>
         </actionGroup>
+        <actionGroup ref="selectNotLoggedInCustomerGroupActionGroup" stepKey="selectCustomerGroup1"/>
         <actionGroup ref="CreateCatalogPriceRuleConditionWithAttribute" stepKey="createCatalogPriceRuleCondition1">
             <argument name="attributeName" value="$$createSecondProductAttribute.attribute[frontend_labels][0][label]$$"/>
             <argument name="targetValue" value="is"/>
             <argument name="targetSelectValue" value="is undefined"/>
         </actionGroup>
-        <click selector="{{AdminNewCatalogPriceRule.save}}" stepKey="saveRule1"/>
+        <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="clickSaveAndApplyRules1"/>
+        <magentoCLI command="indexer:reindex" stepKey="reindex1"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache1"/>
 
         <!--Check Catalog Price Rule for third product-->
         <amOnPage url="{{StorefrontProductPage.url($$createThirdProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToThirdProductPage"/>

From ca6f3c0c7e3d6210e566833f47a06578a0fbc220 Mon Sep 17 00:00:00 2001
From: Nikita Chubukov <nikita_chubukov@epam.com>
Date: Wed, 6 Feb 2019 21:33:07 +0300
Subject: [PATCH 31/38] MC-5906: The order of product SKU is not respected

- Fix functional test
---
 ...CheckOrderOfProdsInWidgetOnCMSPageTest.xml | 104 ------------------
 1 file changed, 104 deletions(-)
 delete mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/CheckOrderOfProdsInWidgetOnCMSPageTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CheckOrderOfProdsInWidgetOnCMSPageTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CheckOrderOfProdsInWidgetOnCMSPageTest.xml
deleted file mode 100644
index d9693243ea2a3..0000000000000
--- a/app/code/Magento/Catalog/Test/Mftf/Test/CheckOrderOfProdsInWidgetOnCMSPageTest.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="CheckOrderOfProdsInWidgetOnCMSPageTest">
-        <annotations>
-            <features value="Catalog"/>
-            <title value="Checking order of products in a widget on a CMS page - SKU condition"/>
-            <description value="Checking order of products in a widget on a CMS page - SKU condition"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-13718"/>
-            <useCaseId value="MC-5906"/>
-            <group value="Catalog"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-            <actionGroup ref="EnabledWYSIWYGEditor" stepKey="enableWYSIWYG"/>
-            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="enableTinyMCE4"/>
-            <waitForPageLoad stepKey="waitConfigToSave"/>
-            <createData entity="ApiCategory" stepKey="createFirstCategory"/>
-            <createData entity="ApiSimpleProduct" stepKey="product1">
-                <requiredEntity createDataKey="createFirstCategory"/>
-            </createData>
-            <createData entity="ApiSimpleProduct" stepKey="product2">
-                <requiredEntity createDataKey="createFirstCategory"/>
-            </createData>
-            <amOnPage url="{{CmsPageEditPage.url('2')}}" stepKey="navigateToEditHomePagePage"/>
-            <waitForPageLoad stepKey="waitEditHomePagePageToLoad"/>
-            <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
-            <waitForElementNotVisible selector="{{CmsWYSIWYGSection.CheckIfTabExpand}}" stepKey="waitForTabExpand"/>
-            <click selector="{{CmsNewPagePageActionsSection.showHideEditor}}" stepKey="showHiddenButtons"/>
-            <seeElement selector="{{TinyMCESection.InsertWidgetBtn}}" stepKey="seeWidgetButton" />
-            <click selector="{{TinyMCESection.InsertWidgetBtn}}" stepKey="clickInsertWidgetButton" />
-            <waitForPageLoad stepKey="waitForPageLoad1" />
-            <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
-            <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
-            <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
-            <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Catalog Products List" stepKey="selectCatalogProductsList" />
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear" />
-            <click selector="{{WidgetSection.AddParam}}" stepKey="clickAddParamBtn" />
-            <waitForElementVisible selector="{{WidgetSection.ConditionsDropdown}}" stepKey="waitForDropdownVisible"/>
-            <selectOption selector="{{WidgetSection.ConditionsDropdown}}" userInput="SKU" stepKey="selectCategoryCondition" />
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear2" />
-            <click selector="{{WidgetSection.RuleParam1('3')}}" stepKey="clickOnRuleParam1"/>
-            <waitForElementVisible selector="{{AdminTargetRuleProductsToMatchSection.newConditionOperator}}" stepKey="waitDropdownToAppear"/>
-            <selectOption selector="{{AdminTargetRuleProductsToMatchSection.newConditionOperator}}" userInput="is one of" stepKey="selectOption"/>
-            <click selector="{{WidgetSection.RuleParam}}" stepKey="clickOnRuleParam"/>
-            <waitForElementVisible selector="{{WidgetSection.Chooser}}" stepKey="waitForElement" />
-            <click selector="{{WidgetSection.Chooser}}" stepKey="clickChooser" />
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear3" />
-            <click selector="{{WidgetSection.PreCreateProduct('$$product1.name$$')}}" stepKey="selectproduct1" />
-            <click selector="{{WidgetSection.PreCreateProduct('$$product2.name$$')}}" stepKey="selectproduct2" />
-            <click selector="{{AdminNewWidgetSection.applyParameter}}" stepKey="applyProducts"/>
-            <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickOnInsertWidgetButton"/>
-            <waitForLoadingMaskToDisappear stepKey="waitSaveButtonToBeClickable"/>
-            <click selector="{{InsertWidgetSection.save}}" stepKey="saveWidget"/>
-            <waitForPageLoad stepKey="waitForSaveComplete"/>
-        </before>
-        <after>
-            <actionGroup ref="ClearWidgetsFromCMSContent" stepKey="removeWidgets"/>
-            <deleteData createDataKey="createFirstCategory" stepKey="deleteCategory"/>
-            <deleteData createDataKey="product1" stepKey="deleteproduct1"/>
-            <deleteData createDataKey="product2" stepKey="deleteproduct2"/>
-            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
-        </after>
-        <actionGroup ref="CompareTwoProductsOrder" stepKey="compareProductOrders1">
-            <argument name="product_1" value="$$product1$$"/>
-            <argument name="product_2" value="$$product2$$"/>
-        </actionGroup>
-
-        <amOnPage url="{{CmsPageEditPage.url('2')}}" stepKey="navigateToEditHomePagePage"/>
-        <waitForPageLoad stepKey="waitEditHomePagePageToLoad"/>
-        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
-        <waitForElementNotVisible selector="{{CmsWYSIWYGSection.CheckIfTabExpand}}" stepKey="waitForTabExpand"/>
-        <executeJS function="jQuery('[id=\'cms_page_form_content_ifr\']').attr('name', 'preview-iframe')" stepKey="setPreviewFrameName"/>
-        <switchToIFrame selector="preview-iframe" stepKey="switchToIframe"/>
-        <doubleClick selector="{{TinyMCESection.WidgetButton}}" stepKey="clickToEditWidget"/>
-        <switchToIFrame stepKey="switchOutFromIframe"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
-        <wait time="2" stepKey="waitOptionsToLoadProperly"/>
-        <click selector="{{WidgetSection.RuleParam1('4')}}" stepKey="openProductsList"/>
-        <waitForElementVisible selector="{{WidgetSection.Chooser}}" stepKey="waitForElement2"/>
-        <click selector="{{WidgetSection.Chooser}}" stepKey="clickChooser2" />
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear4" />
-        <click selector="{{WidgetSection.PreCreateProduct('$$product1.name$$')}}" stepKey="selectproduct1_1" />
-        <click selector="{{WidgetSection.PreCreateProduct('$$product1.name$$')}}" stepKey="selectproduct2_2" />
-        <click selector="{{AdminNewWidgetSection.applyParameter}}" stepKey="applyProducts1"/>
-        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickOnInsertWidgetButton1"/>
-        <waitForLoadingMaskToDisappear stepKey="waitSaveButtonToBeClickable1"/>
-        <click selector="{{InsertWidgetSection.save}}" stepKey="saveWidget1"/>
-        <waitForPageLoad stepKey="waitForSaveComplete1"/>
-
-        <actionGroup ref="CompareTwoProductsOrder" stepKey="compareProductOrders2">
-            <argument name="product_1" value="$$product2$$"/>
-            <argument name="product_2" value="$$product1$$"/>
-        </actionGroup>
-    </test>
-</tests>

From ab27445f80fa8bfc37c26abcbb5ac01a142d6073 Mon Sep 17 00:00:00 2001
From: Stsiapan Korf <Stsiapan_Korf@epam.com>
Date: Wed, 6 Feb 2019 16:00:51 +0000
Subject: [PATCH 32/38] MAGETWO-95827: Changing Attribute Set may lead to
 exception "Attempt to load value of nonexistent EAV attribute"

- Add sorting for union
---
 .../Eav/Model/ResourceModel/ReadHandler.php   | 41 +++++++++++++++++--
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php b/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
index c1fc578d112cb..7f6dfa2a5e9ab 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
@@ -7,7 +7,6 @@
 
 use Magento\Eav\Model\Config;
 use Magento\Framework\DataObject;
-use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Select;
 use Magento\Framework\DB\Sql\UnionExpression;
 use Magento\Framework\EntityManager\MetadataPool;
@@ -138,34 +137,40 @@ public function execute($entityType, $entityData, $arguments = [])
             }
         }
         if (count($attributeTables)) {
+            $identifiers = null;
             foreach ($attributeTables as $attributeTable => $attributeIds) {
                 $select = $connection->select()
                     ->from(
                         ['t' => $attributeTable],
-                        ['value' => 't.value', 'attribute_id' => 't.attribute_id', 'store_id' => 't.store_id']
+                        ['value' => 't.value', 'attribute_id' => 't.attribute_id']
                     )
                     ->where($metadata->getLinkField() . ' = ?', $entityData[$metadata->getLinkField()])
                     ->where('attribute_id IN (?)', $attributeIds);
+                $attributeIdentifiers = [];
                 foreach ($context as $scope) {
                     //TODO: if (in table exists context field)
                     $select->where(
                         $connection->quoteIdentifier($scope->getIdentifier()) . ' IN (?)',
                         $this->getContextVariables($scope)
                     );
+                    $attributeIdentifiers[] = $scope->getIdentifier();
                 }
+                $attributeIdentifiers = array_unique($attributeIdentifiers);
+                $identifiers = array_intersect($identifiers ?? $attributeIdentifiers, $attributeIdentifiers);
                 $selects[] = $select;
             }
+            $this->applyIdentifierForSelects($selects, $identifiers);
             $unionSelect = new UnionExpression($selects, Select::SQL_UNION_ALL, '( %s )');
             $orderedUnionSelect = $connection->select();
             $orderedUnionSelect->from(['u' => $unionSelect]);
-            $orderedUnionSelect->order('store_id');
+            $this->applyIdentifierForUnion($orderedUnionSelect, $identifiers);
             $attributes = $connection->fetchAll($orderedUnionSelect);
             foreach ($attributes as $attributeValue) {
                 if (isset($attributesMap[$attributeValue['attribute_id']])) {
                     $entityData[$attributesMap[$attributeValue['attribute_id']]] = $attributeValue['value'];
                 } else {
                     $this->logger->warning(
-                        "Attempt to load value of nonexistent EAV attribute '{$attributeValue['attribute_id']}' 
+                        "Attempt to load value of nonexistent EAV attribute '{$attributeValue['attribute_id']}'
                         for entity type '$entityType'."
                     );
                 }
@@ -173,4 +178,32 @@ public function execute($entityType, $entityData, $arguments = [])
         }
         return $entityData;
     }
+
+    /**
+     * Apply identifiers column on select array
+     *
+     * @param Select[] $selects
+     * @param array $identifiers
+     */
+    private function applyIdentifierForSelects(array $selects, array $identifiers)
+    {
+        foreach ($selects as $select) {
+            foreach ($identifiers as $identifier) {
+                $select->columns($identifier, 't');
+            }
+        }
+    }
+
+    /**
+     * Apply identifiers order on union select
+     *
+     * @param Select $unionSelect
+     * @param array $identifiers
+     */
+    private function applyIdentifierForUnion(Select $unionSelect, array $identifiers)
+    {
+        foreach ($identifiers as $identifier) {
+            $unionSelect->order($identifier);
+        }
+    }
 }

From 4c0f0209b0e283e040587ba95f7b1f960f860546 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Thu, 7 Feb 2019 16:57:48 +0300
Subject: [PATCH 33/38] MC-5906: The order of product SKU is not respected

- Fix fucntional test
---
 .../ActionGroup/ClearWidgetsFromCMSContentActionGroup.xml     | 4 ++++
 app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml     | 1 +
 2 files changed, 5 insertions(+)

diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/ClearWidgetsFromCMSContentActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/ClearWidgetsFromCMSContentActionGroup.xml
index 679a67f2462cf..2fa1b86a61572 100644
--- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/ClearWidgetsFromCMSContentActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/ClearWidgetsFromCMSContentActionGroup.xml
@@ -12,6 +12,10 @@
         <waitForPageLoad stepKey="waitEditHomePagePageToLoad"/>
         <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
         <waitForElementNotVisible selector="{{CmsWYSIWYGSection.CheckIfTabExpand}}" stepKey="waitForTabExpand"/>
+        <executeJS function="jQuery('[id=\'cms_page_form_content_ifr\']').attr('name', 'preview-iframe')" stepKey="setPreviewFrameName"/>
+        <switchToIFrame selector="preview-iframe" stepKey="switchToIframe"/>
+        <fillField selector="{{TinyMCESection.EditorContent}}" userInput="Hello TinyMCE4!" stepKey="clearWidgets"/>
+        <switchToIFrame stepKey="switchOutFromIframe"/>
         <executeJS function="tinyMCE.activeEditor.setContent('Hello TinyMCE4!');" stepKey="executeJSFillContent1"/>
         <click selector="{{InsertWidgetSection.save}}" stepKey="saveWidget"/>
         <waitForPageLoad stepKey="waitSaveToBeApplied"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
index f3bb7d90672ea..5414af81b7523 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
@@ -32,6 +32,7 @@
         <element name="InsertTable" type="button" selector=".mce-i-table" />
         <element name="SpecialCharacter" type="button" selector=".mce-i-charmap" />
         <element name="WidgetButton" type="button" selector="span[class*='magento-widget mceNonEditable']"/>
+        <element name="EditorContent" type="input" selector="#tinymce"/>
     </section>
     <section name="MediaGallerySection">
         <element name="Browse" type="button" selector=".mce-i-browse"/>

From 1675f7bcd53e615258f6646ab7cb2d30288ea567 Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Thu, 7 Feb 2019 18:49:24 +0300
Subject: [PATCH 34/38] MC-5906: The order of product SKU is not respected

- Get table with field
---
 app/code/Magento/Rule/Model/Condition/Sql/Builder.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Rule/Model/Condition/Sql/Builder.php b/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
index 71c25afb80ee9..33e1bf97c3474 100644
--- a/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
+++ b/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
@@ -252,23 +252,23 @@ public function attachConditionToCollection(
         if (!empty($whereExpression)) {
             if (!empty($combine->getConditions())) {
                 $conditions = '';
-                $attribute = '';
+                $attributeField = '';
                 foreach ($combine->getConditions() as $condition) {
                     if ($condition->getData('attribute') === \Magento\Catalog\Api\Data\ProductInterface::SKU) {
                         $conditions = $condition->getData('value');
-                        $attribute = $condition->getData('attribute');
+                        $attributeField = $condition->getMappedSqlField();
                     }
                 }
 
                 $collection->getSelect()->where($whereExpression);
 
-                if (!empty($conditions) && !empty($attribute)) {
+                if (!empty($conditions) && !empty($attributeField)) {
                     $conditions = explode(',', $conditions);
                     foreach ($conditions as &$condition) {
                         $condition = "'" . trim($condition) . "'";
                     }
                     $conditions = implode(', ', $conditions);
-                    $collection->getSelect()->order("FIELD($attribute, $conditions)");
+                    $collection->getSelect()->order("FIELD($attributeField, $conditions)");
                 }
             } else {
                 // Select ::where method adds braces even on empty expression

From d80a52be07008cd7863f7c053da9801c94510150 Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Fri, 8 Feb 2019 15:24:27 +0300
Subject: [PATCH 35/38] MC-5906: The order of product SKU is not respected

- Stabilize functional test
---
 app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
index 5414af81b7523..be94e96a462c4 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
@@ -114,5 +114,6 @@
         <element name="CompareBtn" type="button" selector=".action.tocompare"/>
         <element name="ClearCompare" type="button" selector="#compare-clear-all"/>
         <element name="AcceptClear" type="button" selector=".action-primary.action-accept" />
+        <element name="ChooserName" type="input" selector="input[name='chooser_name']" />
     </section>
 </sections>

From c56b9ce57c84f662c62583337212586ba9e9881e Mon Sep 17 00:00:00 2001
From: Stsiapan Korf <Stsiapan_Korf@epam.com>
Date: Mon, 11 Feb 2019 16:29:17 +0000
Subject: [PATCH 36/38] MC-10950: 2.3 only - creating attribute option value
 using API returns unexpected response

- Fix svc fails
---
 .../Catalog/Model/ResourceModel/Eav/Attribute.php      |  5 ++---
 .../Model/Entity/Attribute/Source/AbstractSource.php   | 10 ----------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
index 40c5282ccf766..23f612582f42e 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
@@ -236,9 +236,8 @@ public function afterSave()
         ) {
             $this->_indexerEavProcessor->markIndexerAsInvalid();
         }
-        if ($this->_source !== null) {
-            $this->_source->clearOptions();
-        }
+        
+        $this->_source = null;
 
         return parent::afterSave();
     }
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
index 974a070c27535..56188ab997b76 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
@@ -95,16 +95,6 @@ public function getOptionId($value)
         return null;
     }
 
-    /**
-     * Clear cached options.
-     *
-     * @return void
-     */
-    public function clearOptions() : void
-    {
-        $this->_options = null;
-    }
-
     /**
      * Add Value Sort To Collection Select
      *

From 52de5cdccd4eeaa6ce19f39edf1a85a37c0c3210 Mon Sep 17 00:00:00 2001
From: Stsiapan Korf <Stsiapan_Korf@epam.com>
Date: Mon, 11 Feb 2019 17:55:25 +0000
Subject: [PATCH 37/38] MC-10973: Simple product with MAP assigned to
 configurable should displays the same way as products with special price

- Fix svc fails
---
 .../Model/Product/Type/Configurable.php        | 18 ------------------
 app/code/Magento/Msrp/Helper/Data.php          | 17 +++++++++++++----
 .../base/templates/product/price/msrp.phtml    | 16 +++++++++++++++-
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index 2c4b95c818e14..46f10608bc95e 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -1446,22 +1446,4 @@ function($attr) {
 
         return array_unique(array_merge($productAttributes, $requiredAttributes, $usedAttributes));
     }
-
-    /**
-     * Returns msrp for children products
-     *
-     * @param \Magento\Catalog\Model\Product $product
-     * @return int
-     */
-    public function getChildrenMsrp(\Magento\Catalog\Model\Product $product)
-    {
-        $prices = [];
-        foreach ($this->getUsedProducts($product) as $item) {
-            if ($item->getMsrp() !== null) {
-                $prices[] = $item->getMsrp();
-            }
-        }
-        return $prices ? max($prices) : 0;
-    }
-
 }
diff --git a/app/code/Magento/Msrp/Helper/Data.php b/app/code/Magento/Msrp/Helper/Data.php
index 218d26239e243..393383bb2e772 100644
--- a/app/code/Magento/Msrp/Helper/Data.php
+++ b/app/code/Magento/Msrp/Helper/Data.php
@@ -11,6 +11,7 @@
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 
 /**
  * Msrp data helper
@@ -158,11 +159,19 @@ public function isMinimalPriceLessMsrp($product)
         $msrp = $product->getMsrp();
         $price = $product->getPriceInfo()->getPrice(\Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE);
         if ($msrp === null) {
-            if ($product->getTypeId()       !== \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE
-                && $product->getTypeId() !== \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE) {
-                return false;
-            } else {
+            if ($product->getTypeId() === \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE) {
                 $msrp = $product->getTypeInstance()->getChildrenMsrp($product);
+            } elseif ($product->getTypeId() === Configurable::TYPE_CODE) {
+                $prices = [];
+                foreach ($product->getTypeInstance()->getUsedProducts($product) as $item) {
+                    if ($item->getMsrp() !== null) {
+                        $prices[] = $item->getMsrp();
+                    }
+                }
+
+                $msrp = $prices ? max($prices) : 0;
+            } else {
+                return false;
             }
         }
         if ($msrp) {
diff --git a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
index 8af659a5172b3..a951c14cf4c70 100644
--- a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
+++ b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
@@ -20,7 +20,21 @@ $priceType = $block->getPrice();
 /** @var $product \Magento\Catalog\Model\Product */
 $product = $block->getSaleableItem();
 $productId = $product->getId();
-$amount = $product->getMsrp() ?: $product->getTypeInstance()->getChildrenMsrp($product);
+
+$amount = 0;
+if ($product->getMsrp()) {
+    $amount = $product->getMsrp();
+} elseif ($product->getTypeId() === \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE) {
+    $amount = $product->getTypeInstance()->getChildrenMsrp($product);
+} elseif ($product->getTypeId() === \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE) {
+    foreach ($product->getTypeInstance()->getUsedProducts($product) as $item) {
+        if ($item->getMsrp() !== null) {
+            $prices[] = $item->getMsrp();
+        }
+    }
+    $amount = $prices ? max($prices) : 0;
+}
+
 $msrpPrice = $block->renderAmount(
     $priceType->getCustomAmount($amount),
     [

From 633db24ba361ffacd3db3adbdba1491252246de8 Mon Sep 17 00:00:00 2001
From: Mikalai Shostka <mikalai_shostka@epam.com>
Date: Tue, 12 Feb 2019 11:57:17 +0300
Subject: [PATCH 38/38] MC-10971: [Magento Cloud] - Unable to Scope Catalog
 Price rules by custom product attribute

- Fixed MFTF test;
---
 .../Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
index 2d4b164dbde0a..b0c4f2d8a609f 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
@@ -67,6 +67,8 @@
         <waitForElement selector="{{AdminNewCatalogPriceRuleConditions.targetEllipsisValue('1', targetValue)}}" stepKey="waitForIsTarget"/>
         <click selector="{{AdminNewCatalogPriceRuleConditions.targetEllipsisValue('1', 'is')}}" stepKey="clickOnIs"/>
         <selectOption selector="{{AdminNewCatalogPriceRuleConditions.targetSelect('1')}}" userInput="{{targetSelectValue}}" stepKey="selectTargetCondition"/>
+        <click selector="{{AdminNewCatalogPriceRule.fromDateButton}}" stepKey="clickFromCalender"/>
+        <click selector="{{AdminNewCatalogPriceRule.todayDate}}" stepKey="clickFromToday"/>
     </actionGroup>
 
     <!-- Apply all of the saved catalog price rules -->