From c5fe5e71689f1a269fb30dd340cbbcc8d7e3bab2 Mon Sep 17 00:00:00 2001
From: Mikalai Shostka <mikalai_shostka@epam.com>
Date: Wed, 24 Oct 2018 13:11:53 +0300
Subject: [PATCH 01/27] MAGETWO-95834: Unable to create Configurations for
 Configurable Products

- Add validation before serialize data
---
 .../view/adminhtml/web/js/variations/variations.js          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js
index a46943bd5d145..d7f1f540df19d 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js
@@ -383,7 +383,11 @@ define([
          * Chose action for the form save button
          */
         saveFormHandler: function () {
-            this.serializeData();
+            this.formElement().validate();
+
+            if (this.formElement().source.get('params.invalid') === false) {
+                this.serializeData();
+            }
 
             if (this.checkForNewAttributes()) {
                 this.formSaveParams = arguments;

From 3e8f9a6ca641b2212628118abc33141038827583 Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Fri, 26 Oct 2018 15:25:54 +0300
Subject: [PATCH 02/27] MAGETWO-95837: Product is added to Wish List with
 Attributes selected however they were unselected on PDP before

- Fixed an issue with incorrect attributes processing before adding to wishlist;
---
 .../view/frontend/web/js/add-to-wishlist.js      | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
index 7ce934317263b..18b4f2eb2121a 100644
--- a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
+++ b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
@@ -163,16 +163,12 @@ define([
                     data[elementName + '[' + option + ']'] = option;
                 });
             } else {
-                if (elementValue) { //eslint-disable-line no-lonely-if
-                    if (elementName.substr(elementName.length - 2) == '[]') { //eslint-disable-line eqeqeq, max-depth
-                        elementName = elementName.substring(0, elementName.length - 2);
-
-                        if (elementValue) { //eslint-disable-line max-depth
-                            data[elementName + '[' + elementValue + ']'] = elementValue;
-                        }
-                    } else {
-                        data[elementName] = elementValue;
-                    }
+                if (elementName.substr(elementName.length - 2) == '[]') { //eslint-disable-line eqeqeq, max-depth
+                    elementName = elementName.substring(0, elementName.length - 2);
+
+                    data[elementName + '[' + elementValue + ']'] = elementValue;
+                } else {
+                    data[elementName] = elementValue;
                 }
             }
 

From af8c0bd6a3f27f3dfa329fb03d4a993d6054b0b6 Mon Sep 17 00:00:00 2001
From: Lusine <lusine_papyan@epam.com>
Date: Mon, 29 Oct 2018 18:17:22 +0400
Subject: [PATCH 03/27] MAGETWO-95837: Product is added to Wish List with
 Attributes selected however they were unselected on PDP before

- Add automated test
---
 ...ddToCartWishListWithUnselectedAttrTest.xml | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml

diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml
new file mode 100644
index 0000000000000..f29fb5ee6f34a
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml
@@ -0,0 +1,69 @@
+<?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="ConfProdAddToCartWishListWithUnselectedAttrTest">
+        <annotations>
+            <features value="Wishlist"/>
+            <stories value="MAGETWO-95837: Product is added to Wish List with Attributes selected however they were unselected on PDP before"/>
+            <group value="wishlist"/>
+            <title value="Adding configurable product to Cart from Wish List with unselected attributes"/>
+            <description value="Verify adding configurable product to Cart from Wish List when attributes is unselected"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MAGETWO-95897"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <!--Create Configurable product-->
+            <actionGroup ref="createConfigurableProduct" stepKey="createProduct">
+                <argument name="product" value="_defaultProduct"/>
+                <argument name="category" value="$$createCategory$$"/>
+            </actionGroup>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+        </before>
+
+        <!--Login as customer -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForLogin"/>
+
+        <!--Go To Created Product Page-->
+        <amOnPage stepKey="goToCreatedProductPage" url="{{_defaultProduct.urlKey}}.html"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad2"/>
+
+        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" stepKey="checkDropDownProductOption"/>
+        <selectOption userInput="{{colorProductAttribute1.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption1"/>
+        <selectOption userInput="{{colorProductAttribute2.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption2"/>
+        <click selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" stepKey="clickDropDownProductOption"/>
+
+        <!--Add the product to Wish List-->
+        <click selector="{{StorefrontProductPageSection.addToWishlist}}" stepKey="addFirstPnroductToWishlist"/>
+        <waitForPageLoad stepKey="waitForLoading"/>
+        <!--Click "Add All to Cart" button-->
+        <click selector="{{StorefrontCustomerWishlistProductSection.ProductAddAllToCart}}" stepKey="addAllToCart"/>
+
+        <!--Assert Correct Error Message-->
+        <see userInput="You need to choose options for your item for" stepKey="assertCorrectErrorMessage"/>
+        <dontSee userInput="1 product(s) have been added to shopping cart" stepKey="dontSeeSuccessMessage"/>
+
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <!-- Delete the first simple product -->
+            <actionGroup stepKey="deleteProduct1" ref="deleteProductBySku">
+                <argument name="sku" value="{{_defaultProduct.sku}}"/>
+            </actionGroup>
+            <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
+                              dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>

From 272a361992929f7080327d758553c91010f380a6 Mon Sep 17 00:00:00 2001
From: David Grigoryan <david_grigoryan@epam.com>
Date: Tue, 30 Oct 2018 17:00:03 +0400
Subject: [PATCH 04/27] MAGETWO-95834: Unable to create Configurations for
 Configurable Products

- Add automated test
---
 ...AdminChooseAffectedAttributeSetSection.xml |   3 +-
 .../AdminProductFormConfigurationsSection.xml |   2 +
 ...nCheckValidatorConfigurableProductTest.xml | 126 ++++++++++++++++++
 3 files changed, 130 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml
index 4289638352990..6e8303e6baead 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml
@@ -10,5 +10,6 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminChooseAffectedAttributeSetPopup">
         <element name="confirm" type="button" selector="button[data-index='confirm_button']" timeout="30"/>
+        <element name="closePopUp" type="button" selector="//*[contains(@class,'product_form_product_form_configurable_attribute_set')]//button[@data-role='closeBtn']" timeout="30"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
index 0de7bc00044c8..6db733b689d45 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
@@ -22,6 +22,8 @@
         <element name="removeProductBtn" type="button" selector="//a[text()='Remove Product']"/>
         <element name="disableProductBtn" type="button" selector="//a[text()='Disable Product']"/>
         <element name="enableProductBtn" type="button" selector="//a[text()='Enable Product']"/>
+        <element name="confProductSku" type="input" selector="//*[@name='configurable-matrix[{{arg}}][sku]']" parameterized="true"/>
+        <element name="confProductSkuMessage" type="text" selector="//*[@name='configurable-matrix[{{arg}}][sku]']/following-sibling::label" parameterized="true"/>
     </section>
     <section name="AdminConfigurableProductFormSection">
         <element name="productWeight" type="input" selector=".admin__control-text[name='product[weight]']"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
new file mode 100644
index 0000000000000..44ab6e2e8e04f
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
@@ -0,0 +1,126 @@
+<?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="AdminCheckValidatorConfigurableProductTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="MAGETWO-95834: Unable to create Configurations for Configurable Products"/>
+            <title value="Check that validator works correctly when creating Configurations for Configurable Products"/>
+            <description value="Verify validator works correctly for Configurable Products"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-95995"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <!--Login as admin-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Create Category-->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <!--Create Configurable product-->
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+
+        <!-- Find the product that we just created using the product grid -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
+            dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedProduct">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForProductFilterLoad"/>
+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+
+        <!-- Create configurations based off the Text Swatch we created earlier -->
+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations"/>
+
+        <!--Create new attribute-->
+        <waitForElementVisible stepKey="waitForNewAttributePageOpened" selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="clickCreateNewAttribute" after="waitForNewAttributePageOpened"/>
+        <switchToIFrame selector="{{AdminNewAttributePanel.newAttributeIFrame}}" stepKey="enterAttributePanelIFrame" after="clickCreateNewAttribute"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanel.defaultLabel}}" time="30" stepKey="waitForIframeLoad" after="enterAttributePanelIFrame"/>
+        <fillField selector="{{AdminNewAttributePanel.defaultLabel}}" userInput="{{productDropDownAttribute.attribute_code}}" stepKey="fillDefaultLabel" after="waitForIframeLoad"/>
+        <selectOption selector="{{AdminNewAttributePanel.inputType}}" userInput="{{colorProductAttribute.input_type}}" stepKey="selectAttributeInputType" after="fillDefaultLabel"/>
+        <!--Add option to attribute-->
+        <click selector="{{AdminNewAttributePanel.addOption}}" stepKey="clickAddOption1" after="selectAttributeInputType"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanel.isDefault('1')}}" time="30" stepKey="waitForOptionRow1" after="clickAddOption1"/>
+        <fillField selector="{{AdminNewAttributePanel.optionAdminValue('0')}}" userInput="ThisIsLongNameNameLengthMoreThanSixtyFourThisIsLongNameNameLength" stepKey="fillAdminLabel1" after="waitForOptionRow1"/>
+        <fillField selector="{{AdminNewAttributePanel.optionDefaultStoreValue('0')}}" userInput="{{colorProductAttribute1.name}}" stepKey="fillDefaultLabel1" after="fillAdminLabel1"/>
+
+        <!--Save attribute-->
+        <click selector="{{AdminNewAttributePanel.saveAttribute}}" stepKey="clickOnNewAttributePanel"/>
+        <waitForPageLoad stepKey="waitForSaveAttribute"/>
+        <switchToIFrame stepKey="switchOutOfIFrame"/>
+
+        <!--Find attribute in grid and select-->
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="clickOnFilters"/>
+        <fillField selector="{{AdminDataGridHeaderSection.attributeCodeFilterInput}}" userInput="{{productDropDownAttribute.attribute_code}}" stepKey="fillFilterAttributeCodeField"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminDataGridTableSection.rowCheckbox('1')}}" stepKey="clickOnFirstCheckbox"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickNextStep1"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute(productDropDownAttribute.attribute_code)}}" stepKey="waitForNextPageOpened"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute(productDropDownAttribute.attribute_code)}}" stepKey="clickSelectAll"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickNextStep2"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.applySinglePriceToAllSkus}}" stepKey="waitForNextPageOpened2"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applySinglePriceToAllSkus}}" stepKey="clickOnApplySinglePriceToAllSkus"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.singlePrice}}" userInput="10" stepKey="enterAttributePrice"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="100" stepKey="enterAttributeQuantity"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextStep3"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="waitForNextPageOpened3"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="generateProducts"/>
+        <waitForElementVisible selector="{{AdminProductFormActionSection.saveButton}}" stepKey="waitForSaveButtonVisible"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <waitForElementVisible selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="waitForPopUpVisible"/>
+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
+        <dontSeeElement selector="{{AdminMessagesSection.success}}" stepKey="dontSeeSaveProductMessage"/>
+
+        <!--Close modal window-->
+        <click selector="{{AdminChooseAffectedAttributeSetPopup.closePopUp}}" stepKey="clickOnClosePopup"/>
+        <waitForElementNotVisible selector="{{AdminChooseAffectedAttributeSetPopup.closePopUp}}" stepKey="waitForDialogClosed"/>
+
+        <!--See that validation message is shown under the fields-->
+        <scrollTo selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" stepKey="scrollTConfigurationTab"/>
+        <see userInput="Please enter less or equal than 64 symbols." selector="{{AdminProductFormConfigurationsSection.confProductSkuMessage('0')}}" stepKey="SeeValidationMessage"/>
+
+        <!--Edit "SKU" with valid quantity-->
+        <fillField stepKey="fillValidValue" selector="{{AdminProductFormConfigurationsSection.confProductSku('0')}}" userInput="{{ApiConfigurableProduct.name}}-thisIsShortName"/>
+
+        <!--Click on "Save"-->
+        <waitForElementVisible selector="{{AdminProductFormActionSection.saveButton}}" stepKey="waitForSaveBtnVisible"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProductAgain"/>
+
+        <!--Click on "Confirm". Product is saved, success message appears -->
+        <waitForElementVisible selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="waitPopUpVisible"/>
+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmPopup"/>
+        <seeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSaveProductMessage"/>
+
+        <after>
+            <!--Delete created data-->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteProduct">
+                <argument name="sku" value="{{ApiConfigurableProduct.name}}-thisIsShortName"/>
+            </actionGroup>
+            <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
+                dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+            <!-- Remove attribute -->
+            <actionGroup ref="deleteProductAttribute" stepKey="deleteAttribute">
+                <argument name="ProductAttribute" value="productDropDownAttribute"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>

From 764f7298953c4938abafaba499ec3d3b58a65a03 Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Mon, 5 Nov 2018 20:33:57 +0300
Subject: [PATCH 05/27] MAGETWO-96107: Additional blank option in country
 dropdown

- Delete blank line for single country
---
 .../Directory/Model/ResourceModel/Country/Collection.php       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php b/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php
index 20140baae01b6..28d59c5338194 100644
--- a/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php
+++ b/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php
@@ -205,6 +205,7 @@ public function getItemById($countryId)
 
     /**
      * Add filter by country code to collection.
+     *
      * $countryCode can be either array of country codes or string representing one country code.
      * $iso can be either array containing 'iso2', 'iso3' values or string with containing one of that values directly.
      * The collection will contain countries where at least one of contry $iso fields matches $countryCode.
@@ -297,7 +298,7 @@ public function toOptionArray($emptyLabel = ' ')
             }
             $options[] = $option;
         }
-        if ($emptyLabel !== false && count($options) > 0) {
+        if ($emptyLabel !== false && count($options) > 1) {
             array_unshift($options, ['value' => '', 'label' => $emptyLabel]);
         }
 

From a9d2dfcb96568562edd03d62682a31bfcda09df8 Mon Sep 17 00:00:00 2001
From: Sona Sargsyan <sona_sargsyan@epam.com>
Date: Mon, 12 Nov 2018 17:28:07 +0400
Subject: [PATCH 06/27] MAGETWO-96107: Additional blank option in country
 dropdown

- Added automation test
---
 .../Mftf/Data/CountryOptionConfigData.xml     | 24 ++++++++++
 .../Metadata/system_config-countries-meta.xml | 35 ++++++++++++++
 ...untryDropDownWithOneAllowedCountryTest.xml | 48 +++++++++++++++++++
 3 files changed, 107 insertions(+)
 create mode 100644 app/code/Magento/Config/Test/Mftf/Data/CountryOptionConfigData.xml
 create mode 100644 app/code/Magento/Config/Test/Mftf/Metadata/system_config-countries-meta.xml
 create mode 100644 app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml

diff --git a/app/code/Magento/Config/Test/Mftf/Data/CountryOptionConfigData.xml b/app/code/Magento/Config/Test/Mftf/Data/CountryOptionConfigData.xml
new file mode 100644
index 0000000000000..641a0c8705d69
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Data/CountryOptionConfigData.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="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="EnableAdminAccountAllowCountry" type="admin_account_country_options_config">
+        <requiredEntity type="admin_account_country_options_value">AdminAccountAllowCountryUS</requiredEntity>
+    </entity>
+    <entity name="AdminAccountAllowCountryUS" type="admin_account_country_options_value">
+        <data key="value">US</data>
+    </entity>
+
+    <entity name="DisableAdminAccountAllowCountry" type="default_admin_account_country_options_config">
+        <requiredEntity type="checkoutTotalFlagZero">DefaultAdminAccountAllowCountry</requiredEntity>
+    </entity>
+    <entity name="DefaultAdminAccountAllowCountry" type="checkoutTotalFlagZero">
+        <data key="value">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Config/Test/Mftf/Metadata/system_config-countries-meta.xml b/app/code/Magento/Config/Test/Mftf/Metadata/system_config-countries-meta.xml
new file mode 100644
index 0000000000000..d0935bdca4822
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Metadata/system_config-countries-meta.xml
@@ -0,0 +1,35 @@
+<?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="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+    <operation name="AdminAccountCountryOptionConfig" dataType="admin_account_country_options_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/general/" method="POST">
+        <object key="groups" dataType="admin_account_country_options_config">
+            <object key="country" dataType="admin_account_country_options_config">
+                 <object key="fields" dataType="admin_account_country_options_config">
+                    <object key="allow" dataType="admin_account_country_options_value">
+                        <field key="value">string</field>
+                    </object>
+                 </object>
+            </object>
+        </object>
+    </operation>
+
+    <operation name="DefaultAdminAccountCountryOptionConfig" dataType="default_admin_account_country_options_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/general/" method="POST">
+        <object key="groups" dataType="default_admin_account_country_options_config">
+            <object key="country" dataType="default_admin_account_country_options_config">
+                <object key="fields" dataType="default_admin_account_country_options_config">
+                    <object key="allow" dataType="default_admin_account_country_options_config">
+                        <object key="inherit" dataType="checkoutTotalFlagZero">
+                            <field key="value">string</field>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml b/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
new file mode 100644
index 0000000000000..7b4cf8eb40c24
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
@@ -0,0 +1,48 @@
+<?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="CheckingCountryDropDownWithOneAllowedCountryTest">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Dynamic Media URL"/>
+            <title value="Verify that Allow Dynamic Media URLs setting is removed from configuration page"/>
+            <description value="Verify that Allow Dynamic Media URLs setting is removed from configuration page"/>
+            <severity value="CRITICAL"/>
+            <useCaseId value="MC-1387564"/>
+            <testCaseId value="MC-3185678"/>
+            <group value="configuration"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="EnableAdminAccountAllowCountry" stepKey="setAllowedCountries"/>
+
+        </before>
+        <after>
+            <createData entity="DisableAdminAccountAllowCountry" stepKey="setDefaultValueForAllowCountries"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+         <!--Flush Magento Cache-->
+        <magentoCLI stepKey="flushCache" command="cache:flush"/>
+
+         <!--Create a customer account from Storefront-->
+        <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="createAnAccount">
+            <argument name="Customer" value="CustomerEntityOne"/>
+        </actionGroup>
+        <click selector="{{CheckoutPaymentSection.addressBook}}" stepKey="goToAddressBook"/>
+        <wait time="20" stepKey="kk"/>
+
+        <click selector="{{StorefrontCustomerAddressSection.country}}" stepKey="clickToExpandCountryDropDown"/>
+        <see selector="{{StorefrontCustomerAddressSection.country}}" userInput="United States" stepKey="seeSelectedCountry"/>
+        <dontSee selector="{{StorefrontCustomerAddressSection.country}}" userInput="Brazil" stepKey="canNotSeeSelectedCountry"/>
+    </test>
+</tests>
+
+

From 43e80e77d967430d0c9fb0dbf812daca95b3d6b4 Mon Sep 17 00:00:00 2001
From: Sona Sargsyan <sona_sargsyan@epam.com>
Date: Mon, 12 Nov 2018 18:18:15 +0400
Subject: [PATCH 07/27] MAGETWO-96107: Additional blank option in country
 dropdown

- Added some corrections to automation test
---
 .../Mftf/Data/CountryOptionConfigData.xml     |  2 +-
 .../Metadata/system_config-countries-meta.xml |  2 +-
 ...untryDropDownWithOneAllowedCountryTest.xml | 20 ++++++-------------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Config/Test/Mftf/Data/CountryOptionConfigData.xml b/app/code/Magento/Config/Test/Mftf/Data/CountryOptionConfigData.xml
index 641a0c8705d69..53ca46e746206 100644
--- a/app/code/Magento/Config/Test/Mftf/Data/CountryOptionConfigData.xml
+++ b/app/code/Magento/Config/Test/Mftf/Data/CountryOptionConfigData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="EnableAdminAccountAllowCountry" type="admin_account_country_options_config">
         <requiredEntity type="admin_account_country_options_value">AdminAccountAllowCountryUS</requiredEntity>
     </entity>
diff --git a/app/code/Magento/Config/Test/Mftf/Metadata/system_config-countries-meta.xml b/app/code/Magento/Config/Test/Mftf/Metadata/system_config-countries-meta.xml
index d0935bdca4822..bd16c225af51d 100644
--- a/app/code/Magento/Config/Test/Mftf/Metadata/system_config-countries-meta.xml
+++ b/app/code/Magento/Config/Test/Mftf/Metadata/system_config-countries-meta.xml
@@ -6,7 +6,7 @@
   */
 -->
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
     <operation name="AdminAccountCountryOptionConfig" dataType="admin_account_country_options_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/general/" method="POST">
         <object key="groups" dataType="admin_account_country_options_config">
             <object key="country" dataType="admin_account_country_options_config">
diff --git a/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml b/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
index 7b4cf8eb40c24..728b4be805a13 100644
--- a/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
+++ b/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
@@ -10,39 +10,31 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="CheckingCountryDropDownWithOneAllowedCountryTest">
         <annotations>
-            <features value="Backend"/>
-            <stories value="Dynamic Media URL"/>
-            <title value="Verify that Allow Dynamic Media URLs setting is removed from configuration page"/>
-            <description value="Verify that Allow Dynamic Media URLs setting is removed from configuration page"/>
-            <severity value="CRITICAL"/>
-            <useCaseId value="MC-1387564"/>
-            <testCaseId value="MC-3185678"/>
+            <features value="Config"/>
+            <stories value="MAGETWO-96107: Additional blank option in country dropdown"/>
+            <title value="Checking country drop-down with one allowed country"/>
+            <description value="Check country drop-down with one allowed country"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-96133"/>
             <group value="configuration"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <createData entity="EnableAdminAccountAllowCountry" stepKey="setAllowedCountries"/>
-
         </before>
         <after>
             <createData entity="DisableAdminAccountAllowCountry" stepKey="setDefaultValueForAllowCountries"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
-
          <!--Flush Magento Cache-->
         <magentoCLI stepKey="flushCache" command="cache:flush"/>
-
          <!--Create a customer account from Storefront-->
         <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="createAnAccount">
             <argument name="Customer" value="CustomerEntityOne"/>
         </actionGroup>
         <click selector="{{CheckoutPaymentSection.addressBook}}" stepKey="goToAddressBook"/>
-        <wait time="20" stepKey="kk"/>
-
         <click selector="{{StorefrontCustomerAddressSection.country}}" stepKey="clickToExpandCountryDropDown"/>
         <see selector="{{StorefrontCustomerAddressSection.country}}" userInput="United States" stepKey="seeSelectedCountry"/>
         <dontSee selector="{{StorefrontCustomerAddressSection.country}}" userInput="Brazil" stepKey="canNotSeeSelectedCountry"/>
     </test>
 </tests>
-
-

From 5727f089e96b873b01ad93d656dc1c16cb0ecac5 Mon Sep 17 00:00:00 2001
From: Mikalai Shostka <mikalai_shostka@epam.com>
Date: Fri, 23 Nov 2018 13:22:49 +0300
Subject: [PATCH 08/27] MAGETWO-96409: [2.3.x] [MAGENTO CLOUD] Unable to add
 more attributes in size

- Add min width for columns
---
 .../templates/catalog/product/attribute/text.phtml          | 6 +++---
 .../Magento/Swatches/view/adminhtml/web/css/swatches.css    | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml
index 8d4400b3d0477..e00c41d371c9e 100644
--- a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml
+++ b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml
@@ -21,7 +21,7 @@ $stores = $block->getStoresSortedBySortOrder();
                 <th class="col-draggable"></th>
                 <th class="col-default"><span><?= $block->escapeHtml(__('Is Default')) ?></span></th>
                 <?php foreach ($stores as $_store): ?>
-                    <th class="col-swatch col-<%- data.id %>
+                    <th class="col-swatch col-swatch-min-width col-<%- data.id %>
                         <?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> _required<?php endif; ?>"
                         colspan="2">
                         <span><?= $block->escapeHtml($_store->getName()) ?></span>
@@ -75,7 +75,7 @@ $stores = $block->getStoresSortedBySortOrder();
             </td>
             <?php foreach ($stores as $_store): ?>
                 <?php $storeId = (int)$_store->getId(); ?>
-                <td class="col-swatch col-<%- data.id %>">
+                <td class="col-swatch col-swatch-min-width col-<%- data.id %>">
                     <input class="input-text
                         swatch-text-field-<?= /* @noEscape */ $storeId ?>
                         <?php if ($storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option required-unique<?php endif; ?>"
@@ -83,7 +83,7 @@ $stores = $block->getStoresSortedBySortOrder();
                            type="text" value="<%- data.swatch<?= /* @noEscape */ $storeId ?> %>"
                            placeholder="<?= $block->escapeHtml(__("Swatch")) ?>"/>
                 </td>
-                <td class="swatch-col-<%- data.id %>">
+                <td class="col-swatch-min-width swatch-col-<%- data.id %>">
                     <input name="optiontext[value][<%- data.id %>][<?= /* @noEscape */ $storeId ?>]"
                            value="<%- data.store<?= /* @noEscape */ $storeId ?> %>"
                            class="input-text<?php if ($storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option<?php endif; ?>"
diff --git a/app/code/Magento/Swatches/view/adminhtml/web/css/swatches.css b/app/code/Magento/Swatches/view/adminhtml/web/css/swatches.css
index d170ed0345a03..1383634ef424c 100644
--- a/app/code/Magento/Swatches/view/adminhtml/web/css/swatches.css
+++ b/app/code/Magento/Swatches/view/adminhtml/web/css/swatches.css
@@ -149,6 +149,10 @@
     width: 50px;
 }
 
+.col-swatch-min-width {
+    min-width: 30px;
+}
+
 .swatches-visual-col.unavailable:after {
     content: '';
     position: absolute;

From ee1c1cc0cba9f3ecb0c654a8ccdd1c740044855d Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Tue, 27 Nov 2018 12:23:51 +0300
Subject: [PATCH 09/27] MAGETWO-91640: Import of Products fails on error when
 errors should be skipped

- Added warning message with skipped errors count information;
---
 .../Magento/ImportExport/Model/Import.php     | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php
index 064c696ad0a84..27217dfd9908d 100644
--- a/app/code/Magento/ImportExport/Model/Import.php
+++ b/app/code/Magento/ImportExport/Model/Import.php
@@ -7,9 +7,11 @@
 namespace Magento\ImportExport\Model;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\HTTP\Adapter\FileTransferFactory;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingError;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
+use Magento\Framework\Message\ManagerInterface;
 
 /**
  * Import model
@@ -167,6 +169,11 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
      */
     protected $_filesystem;
 
+    /**
+     * @var ManagerInterface
+     */
+    private $messageManager;
+
     /**
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Filesystem $filesystem
@@ -183,6 +190,7 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
      * @param History $importHistoryModel
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $localeDate
      * @param array $data
+     * @param ManagerInterface|null $messageManager
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -200,7 +208,8 @@ public function __construct(
         \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry,
         \Magento\ImportExport\Model\History $importHistoryModel,
         \Magento\Framework\Stdlib\DateTime\DateTime $localeDate,
-        array $data = []
+        array $data = [],
+        ManagerInterface $messageManager = null
     ) {
         $this->_importExportData = $importExportData;
         $this->_coreConfig = $coreConfig;
@@ -215,6 +224,7 @@ public function __construct(
         $this->_filesystem = $filesystem;
         $this->importHistoryModel = $importHistoryModel;
         $this->localeDate = $localeDate;
+        $this->messageManager = $messageManager ?: ObjectManager::getInstance()->get(ManagerInterface::class);
         parent::__construct($logger, $filesystem, $data);
     }
 
@@ -588,9 +598,13 @@ public function validateSource(\Magento\ImportExport\Model\Import\AbstractSource
         $messages = $this->getOperationResultMessages($errorAggregator);
         $this->addLogComment($messages);
 
-        $result = !$errorAggregator->getErrorsCount();
+        $errorsCount = $errorAggregator->getErrorsCount();
+        $result = !$errorsCount;
         $validationStrategy = $this->getData(self::FIELD_NAME_VALIDATION_STRATEGY);
-        if ($validationStrategy === ProcessingErrorAggregatorInterface::VALIDATION_STRATEGY_SKIP_ERRORS) {
+        if ($errorsCount
+            && $validationStrategy === ProcessingErrorAggregatorInterface::VALIDATION_STRATEGY_SKIP_ERRORS
+        ) {
+            $this->messageManager->addWarningMessage(sprintf(__('Skipped errors: %d'), $errorsCount));
             $result = true;
         }
 

From 2cab2ec543a6b4bcbc6220367878e73584c70184 Mon Sep 17 00:00:00 2001
From: Sona Sargsyan <sona_sargsyan@epam.com>
Date: Wed, 28 Nov 2018 13:38:06 +0400
Subject: [PATCH 10/27] MAGETWO-96107: Additional blank option in country
 dropdown

- Added some corrections based on comments
---
 ...kingCountryDropDownWithOneAllowedCountryTest.xml |  7 ++++++-
 .../OpenEditCustomerFromAdminActionGroup.xml        | 13 +++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml b/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
index 728b4be805a13..af620ea2d2ade 100644
--- a/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
+++ b/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
@@ -19,11 +19,16 @@
             <group value="configuration"/>
         </annotations>
         <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <createData entity="EnableAdminAccountAllowCountry" stepKey="setAllowedCountries"/>
         </before>
         <after>
             <createData entity="DisableAdminAccountAllowCountry" stepKey="setDefaultValueForAllowCountries"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="DeleteCustomerAdminActionGroup" stepKey="deleteCustomer">
+                <argument name="customer" value="CustomerEntityOne"/>
+            </actionGroup>
+            <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearFilters"/>
+            <waitForPageLoad stepKey="WaitForPageToLoad"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
          <!--Flush Magento Cache-->
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
index 5b3a7a70aa2e6..b727c6f77d203 100755
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
@@ -35,8 +35,21 @@
         <click selector="{{AdminCustomerGridMainActionsSection.delete}}" stepKey="clickDelete"/>
         <waitForAjaxLoad stepKey="waitForLoadConfirmation"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
+        <wait time="5" stepKey="aaa"/>
         <see selector="{{AdminMessagesSection.successMessage}}" userInput="A total of 1 record(s) were deleted" stepKey="seeSuccess"/>
     </actionGroup>
+
+    <actionGroup name="DeleteCustomerAdminActionGroup" extends="DeleteCustomerFromAdminActionGroup">
+        <arguments>
+            <argument name="customer"/>
+        </arguments>
+        <remove keyForRemoval="fillSearch"/>
+        <remove keyForRemoval="clickSubmit"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openFiltersSectionOnCustomerPage" after="clickOnButtonToRemoveFiltersIfPresent"/>
+        <fillField userInput="{{customer.email}}" selector="{{AdminDataGridHeaderSection.filterFieldInput('email')}}" stepKey="fillEmailOnFiltersSection" after="openFiltersSectionOnCustomerPage"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFiltersButton" after="fillEmailOnFiltersSection"/>
+    </actionGroup>
+
     <actionGroup name="AdminClearCustomersFiltersActionGroup">
         <amOnPage url="{{AdminCustomerPage.url}}" stepKey="amOnCustomersPage"/>
         <waitForPageLoad stepKey="WaitForPageToLoad"/>

From dfe294622548712c71368f1fa6caa0fd711d0cbe Mon Sep 17 00:00:00 2001
From: Nikita Chubukov <nikita_chubukov@epam.com>
Date: Wed, 28 Nov 2018 15:52:07 +0300
Subject: [PATCH 11/27] MAGETWO-96413: Restricted Admin User Backend Order
 Creation Issue

- Added condition to definition current currency code
---
 app/code/Magento/Store/Model/Store.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
index c92d62cd0bbe3..3caaf7837947d 100644
--- a/app/code/Magento/Store/Model/Store.php
+++ b/app/code/Magento/Store/Model/Store.php
@@ -889,7 +889,10 @@ public function setCurrentCurrencyCode($code)
         if (in_array($code, $this->getAvailableCurrencyCodes())) {
             $this->_getSession()->setCurrencyCode($code);
 
-            $defaultCode = $this->_storeManager->getWebsite()->getDefaultStore()->getDefaultCurrency()->getCode();
+            $defaultCode = ($this->_storeManager->getStore() !== null)
+                ? $this->_storeManager->getStore()->getDefaultCurrency()->getCode()
+                : $this->_storeManager->getWebsite()->getDefaultStore()->getDefaultCurrency()->getCode();
+            
             $this->_httpContext->setValue(Context::CONTEXT_CURRENCY, $code, $defaultCode);
         }
         return $this;

From 6f5a212b32b4f26c4825fc6d9be2dd44d70d6abc Mon Sep 17 00:00:00 2001
From: David Grigoryan <david_grigoryan@epam.com>
Date: Thu, 29 Nov 2018 10:29:57 +0400
Subject: [PATCH 12/27] MAGETWO-95834: Unable to create Configurations for
 Configurable Products

- Updated automated test
---
 ...nCheckValidatorConfigurableProductTest.xml | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
index 44ab6e2e8e04f..2c331fa05efd7 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
@@ -11,11 +11,11 @@
     <test name="AdminCheckValidatorConfigurableProductTest">
         <annotations>
             <features value="ConfigurableProduct"/>
-            <stories value="MAGETWO-95834: Unable to create Configurations for Configurable Products"/>
             <title value="Check that validator works correctly when creating Configurations for Configurable Products"/>
             <description value="Verify validator works correctly for Configurable Products"/>
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-95995"/>
+            <useCaseId value="MAGETWO-95834"/>
             <group value="ConfigurableProduct"/>
         </annotations>
 
@@ -30,6 +30,22 @@
             </createData>
         </before>
 
+        <after>
+            <!--Delete created data-->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteProduct">
+                <argument name="sku" value="{{ApiConfigurableProduct.name}}-thisIsShortName"/>
+            </actionGroup>
+            <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
+                              dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+            <!-- Remove attribute -->
+            <actionGroup ref="deleteProductAttribute" stepKey="deleteAttribute">
+                <argument name="ProductAttribute" value="productDropDownAttribute"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
         <!-- Find the product that we just created using the product grid -->
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
         <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
@@ -106,21 +122,5 @@
         <waitForElementVisible selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="waitPopUpVisible"/>
         <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmPopup"/>
         <seeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSaveProductMessage"/>
-
-        <after>
-            <!--Delete created data-->
-            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-            <actionGroup ref="deleteProductBySku" stepKey="deleteProduct">
-                <argument name="sku" value="{{ApiConfigurableProduct.name}}-thisIsShortName"/>
-            </actionGroup>
-            <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
-                dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
-            <!-- Remove attribute -->
-            <actionGroup ref="deleteProductAttribute" stepKey="deleteAttribute">
-                <argument name="ProductAttribute" value="productDropDownAttribute"/>
-            </actionGroup>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
     </test>
 </tests>

From e5bdad1a6e08d5b936b2165f5053bb5920ffc314 Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Wed, 21 Nov 2018 16:14:08 +0300
Subject: [PATCH 13/27] MAGETWO-96428: [2.3.x] App:config:dump doesn't lock all
 the settings in Magento backend

- Fixed an issue with not disabled settings after dump was processed;
---
 lib/internal/Magento/Framework/App/DeploymentConfig.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig.php b/lib/internal/Magento/Framework/App/DeploymentConfig.php
index 615c295675adc..40b03b068d6ab 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig.php
@@ -70,6 +70,11 @@ public function get($key = null, $defaultValue = null)
         if ($key === null) {
             return $this->flatData;
         }
+
+        if (array_key_exists($key, $this->flatData) && $this->flatData[$key] === null) {
+            return '';
+        }
+
         return $this->flatData[$key] ?? $defaultValue;
     }
 
@@ -146,6 +151,8 @@ private function load()
     }
 
     /**
+     * Array keys conversion
+     *
      * Convert associative array of arbitrary depth to a flat associative array with concatenated key path as keys
      * each level of array is accessible by path key
      *

From 9b4d1e62e256cb08809a174f129a48647198ae06 Mon Sep 17 00:00:00 2001
From: David Grigoryan <david_grigoryan@epam.com>
Date: Thu, 29 Nov 2018 14:45:31 +0400
Subject: [PATCH 14/27] MAGETWO-95837: Product is added to Wish List with
 Attributes selected however they were unselected on PDP before

- Updated automated test
---
 ...ddToCartWishListWithUnselectedAttrTest.xml | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml
index f29fb5ee6f34a..6669e90c8d3e3 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml
@@ -10,12 +10,12 @@
     <test name="ConfProdAddToCartWishListWithUnselectedAttrTest">
         <annotations>
             <features value="Wishlist"/>
-            <stories value="MAGETWO-95837: Product is added to Wish List with Attributes selected however they were unselected on PDP before"/>
             <group value="wishlist"/>
             <title value="Adding configurable product to Cart from Wish List with unselected attributes"/>
             <description value="Verify adding configurable product to Cart from Wish List when attributes is unselected"/>
             <severity value="AVERAGE"/>
             <testCaseId value="MAGETWO-95897"/>
+            <useCaseId value="MAGETWO-95837"/>
         </annotations>
 
         <before>
@@ -28,6 +28,17 @@
             </actionGroup>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
         </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <!-- Delete the first simple product -->
+            <actionGroup stepKey="deleteProduct1" ref="deleteProductBySku">
+                <argument name="sku" value="{{_defaultProduct.sku}}"/>
+            </actionGroup>
+            <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
+                              dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
 
         <!--Login as customer -->
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
@@ -49,21 +60,10 @@
         <waitForPageLoad stepKey="waitForLoading"/>
         <!--Click "Add All to Cart" button-->
         <click selector="{{StorefrontCustomerWishlistProductSection.ProductAddAllToCart}}" stepKey="addAllToCart"/>
+        <waitForElementVisible stepKey="waitForErrorAppears" selector="{{StorefrontMessagesSection.error}}"/>
 
         <!--Assert Correct Error Message-->
         <see userInput="You need to choose options for your item for" stepKey="assertCorrectErrorMessage"/>
         <dontSee userInput="1 product(s) have been added to shopping cart" stepKey="dontSeeSuccessMessage"/>
-
-        <after>
-            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <!-- Delete the first simple product -->
-            <actionGroup stepKey="deleteProduct1" ref="deleteProductBySku">
-                <argument name="sku" value="{{_defaultProduct.sku}}"/>
-            </actionGroup>
-            <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
-                              dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
     </test>
 </tests>

From ea95d98e99b36d47458d049a47f0b7f94510b742 Mon Sep 17 00:00:00 2001
From: Lusine <lusine_papyan@epam.com>
Date: Fri, 30 Nov 2018 09:49:47 +0400
Subject: [PATCH 15/27] MAGETWO-96413: Restricted Admin User Backend Order
 Creation Issue

- Add automated test script
---
 ...omerWithWebsiteAndStoreViewActionGroup.xml | 21 +++++++++++++++++++
 .../ActionGroup/AdminOrderActionGroup.xml     |  8 +++++++
 .../AdminCreateStoreGroupActionGroup.xml      | 18 ++++++++++++++++
 3 files changed, 47 insertions(+)

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
index 0071acf2ef1e0..2c6410f7d45cd 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
@@ -40,4 +40,25 @@
         <waitForPageLoad stepKey="waitForCustomersPage"/>
         <see stepKey="seeSuccessMessage" userInput="You saved the customer."/>
     </actionGroup>
+
+    <actionGroup name="AdminCreateCustomerWithWebSiteAndGroup">
+        <arguments>
+            <argument name="customerData" defaultValue="Simple_US_Customer"/>
+            <argument name="website" type="string" defaultValue="customWebsite"/>
+            <argument name="storeView" type="string" defaultValue="customStore"/>
+        </arguments>
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="goToCustomersPage"/>
+        <click stepKey="addNewCustomer" selector="{{AdminCustomerGridMainActionsSection.addNewCustomer}}"/>
+        <selectOption stepKey="selectWebSite" selector="{{AdminCustomerAccountInformationSection.associateToWebsite}}" userInput="{{website}}"/>
+        <fillField stepKey="FillFirstName" selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="{{customerData.firstname}}"/>
+        <fillField stepKey="FillLastName" selector="{{AdminCustomerAccountInformationSection.lastName}}" userInput="{{customerData.lastname}}"/>
+        <fillField stepKey="FillEmail" selector="{{AdminCustomerAccountInformationSection.email}}" userInput="{{customerData.email}}"/>
+        <selectOption stepKey="selectStoreView" selector="{{AdminCustomerAccountInformationSection.storeView}}" userInput="{{storeView}}"/>
+        <click selector="{{AdminCustomerAccountInformationSection.group}}" stepKey="ClickToExpandGroup"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceGroupOrCatalogOption('Default (General)')}}" stepKey="waitForCustomerGroupExpand"/>
+        <click selector="{{AdminCustomerAccountInformationSection.groupValue('Default (General)')}}" after="waitForCustomerGroupExpand" stepKey="ClickToSelectGroup"/>
+        <click stepKey="save" selector="{{AdminCustomerAccountInformationSection.saveCustomer}}"/>
+        <waitForPageLoad stepKey="waitForCustomersPage"/>
+        <see stepKey="seeSuccessMessage" userInput="You saved the customer."/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
index cc8a62ca48961..e3655daca4806 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
@@ -320,4 +320,12 @@
         <see selector="{{AdminMessagesSection.success}}" userInput="You canceled the order." stepKey="seeCancelSuccessMessage"/>
         <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Canceled" stepKey="seeOrderStatusCanceled"/>
     </actionGroup>
+
+    <actionGroup name="NavigateToNewOrderPageExistingCustomerAndStoreActionGroup" extends="navigateToNewOrderPageExistingCustomer" >
+        <arguments>
+            <argument name="storeView" defaultValue="_defaultStore"/>
+        </arguments>
+        <click selector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}" stepKey="selectStoreView" after="waitForCreateOrderPageLoad"/>
+        <waitForPageLoad stepKey="waitForLoad" after="selectStoreView"/>
+    </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreGroupActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreGroupActionGroup.xml
index b21c79692a7cf..50ed5a28a4e81 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreGroupActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreGroupActionGroup.xml
@@ -23,4 +23,22 @@
         <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReload"/>
         <see userInput="You saved the store." stepKey="seeSavedMessage" />
     </actionGroup>
+
+    <actionGroup name="AdminAddCustomWebSiteToStoreGroup">
+        <arguments>
+            <argument name="storeGroup" defaultValue="customStoreGroup"/>
+            <argument name="website" defaultValue="customWebsite"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
+        <fillField userInput="{{storeGroup.name}}" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="fillSearchStoreGroupField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <see userInput="{{storeGroup.name}}" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="verifyThatCorrectStoreGroupFound"/>
+        <click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
+        <waitForPageLoad stepKey="waitForStoreGroupPageLoad" />
+        <selectOption selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" userInput="{{website.name}}" stepKey="selectWebsite" />
+        <click selector="{{AdminNewStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreGroup" />
+        <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReload"/>
+        <see userInput="You saved the store." stepKey="seeSavedMessage" />
+    </actionGroup>
 </actionGroups>

From 042d75fbf22b9abb06a843a9139238ad6d303950 Mon Sep 17 00:00:00 2001
From: Sona Sargsyan <sona_sargsyan@epam.com>
Date: Fri, 30 Nov 2018 12:43:13 +0400
Subject: [PATCH 16/27] MAGETWO-96107: Additional blank option in country
 dropdown

- Added some corrections based on comments
---
 ...kingCountryDropDownWithOneAllowedCountryTest.xml |  4 ++--
 .../OpenEditCustomerFromAdminActionGroup.xml        | 13 -------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml b/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
index af620ea2d2ade..b0a7ee07ddad0 100644
--- a/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
+++ b/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
@@ -24,8 +24,8 @@
         <after>
             <createData entity="DisableAdminAccountAllowCountry" stepKey="setDefaultValueForAllowCountries"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-            <actionGroup ref="DeleteCustomerAdminActionGroup" stepKey="deleteCustomer">
-                <argument name="customer" value="CustomerEntityOne"/>
+            <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
+                <argument name="customerEmail" value="CustomerEntityOne.email"/>
             </actionGroup>
             <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearFilters"/>
             <waitForPageLoad stepKey="WaitForPageToLoad"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
index b727c6f77d203..5b3a7a70aa2e6 100755
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
@@ -35,21 +35,8 @@
         <click selector="{{AdminCustomerGridMainActionsSection.delete}}" stepKey="clickDelete"/>
         <waitForAjaxLoad stepKey="waitForLoadConfirmation"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
-        <wait time="5" stepKey="aaa"/>
         <see selector="{{AdminMessagesSection.successMessage}}" userInput="A total of 1 record(s) were deleted" stepKey="seeSuccess"/>
     </actionGroup>
-
-    <actionGroup name="DeleteCustomerAdminActionGroup" extends="DeleteCustomerFromAdminActionGroup">
-        <arguments>
-            <argument name="customer"/>
-        </arguments>
-        <remove keyForRemoval="fillSearch"/>
-        <remove keyForRemoval="clickSubmit"/>
-        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openFiltersSectionOnCustomerPage" after="clickOnButtonToRemoveFiltersIfPresent"/>
-        <fillField userInput="{{customer.email}}" selector="{{AdminDataGridHeaderSection.filterFieldInput('email')}}" stepKey="fillEmailOnFiltersSection" after="openFiltersSectionOnCustomerPage"/>
-        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFiltersButton" after="fillEmailOnFiltersSection"/>
-    </actionGroup>
-
     <actionGroup name="AdminClearCustomersFiltersActionGroup">
         <amOnPage url="{{AdminCustomerPage.url}}" stepKey="amOnCustomersPage"/>
         <waitForPageLoad stepKey="WaitForPageToLoad"/>

From 84662d91f5d57ea348f6691366f92cf48ad91b9b Mon Sep 17 00:00:00 2001
From: David Grigoryan <david_grigoryan@epam.com>
Date: Fri, 30 Nov 2018 13:09:18 +0400
Subject: [PATCH 17/27] MAGETWO-96413: Restricted Admin User Backend Order
 Creation Issue

- Add automated test script
---
 ...omerWithWebsiteAndStoreViewActionGroup.xml | 21 +++++++++++++++++++
 .../ActionGroup/AdminOrderActionGroup.xml     | 11 +++++++++-
 .../AdminCreateStoreGroupActionGroup.xml      | 18 ++++++++++++++++
 3 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
index 0071acf2ef1e0..2c6410f7d45cd 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
@@ -40,4 +40,25 @@
         <waitForPageLoad stepKey="waitForCustomersPage"/>
         <see stepKey="seeSuccessMessage" userInput="You saved the customer."/>
     </actionGroup>
+
+    <actionGroup name="AdminCreateCustomerWithWebSiteAndGroup">
+        <arguments>
+            <argument name="customerData" defaultValue="Simple_US_Customer"/>
+            <argument name="website" type="string" defaultValue="customWebsite"/>
+            <argument name="storeView" type="string" defaultValue="customStore"/>
+        </arguments>
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="goToCustomersPage"/>
+        <click stepKey="addNewCustomer" selector="{{AdminCustomerGridMainActionsSection.addNewCustomer}}"/>
+        <selectOption stepKey="selectWebSite" selector="{{AdminCustomerAccountInformationSection.associateToWebsite}}" userInput="{{website}}"/>
+        <fillField stepKey="FillFirstName" selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="{{customerData.firstname}}"/>
+        <fillField stepKey="FillLastName" selector="{{AdminCustomerAccountInformationSection.lastName}}" userInput="{{customerData.lastname}}"/>
+        <fillField stepKey="FillEmail" selector="{{AdminCustomerAccountInformationSection.email}}" userInput="{{customerData.email}}"/>
+        <selectOption stepKey="selectStoreView" selector="{{AdminCustomerAccountInformationSection.storeView}}" userInput="{{storeView}}"/>
+        <click selector="{{AdminCustomerAccountInformationSection.group}}" stepKey="ClickToExpandGroup"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceGroupOrCatalogOption('Default (General)')}}" stepKey="waitForCustomerGroupExpand"/>
+        <click selector="{{AdminCustomerAccountInformationSection.groupValue('Default (General)')}}" after="waitForCustomerGroupExpand" stepKey="ClickToSelectGroup"/>
+        <click stepKey="save" selector="{{AdminCustomerAccountInformationSection.saveCustomer}}"/>
+        <waitForPageLoad stepKey="waitForCustomersPage"/>
+        <see stepKey="seeSuccessMessage" userInput="You saved the customer."/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
index cc8a62ca48961..0ffc8a5d460d6 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
@@ -53,6 +53,15 @@
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeNewOrderPageTitle"/>
     </actionGroup>
 
+    <!--Navigate to New Order Page for existing Customer And Store-->
+    <actionGroup name="NavigateToNewOrderPageExistingCustomerAndStoreActionGroup" extends="navigateToNewOrderPageExistingCustomer" >
+        <arguments>
+            <argument name="storeView" defaultValue="_defaultStore"/>
+        </arguments>
+        <click selector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}" stepKey="selectStoreView" after="waitForCreateOrderPageLoad"/>
+        <waitForPageLoad stepKey="waitForLoad" after="selectStoreView"/>
+    </actionGroup>
+
     <!--Check the required fields are actually required-->
     <actionGroup name="checkRequiredFieldsNewOrderForm">
         <seeElement selector="{{AdminOrderFormAccountSection.requiredGroup}}" stepKey="seeCustomerGroupRequired"/>
@@ -320,4 +329,4 @@
         <see selector="{{AdminMessagesSection.success}}" userInput="You canceled the order." stepKey="seeCancelSuccessMessage"/>
         <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Canceled" stepKey="seeOrderStatusCanceled"/>
     </actionGroup>
-</actionGroups>
\ No newline at end of file
+</actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreGroupActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreGroupActionGroup.xml
index b21c79692a7cf..50ed5a28a4e81 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreGroupActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreGroupActionGroup.xml
@@ -23,4 +23,22 @@
         <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReload"/>
         <see userInput="You saved the store." stepKey="seeSavedMessage" />
     </actionGroup>
+
+    <actionGroup name="AdminAddCustomWebSiteToStoreGroup">
+        <arguments>
+            <argument name="storeGroup" defaultValue="customStoreGroup"/>
+            <argument name="website" defaultValue="customWebsite"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
+        <fillField userInput="{{storeGroup.name}}" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="fillSearchStoreGroupField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <see userInput="{{storeGroup.name}}" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="verifyThatCorrectStoreGroupFound"/>
+        <click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
+        <waitForPageLoad stepKey="waitForStoreGroupPageLoad" />
+        <selectOption selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" userInput="{{website.name}}" stepKey="selectWebsite" />
+        <click selector="{{AdminNewStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreGroup" />
+        <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReload"/>
+        <see userInput="You saved the store." stepKey="seeSavedMessage" />
+    </actionGroup>
 </actionGroups>

From 4b6f980094e8745991cf362a90954a72873836eb Mon Sep 17 00:00:00 2001
From: Lusine Papyan <lusine_papyan@epam.com>
Date: Wed, 5 Dec 2018 11:35:47 +0400
Subject: [PATCH 18/27] MAGETWO-96409: [2.3.x] [MAGENTO CLOUD] Unable to add
 more attributes in size

- Add automated test script
---
 ...minAttributeTextSwatchesCanBeFiledTest.xml | 116 ++++++++++++++++++
 .../AdminCreateProductAttributeSection.xml    |   5 +
 .../Store/Test/Mftf/Data/StoreData.xml        |  74 +++++++++++
 3 files changed, 195 insertions(+)
 create mode 100644 app/code/Magento/Backend/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml

diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml
new file mode 100644
index 0000000000000..2c061e54f5509
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.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="AdminAttributeTextSwatchesCanBeFiledTest">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Unable to add more attributes in size"/>
+            <title value="Check that attribute text swatches can be filed"/>
+            <description value="Check that attribute text swatches can be filed"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-96710"/>
+            <useCaseId value="MAGETWO-96409"/>
+            <group value="backend"/>
+            <group value="ui"/>
+        </annotations>
+        <before>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+        </before>
+        <after>
+            <!-- Delete all 10 store views -->
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView1">
+                <argument name="customStore" value="customStore"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView2">
+                <argument name="customStore" value="NewStoreViewData"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView3">
+                <argument name="customStore" value="storeViewData"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView4">
+                <argument name="customStore" value="storeViewData1"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView5">
+                <argument name="customStore" value="storeViewData2"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView6">
+                <argument name="customStore" value="storeViewData3"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView7">
+                <argument name="customStore" value="storeViewData4"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView8">
+                <argument name="customStore" value="storeViewData5"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView9">
+                <argument name="customStore" value="storeViewData6"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView10">
+                <argument name="customStore" value="storeViewData7"/>
+            </actionGroup>
+
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Create 10 store views -->
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView1">
+            <argument name="customStore" value="customStore"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView2">
+            <argument name="customStore" value="NewStoreViewData"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView3">
+            <argument name="customStore" value="storeViewData"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView4">
+            <argument name="customStore" value="storeViewData1"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView5">
+            <argument name="customStore" value="storeViewData2"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView6">
+            <argument name="customStore" value="storeViewData3"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView7">
+            <argument name="customStore" value="storeViewData4"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView8">
+            <argument name="customStore" value="storeViewData5"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView9">
+            <argument name="customStore" value="storeViewData6"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView10">
+            <argument name="customStore" value="storeViewData7"/>
+        </actionGroup>
+
+        <!--Navigate to Product attribute page-->
+        <amOnPage url="{{ProductAttributePage.url}}" stepKey="navigateToNewProductAttributePage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <fillField userInput="test_label" selector="{{AttributePropertiesSection.DefaultLabel}}" stepKey="fillDefaultLabel"/>
+        <selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="Text Swatch" stepKey="selectInputType"/>
+        <click selector="{{AttributePropertiesSection.addSwatch}}" stepKey="clickAddSwatch"/>
+        <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
+
+        <!-- Fill Swatch and Description fields for Admin -->
+        <fillField selector="{{AttributeManageSwatchSection.swatchField('Admin')}}" userInput="test" stepKey="fillSwatchForAdmin"/>
+        <fillField selector="{{AttributeManageSwatchSection.descriptionField('Admin')}}" userInput="test" stepKey="fillDescriptionForAdmin"/>
+
+        <!-- Grab value Swatch and Description fields for Admin -->
+        <grabValueFrom selector="{{AttributeManageSwatchSection.swatchField('Admin')}}" stepKey="grabSwatchForAdmin"/>
+        <grabValueFrom selector="{{AttributeManageSwatchSection.descriptionField('Admin')}}" stepKey="grabDescriptionForAdmin"/>
+
+        <!-- Check that Swatch and Description fields for Admin are not empty-->
+        <assertNotEmpty actual="$grabSwatchForAdmin" stepKey="checkSwatchFieldForAdmin"/>
+        <assertNotEmpty actual="$grabDescriptionForAdmin" stepKey="checkDescriptionFieldForAdmin"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml
index 324f261f3a50a..05be20b14acc0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml
@@ -22,6 +22,11 @@
         <element name="TinyMCE4" type="button" selector="//span[text()='Default Value']/parent::label/following-sibling::div//div[@class='mce-branding-powered-by']"/>
         <element name="checkIfTabOpen" selector="//div[@id='advanced_fieldset-wrapper' and not(contains(@class,'opened'))]" type="button"/>
         <element name="useInLayeredNavigation" type="select" selector="#is_filterable"/>
+        <element name="addSwatch" type="button" selector="#add_new_swatch_text_option_button"/>
+    </section>
+    <section name="AttributeManageSwatchSection">
+        <element name="swatchField" type="input" selector="//th[contains(@class, 'col-swatch')]/span[contains(text(), '{{arg}}')]/ancestor::thead/following-sibling::tbody//input[@placeholder='Swatch']" parameterized="true"/>
+        <element name="descriptionField" type="input" selector="//th[contains(@class, 'col-swatch')]/span[contains(text(), '{{arg}}')]/ancestor::thead/following-sibling::tbody//input[@placeholder='Description']" parameterized="true"/>
     </section>
     <section name="AttributeOptionsSection">
         <element name="AddOption" type="button" selector="#add_new_option_button"/>
diff --git a/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml b/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
index 9fae618020ff3..c315f0d5ccdda 100644
--- a/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
+++ b/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
@@ -65,4 +65,78 @@
         <data key="name" unique="suffix">StoreView</data>
         <data key="code" unique="suffix">StoreViewCode</data>
     </entity>
+
+    <!-- For creation 10 Store Views-->
+    <entity name="storeViewData" type="store">
+        <data key="group_id">1</data>
+        <data key="name" unique="suffix">storeView</data>
+        <data key="code" unique="suffix">storeView</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_type">store</data>
+        <data key="store_action">add</data>
+    </entity>
+    <entity name="storeViewData1" type="store">
+        <data key="group_id">1</data>
+        <data key="name" unique="suffix">storeView</data>
+        <data key="code" unique="suffix">storeView</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_type">store</data>
+        <data key="store_action">add</data>
+    </entity>
+    <entity name="storeViewData2" type="store">
+        <data key="group_id">1</data>
+        <data key="name" unique="suffix">storeView</data>
+        <data key="code" unique="suffix">storeView</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_type">store</data>
+        <data key="store_action">add</data>
+    </entity>
+    <entity name="storeViewData3" type="store">
+        <data key="group_id">1</data>
+        <data key="name" unique="suffix">storeView</data>
+        <data key="code" unique="suffix">storeView</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_type">store</data>
+        <data key="store_action">add</data>
+    </entity>
+    <entity name="storeViewData4" type="store">
+        <data key="group_id">1</data>
+        <data key="name" unique="suffix">storeView</data>
+        <data key="code" unique="suffix">storeView</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_type">store</data>
+        <data key="store_action">add</data>
+    </entity>
+    <entity name="storeViewData5" type="store">
+        <data key="group_id">1</data>
+        <data key="name" unique="suffix">storeView</data>
+        <data key="code" unique="suffix">storeView</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_type">store</data>
+        <data key="store_action">add</data>
+    </entity>
+    <entity name="storeViewData6" type="store">
+        <data key="group_id">1</data>
+        <data key="name" unique="suffix">storeView</data>
+        <data key="code" unique="suffix">storeView</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_type">store</data>
+        <data key="store_action">add</data>
+    </entity>
+    <entity name="storeViewData7" type="store">
+        <data key="group_id">1</data>
+        <data key="name" unique="suffix">storeView</data>
+        <data key="code" unique="suffix">storeView</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_type">store</data>
+        <data key="store_action">add</data>
+    </entity>
 </entities>

From 7c5373cc595c8e3b877084542af3127f18f486c2 Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Fri, 7 Dec 2018 17:40:08 +0300
Subject: [PATCH 19/27] MAGETWO-95837: Product is added to Wish List with
 Attributes selected however they were unselected on PDP before

- Fixed static and functional tests;
---
 ...fProdAddToCartWishListWithUnselectedAttrTest.xml |  9 ++-------
 .../view/frontend/web/js/add-to-wishlist.js         | 13 ++++++-------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml
index 6669e90c8d3e3..800b0a060edac 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml
@@ -55,15 +55,10 @@
         <selectOption userInput="{{colorProductAttribute2.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption2"/>
         <click selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" stepKey="clickDropDownProductOption"/>
 
-        <!--Add the product to Wish List-->
+        <!--Click Add to Wish List link-->
         <click selector="{{StorefrontProductPageSection.addToWishlist}}" stepKey="addFirstPnroductToWishlist"/>
-        <waitForPageLoad stepKey="waitForLoading"/>
-        <!--Click "Add All to Cart" button-->
-        <click selector="{{StorefrontCustomerWishlistProductSection.ProductAddAllToCart}}" stepKey="addAllToCart"/>
-        <waitForElementVisible stepKey="waitForErrorAppears" selector="{{StorefrontMessagesSection.error}}"/>
 
         <!--Assert Correct Error Message-->
-        <see userInput="You need to choose options for your item for" stepKey="assertCorrectErrorMessage"/>
-        <dontSee userInput="1 product(s) have been added to shopping cart" stepKey="dontSeeSuccessMessage"/>
+        <see userInput="This is a required field" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsError}}" stepKey="seeError"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
index 3cc20e23f68a2..2fc55b6135079 100644
--- a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
+++ b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
@@ -154,16 +154,15 @@ define([
                 $.each(elementValue, function (key, option) {
                     data[elementName + '[' + option + ']'] = option;
                 });
-            } else {
-                if (elementName.substr(elementName.length - 2) == '[]') { //eslint-disable-line eqeqeq, max-depth
-                    elementName = elementName.substring(0, elementName.length - 2);
+            } else if (elementName.substr(elementName.length - 2) == '[]') { //eslint-disable-line eqeqeq, max-depth
+                elementName = elementName.substring(0, elementName.length - 2);
 
-                    data[elementName + '[' + elementValue + ']'] = elementValue;
-                } else {
-                    data[elementName] = elementValue;
-                }
+                data[elementName + '[' + elementValue + ']'] = elementValue;
+            } else {
+                data[elementName] = elementValue;
             }
 
+
             return data;
         },
 

From c3ea7f154c471d9745a75987a5136bfdfab83fce Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Mon, 10 Dec 2018 16:40:27 +0300
Subject: [PATCH 20/27] MAGETWO-95837: Product is added to Wish List with
 Attributes selected however they were unselected on PDP before

- Fixed static test.
---
 .../Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
index 2fc55b6135079..7a166b47256cb 100644
--- a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
+++ b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
@@ -162,7 +162,6 @@ define([
                 data[elementName] = elementValue;
             }
 
-
             return data;
         },
 

From efc902438576d392b628770613db80cf2a4e7114 Mon Sep 17 00:00:00 2001
From: Dzmitry Tabusheu <dzmitry_tabusheu@epam.com>
Date: Tue, 11 Dec 2018 16:38:44 +0300
Subject: [PATCH 21/27] MAGETWO-91640: Scheduled Import of Products fails on
 error when errors should be skipped

- Fixed static test
---
 app/code/Magento/ImportExport/Model/Import.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php
index e29ad13058e6d..1cc8dc224acb6 100644
--- a/app/code/Magento/ImportExport/Model/Import.php
+++ b/app/code/Magento/ImportExport/Model/Import.php
@@ -636,7 +636,7 @@ public function validateSource(\Magento\ImportExport\Model\Import\AbstractSource
         if ($errorsCount
             && $validationStrategy === ProcessingErrorAggregatorInterface::VALIDATION_STRATEGY_SKIP_ERRORS
         ) {
-            $this->messageManager->addWarningMessage(sprintf(__('Skipped errors: %d'), $errorsCount));
+            $this->messageManager->addWarningMessage(__('Skipped errors: %1', $errorsCount));
             $result = true;
         }
 

From 74cff1d78a1659cdde62017eee851708817bc56b Mon Sep 17 00:00:00 2001
From: Nikita Chubukov <nikita_chubukov@epam.com>
Date: Sat, 22 Dec 2018 15:27:46 +0300
Subject: [PATCH 22/27] MAGETWO-96413: Restricted Admin User Backend Order
 Creation Issue With B2B

- Fix functional test
---
 .../AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
index c7eb143d5e6ba..e94fc459f8190 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
@@ -56,6 +56,7 @@
         <fillField stepKey="FillLastName" selector="{{AdminCustomerAccountInformationSection.lastName}}" userInput="{{customerData.lastname}}"/>
         <fillField stepKey="FillEmail" selector="{{AdminCustomerAccountInformationSection.email}}" userInput="{{customerData.email}}"/>
         <selectOption stepKey="selectStoreView" selector="{{AdminCustomerAccountInformationSection.storeView}}" userInput="{{storeView}}"/>
+        <waitForElement selector="{{AdminCustomerAccountInformationSection.storeView}}" stepKey="waitForCustomerStoreViewExpand"/>
         <click selector="{{AdminCustomerAccountInformationSection.group}}" stepKey="ClickToExpandGroup"/>
         <waitForElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceGroupOrCatalogOption('Default (General)')}}" stepKey="waitForCustomerGroupExpand"/>
         <click selector="{{AdminCustomerAccountInformationSection.groupValue('Default (General)')}}" after="waitForCustomerGroupExpand" stepKey="ClickToSelectGroup"/>

From a8d6248de08e70a4cc28dd367c67ccaf3d624566 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Fri, 28 Dec 2018 11:14:30 +0300
Subject: [PATCH 23/27] MAGETWO-96413: Restricted Admin User Backend Order
 Creation Issue

- Update automated test script
---
 .../Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml
index 4fe5037552778..985c8765b41f3 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml
@@ -38,6 +38,7 @@
         <click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
         <waitForPageLoad stepKey="waitForStoreGroupPageLoad" />
         <selectOption selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" userInput="{{website.name}}" stepKey="selectWebsite" />
+        <selectOption selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" userInput="Default Category" stepKey="chooseRootCategory" />
         <click selector="{{AdminNewStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreGroup" />
         <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReload"/>
         <see userInput="You saved the store." stepKey="seeSavedMessage" />

From 37cc52496181707c0203195f32484316547c8b05 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Fri, 28 Dec 2018 16:14:03 +0300
Subject: [PATCH 24/27] MAGETWO-96413: Restricted Admin User Backend Order
 Creation Issue

- Update automated test script
---
 .../Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml  | 2 ++
 .../Store/Test/Mftf/Section/AdminNewStoreGroupSection.xml       | 1 +
 2 files changed, 3 insertions(+)

diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml
index 985c8765b41f3..f758c0af320a7 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml
@@ -40,6 +40,8 @@
         <selectOption selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" userInput="{{website.name}}" stepKey="selectWebsite" />
         <selectOption selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" userInput="Default Category" stepKey="chooseRootCategory" />
         <click selector="{{AdminNewStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreGroup" />
+        <waitForElementVisible selector="{{AdminNewStoreGroupSection.acceptNewStoreGroupCreation}}" stepKey="waitForAcceptNewStoreGroupCreationButton" />
+        <conditionalClick selector="{{AdminNewStoreGroupSection.acceptNewStoreGroupCreation}}" dependentSelector="{{AdminNewStoreGroupSection.acceptNewStoreGroupCreation}}" visible="true" stepKey="clickAcceptNewStoreGroupCreationButton"/>
         <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReload"/>
         <see userInput="You saved the store." stepKey="seeSavedMessage" />
     </actionGroup>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupSection.xml
index ea5d9aab8b26d..fb98c66983776 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupSection.xml
@@ -11,5 +11,6 @@
         <element name="storeGrpNameTextField" type="input" selector="#group_name"/>
         <element name="storeGrpCodeTextField" type="input" selector="#group_code"/>
         <element name="storeRootCategoryDropdown" type="select" selector="#group_root_category_id"/>
+        <element name="acceptNewStoreGroupCreation" type="button" selector=".action-primary.action-accept" />
     </section>
 </sections>

From 10e7623128681de988eb4820e1a6fe26b7a74a09 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Thu, 10 Jan 2019 11:40:34 +0300
Subject: [PATCH 25/27] MAGETWO-96413: Restricted Admin User Backend Order
 Creation Issue

- Update automated test script
---
 .../Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml
index f758c0af320a7..1a7f24ed2aaa5 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml
@@ -40,7 +40,6 @@
         <selectOption selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" userInput="{{website.name}}" stepKey="selectWebsite" />
         <selectOption selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" userInput="Default Category" stepKey="chooseRootCategory" />
         <click selector="{{AdminNewStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreGroup" />
-        <waitForElementVisible selector="{{AdminNewStoreGroupSection.acceptNewStoreGroupCreation}}" stepKey="waitForAcceptNewStoreGroupCreationButton" />
         <conditionalClick selector="{{AdminNewStoreGroupSection.acceptNewStoreGroupCreation}}" dependentSelector="{{AdminNewStoreGroupSection.acceptNewStoreGroupCreation}}" visible="true" stepKey="clickAcceptNewStoreGroupCreationButton"/>
         <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReload"/>
         <see userInput="You saved the store." stepKey="seeSavedMessage" />

From 0f527ca12ce975e4e14d3a3b3fca0f814cde36c5 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Thu, 10 Jan 2019 16:20:12 +0300
Subject: [PATCH 26/27] MAGETWO-96413: Restricted Admin User Backend Order
 Creation Issue With B2B

- Update automated test script
---
 ...dminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
index e94fc459f8190..37149e23dc87e 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
@@ -52,14 +52,14 @@
         <amOnPage url="{{AdminCustomerPage.url}}" stepKey="goToCustomersPage"/>
         <click stepKey="addNewCustomer" selector="{{AdminCustomerGridMainActionsSection.addNewCustomer}}"/>
         <selectOption stepKey="selectWebSite" selector="{{AdminCustomerAccountInformationSection.associateToWebsite}}" userInput="{{website}}"/>
+        <click selector="{{AdminCustomerAccountInformationSection.group}}" stepKey="ClickToExpandGroup"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceGroupOrCatalogOption('Default (General)')}}" stepKey="waitForCustomerGroupExpand"/>
+        <click selector="{{AdminCustomerAccountInformationSection.groupValue('Default (General)')}}" after="waitForCustomerGroupExpand" stepKey="ClickToSelectGroup"/>
         <fillField stepKey="FillFirstName" selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="{{customerData.firstname}}"/>
         <fillField stepKey="FillLastName" selector="{{AdminCustomerAccountInformationSection.lastName}}" userInput="{{customerData.lastname}}"/>
         <fillField stepKey="FillEmail" selector="{{AdminCustomerAccountInformationSection.email}}" userInput="{{customerData.email}}"/>
         <selectOption stepKey="selectStoreView" selector="{{AdminCustomerAccountInformationSection.storeView}}" userInput="{{storeView}}"/>
         <waitForElement selector="{{AdminCustomerAccountInformationSection.storeView}}" stepKey="waitForCustomerStoreViewExpand"/>
-        <click selector="{{AdminCustomerAccountInformationSection.group}}" stepKey="ClickToExpandGroup"/>
-        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceGroupOrCatalogOption('Default (General)')}}" stepKey="waitForCustomerGroupExpand"/>
-        <click selector="{{AdminCustomerAccountInformationSection.groupValue('Default (General)')}}" after="waitForCustomerGroupExpand" stepKey="ClickToSelectGroup"/>
         <click stepKey="save" selector="{{AdminCustomerAccountInformationSection.saveCustomer}}"/>
         <waitForPageLoad stepKey="waitForCustomersPage"/>
         <see stepKey="seeSuccessMessage" userInput="You saved the customer."/>

From b6d26694f68e587169ef75afbbbcabc85e073ecf Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Mon, 21 Jan 2019 15:04:18 +0300
Subject: [PATCH 27/27] MAGETWO-96413: Restricted Admin User Backend Order
 Creation Issue

- Fix static test
---
 app/code/Magento/Store/Model/Store.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
index 8912473709048..c1ad5bdcfc068 100644
--- a/app/code/Magento/Store/Model/Store.php
+++ b/app/code/Magento/Store/Model/Store.php
@@ -33,6 +33,7 @@
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @since 100.0.2
  */
 class Store extends AbstractExtensibleModel implements